From 03da66bd59567c90dc3b3b0892c3346472a0b413 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 29 Nov 2009 23:04:43 +0200 Subject: [PATCH] Remove src/crypto from default include path In addition, start ordering header file includes to be in more consistent order: system header files, src/utils, src/*, same directory as the *.c file. --- eap_example/Makefile | 2 -- eap_example/eap_example_server.c | 2 +- hostapd/Makefile | 1 - hostapd/config.c | 8 ++++---- hostapd/hostapd.c | 18 +++++++++--------- hostapd/ieee802_11.c | 8 ++++---- hostapd/ieee802_1x.c | 16 ++++++++-------- hostapd/main.c | 6 +++--- hostapd/nt_password_hash.c | 2 +- hostapd/peerkey.c | 4 ++-- hostapd/pmksa_cache.c | 2 -- hostapd/wpa.c | 14 +++++++------- hostapd/wpa_ft.c | 2 +- hostapd/wps_hostapd.c | 10 +++++----- src/common/wpa_common.c | 10 +++++----- src/drivers/driver_iphone.m | 2 +- src/drivers/driver_test.c | 2 +- src/eap_common/chap.c | 3 +-- src/eap_common/eap_fast_common.c | 4 ++-- src/eap_common/eap_gpsk_common.c | 7 ++----- src/eap_common/eap_pax_common.c | 2 +- src/eap_common/eap_peap_common.c | 2 +- src/eap_common/eap_psk_common.c | 2 +- src/eap_common/eap_sake_common.c | 2 +- src/eap_common/eap_sim_common.c | 10 +++++----- src/eap_common/ikev2_common.c | 6 +++--- src/eap_peer/eap.c | 12 ++++++------ src/eap_peer/eap_aka.c | 14 ++++++-------- src/eap_peer/eap_fast.c | 6 +++--- src/eap_peer/eap_leap.c | 4 ++-- src/eap_peer/eap_mschapv2.c | 6 +++--- src/eap_peer/eap_pax.c | 4 +--- src/eap_peer/eap_peap.c | 6 +++--- src/eap_peer/eap_psk.c | 4 ++-- src/eap_peer/eap_tls.c | 2 +- src/eap_peer/eap_tls_common.c | 4 ++-- src/eap_peer/eap_ttls.c | 13 ++++++------- src/eap_peer/ikev2.c | 2 +- src/eap_peer/mschapv2.c | 2 +- src/eap_server/eap_aka.c | 7 +++---- src/eap_server/eap_fast.c | 10 +++++----- src/eap_server/eap_mschapv2.c | 2 +- src/eap_server/eap_peap.c | 4 ++-- src/eap_server/eap_psk.c | 4 ++-- src/eap_server/eap_tls.c | 2 +- src/eap_server/eap_tls_common.c | 4 ++-- src/eap_server/eap_ttls.c | 6 +++--- src/eap_server/ikev2.c | 2 +- src/eapol_supp/eapol_supp_sm.c | 12 ++++++------ src/hlr_auc_gw/milenage.c | 2 +- src/radius/radius.c | 4 ++-- src/rsn_supp/peerkey.c | 6 +++--- src/rsn_supp/pmksa_cache.c | 6 ++---- src/rsn_supp/wpa.c | 8 ++++---- src/rsn_supp/wpa_ft.c | 6 +++--- src/tls/pkcs5.c | 4 ++-- src/tls/rsa.c | 1 - src/tls/tlsv1_client.c | 4 ++-- src/tls/tlsv1_client_read.c | 6 +++--- src/tls/tlsv1_client_write.c | 6 +++--- src/tls/tlsv1_common.h | 2 +- src/tls/tlsv1_cred.c | 2 +- src/tls/tlsv1_record.c | 4 ++-- src/tls/tlsv1_record.h | 2 +- src/tls/tlsv1_server.c | 4 ++-- src/tls/tlsv1_server_read.c | 6 +++--- src/tls/tlsv1_server_write.c | 6 +++--- src/tls/x509v3.c | 2 +- src/wps/wps.c | 4 ++-- src/wps/wps_attr_build.c | 8 ++++---- src/wps/wps_attr_process.c | 2 +- src/wps/wps_common.c | 10 +++++----- src/wps/wps_enrollee.c | 4 ++-- src/wps/wps_registrar.c | 6 +++--- wpa_supplicant/Makefile | 3 +-- wpa_supplicant/config.c | 2 +- wpa_supplicant/nmake.mak | 2 +- wpa_supplicant/symbian/wpa_supplicant.mmp | 2 +- wpa_supplicant/tests/test_aes.c | 4 ++-- wpa_supplicant/tests/test_eap_sim_common.c | 2 +- wpa_supplicant/tests/test_md4.c | 2 +- wpa_supplicant/tests/test_md5.c | 2 +- wpa_supplicant/tests/test_ms_funcs.c | 2 +- wpa_supplicant/tests/test_sha1.c | 6 +++--- wpa_supplicant/tests/test_sha256.c | 4 ++-- .../vs2005/eapol_test/eapol_test.vcproj | 4 ++-- .../wpa_passphrase/wpa_passphrase.vcproj | 4 ++-- .../wpa_supplicant/wpa_supplicant.vcproj | 4 ++-- wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj | 4 ++-- wpa_supplicant/wpa_passphrase.c | 2 +- wpa_supplicant/wps_supplicant.c | 14 +++++++------- .../wpa_supplicant.xcodeproj/project.pbxproj | 2 -- 92 files changed, 219 insertions(+), 240 deletions(-) diff --git a/eap_example/Makefile b/eap_example/Makefile index 3efbdfab3..28feb8f12 100644 --- a/eap_example/Makefile +++ b/eap_example/Makefile @@ -18,9 +18,7 @@ CONFIG_TLS=openssl CFLAGS += -I. CFLAGS += -I../src -CFLAGS += -I../src/crypto CFLAGS += -I../src/utils -CFLAGS += -I../src/common # at least for now, need to include config_ssid.h and config_blob.h from # wpa_supplicant directory diff --git a/eap_example/eap_example_server.c b/eap_example/eap_example_server.c index 0e28995ed..531383f35 100644 --- a/eap_example/eap_example_server.c +++ b/eap_example/eap_example_server.c @@ -16,8 +16,8 @@ #include "includes.h" #include "common.h" +#include "crypto/tls.h" #include "eap_server/eap.h" -#include "tls.h" #include "wpabuf.h" void eap_example_peer_rx(const u8 *data, size_t data_len); diff --git a/hostapd/Makefile b/hostapd/Makefile index d2130cdbb..6524ff019 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -7,7 +7,6 @@ CFLAGS = -MMD -O2 -Wall -g endif CFLAGS += -I../src -CFLAGS += -I../src/crypto CFLAGS += -I../src/utils # Uncomment following line and set the path to your kernel tree include diff --git a/hostapd/config.c b/hostapd/config.c index a13adaf44..d4ce22744 100644 --- a/hostapd/config.c +++ b/hostapd/config.c @@ -19,16 +19,16 @@ #endif /* CONFIG_NATIVE_WINDOWS */ #include "common.h" -#include "hostapd.h" +#include "crypto/sha1.h" #include "drivers/driver.h" -#include "sha1.h" -#include "eap_server/eap.h" #include "radius/radius_client.h" #include "common/ieee802_11_defs.h" #include "common/wpa_common.h" +#include "eap_common/eap_wsc_common.h" +#include "eap_server/eap.h" +#include "hostapd.h" #include "wpa.h" #include "uuid.h" -#include "eap_common/eap_wsc_common.h" #include "sta_info.h" #include "config.h" diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c index 7799316c6..da873d0b9 100644 --- a/hostapd/hostapd.c +++ b/hostapd/hostapd.c @@ -16,30 +16,30 @@ #include "common.h" #include "eloop.h" +#include "crypto/tls.h" +#include "common/ieee802_11_defs.h" +#include "eapol_auth/eapol_auth_sm.h" +#include "radius/radius_client.h" +#include "radius/radius_server.h" +#include "eap_server/eap_sim_db.h" +#include "eap_server/eap.h" +#include "eap_server/tncs.h" +#include "l2_packet/l2_packet.h" #include "hostapd.h" #include "ieee802_1x.h" #include "beacon.h" #include "hw_features.h" #include "accounting.h" -#include "eapol_auth/eapol_auth_sm.h" #include "iapp.h" -#include "common/ieee802_11_defs.h" #include "ieee802_11_auth.h" #include "sta_flags.h" #include "sta_info.h" #include "ap_list.h" #include "driver_i.h" -#include "radius/radius_client.h" -#include "radius/radius_server.h" #include "wpa.h" #include "preauth.h" #include "vlan_init.h" #include "ctrl_iface.h" -#include "tls.h" -#include "eap_server/eap_sim_db.h" -#include "eap_server/eap.h" -#include "eap_server/tncs.h" -#include "l2_packet/l2_packet.h" #include "wps_hostapd.h" #include "tkip_countermeasures.h" diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c index b92065e0d..f9d519e8e 100644 --- a/hostapd/ieee802_11.c +++ b/hostapd/ieee802_11.c @@ -21,16 +21,17 @@ #include "common.h" #include "eloop.h" +#include "crypto/crypto.h" +#include "common/wpa_ctrl.h" +#include "radius/radius.h" +#include "radius/radius_client.h" #include "hostapd.h" #include "ieee802_11.h" #include "beacon.h" #include "hw_features.h" -#include "radius/radius.h" -#include "radius/radius_client.h" #include "ieee802_11_auth.h" #include "sta_flags.h" #include "sta_info.h" -#include "crypto.h" #include "ieee802_1x.h" #include "wpa.h" #include "wme.h" @@ -38,7 +39,6 @@ #include "accounting.h" #include "driver_i.h" #include "mlme.h" -#include "common/wpa_ctrl.h" u8 * hostapd_eid_supp_rates(struct hostapd_data *hapd, u8 *eid) diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c index 1399e1dbc..9336750b6 100644 --- a/hostapd/ieee802_1x.c +++ b/hostapd/ieee802_1x.c @@ -15,15 +15,17 @@ #include "includes.h" #include "common.h" -#include "hostapd.h" -#include "ieee802_1x.h" -#include "accounting.h" +#include "eloop.h" +#include "crypto/md5.h" +#include "crypto/crypto.h" +#include "common/ieee802_11_defs.h" +#include "common/wpa_ctrl.h" #include "radius/radius.h" #include "radius/radius_client.h" #include "eapol_auth/eapol_auth_sm.h" -#include "md5.h" -#include "crypto.h" -#include "eloop.h" +#include "hostapd.h" +#include "ieee802_1x.h" +#include "accounting.h" #include "sta_flags.h" #include "sta_info.h" #include "wpa.h" @@ -32,8 +34,6 @@ #include "driver_i.h" #include "hw_features.h" #include "eap_server/eap.h" -#include "common/ieee802_11_defs.h" -#include "common/wpa_ctrl.h" static void ieee802_1x_finished(struct hostapd_data *hapd, diff --git a/hostapd/main.c b/hostapd/main.c index 4f403563d..20efca092 100644 --- a/hostapd/main.c +++ b/hostapd/main.c @@ -18,13 +18,13 @@ #endif /* CONFIG_NATIVE_WINDOWS */ #include "common.h" -#include "hostapd.h" #include "eloop.h" +#include "crypto/tls.h" #include "common/version.h" -#include "config.h" -#include "tls.h" #include "eap_server/eap.h" #include "eap_server/tncs.h" +#include "hostapd.h" +#include "config.h" extern int wpa_debug_level; diff --git a/hostapd/nt_password_hash.c b/hostapd/nt_password_hash.c index 99290f063..839802a74 100644 --- a/hostapd/nt_password_hash.c +++ b/hostapd/nt_password_hash.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "ms_funcs.h" +#include "crypto/ms_funcs.h" int main(int argc, char *argv[]) diff --git a/hostapd/peerkey.c b/hostapd/peerkey.c index e74b936c4..4bee2d94b 100644 --- a/hostapd/peerkey.c +++ b/hostapd/peerkey.c @@ -16,8 +16,8 @@ #include "common.h" #include "eloop.h" -#include "sha1.h" -#include "sha256.h" +#include "crypto/sha1.h" +#include "crypto/sha256.h" #include "wpa.h" #include "wpa_auth_i.h" #include "wpa_auth_ie.h" diff --git a/hostapd/pmksa_cache.c b/hostapd/pmksa_cache.c index 265235fd6..a2b964eff 100644 --- a/hostapd/pmksa_cache.c +++ b/hostapd/pmksa_cache.c @@ -19,8 +19,6 @@ #include "config.h" #include "common.h" #include "eloop.h" -#include "sha1.h" -#include "sha256.h" #include "eapol_auth/eapol_auth_sm.h" #include "pmksa_cache.h" diff --git a/hostapd/wpa.c b/hostapd/wpa.c index ab9555709..73425e660 100644 --- a/hostapd/wpa.c +++ b/hostapd/wpa.c @@ -17,14 +17,14 @@ #ifndef CONFIG_NATIVE_WINDOWS #include "common.h" -#include "config.h" -#include "eapol_auth/eapol_auth_sm.h" -#include "wpa.h" -#include "sha1.h" -#include "sha256.h" -#include "aes_wrap.h" -#include "crypto.h" #include "eloop.h" +#include "crypto/aes_wrap.h" +#include "crypto/crypto.h" +#include "crypto/sha1.h" +#include "crypto/sha256.h" +#include "eapol_auth/eapol_auth_sm.h" +#include "config.h" +#include "wpa.h" #include "ieee802_11.h" #include "pmksa_cache.h" #include "state_machine.h" diff --git a/hostapd/wpa_ft.c b/hostapd/wpa_ft.c index 55104239b..495f27f11 100644 --- a/hostapd/wpa_ft.c +++ b/hostapd/wpa_ft.c @@ -15,9 +15,9 @@ #include "includes.h" #include "common.h" +#include "crypto/aes_wrap.h" #include "config.h" #include "wpa.h" -#include "aes_wrap.h" #include "ieee802_11.h" #include "wme.h" #include "wpa_auth_i.h" diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c index 61746426e..e82a74f1c 100644 --- a/hostapd/wps_hostapd.c +++ b/hostapd/wps_hostapd.c @@ -15,21 +15,21 @@ #include "includes.h" #include "common.h" -#include "hostapd.h" -#include "driver_i.h" #include "eloop.h" #include "uuid.h" +#include "crypto/dh_groups.h" #include "common/wpa_ctrl.h" #include "common/ieee802_11_defs.h" #include "common/ieee802_11_common.h" -#include "sta_flags.h" -#include "sta_info.h" #include "eapol_auth/eapol_auth_sm.h" #include "wps/wps.h" #include "wps/wps_defs.h" #include "wps/wps_dev_attr.h" +#include "hostapd.h" +#include "driver_i.h" +#include "sta_flags.h" +#include "sta_info.h" #include "wps_hostapd.h" -#include "dh_groups.h" #ifdef CONFIG_WPS_UPNP diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c index 136294757..c9c0e0077 100644 --- a/src/common/wpa_common.c +++ b/src/common/wpa_common.c @@ -15,11 +15,11 @@ #include "includes.h" #include "common.h" -#include "md5.h" -#include "sha1.h" -#include "sha256.h" -#include "aes_wrap.h" -#include "crypto.h" +#include "crypto/md5.h" +#include "crypto/sha1.h" +#include "crypto/sha256.h" +#include "crypto/aes_wrap.h" +#include "crypto/crypto.h" #include "ieee802_11_defs.h" #include "defs.h" #include "wpa_common.h" diff --git a/src/drivers/driver_iphone.m b/src/drivers/driver_iphone.m index 8e64ffdcc..8213fdacc 100644 --- a/src/drivers/driver_iphone.m +++ b/src/drivers/driver_iphone.m @@ -20,7 +20,7 @@ #include "common.h" #include "driver.h" #include "eloop.h" -#include "ieee802_11_defs.h" +#include "common/ieee802_11_defs.h" #include "MobileApple80211.h" diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c index 546adb922..9dece9589 100644 --- a/src/drivers/driver_test.c +++ b/src/drivers/driver_test.c @@ -31,7 +31,7 @@ #include "driver.h" #include "l2_packet/l2_packet.h" #include "eloop.h" -#include "sha1.h" +#include "crypto/sha1.h" #include "common/ieee802_11_defs.h" #include "../../hostapd/hostapd.h" diff --git a/src/eap_common/chap.c b/src/eap_common/chap.c index 5b7e07ea8..60bfc1c81 100644 --- a/src/eap_common/chap.c +++ b/src/eap_common/chap.c @@ -15,8 +15,7 @@ #include "includes.h" #include "common.h" -#include "md5.h" -#include "crypto.h" +#include "crypto/crypto.h" #include "chap.h" int chap_md5(u8 id, const u8 *secret, size_t secret_len, const u8 *challenge, diff --git a/src/eap_common/eap_fast_common.c b/src/eap_common/eap_fast_common.c index 4d3deafa0..4de34a87b 100644 --- a/src/eap_common/eap_fast_common.c +++ b/src/eap_common/eap_fast_common.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" -#include "sha1.h" -#include "tls.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "eap_defs.h" #include "eap_tlv_common.h" #include "eap_fast_common.h" diff --git a/src/eap_common/eap_gpsk_common.c b/src/eap_common/eap_gpsk_common.c index 414610cf5..407626288 100644 --- a/src/eap_common/eap_gpsk_common.c +++ b/src/eap_common/eap_gpsk_common.c @@ -15,12 +15,9 @@ #include "includes.h" #include "common.h" +#include "crypto/aes_wrap.h" +#include "crypto/sha256.h" #include "eap_defs.h" -#include "aes_wrap.h" -#include "crypto.h" -#ifdef EAP_GPSK_SHA256 -#include "sha256.h" -#endif /* EAP_GPSK_SHA256 */ #include "eap_gpsk_common.h" diff --git a/src/eap_common/eap_pax_common.c b/src/eap_common/eap_pax_common.c index 80110469d..32dc80c74 100644 --- a/src/eap_common/eap_pax_common.c +++ b/src/eap_common/eap_pax_common.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "sha1.h" +#include "crypto/sha1.h" #include "eap_pax_common.h" diff --git a/src/eap_common/eap_peap_common.c b/src/eap_common/eap_peap_common.c index 14625f963..3a64b8ecc 100644 --- a/src/eap_common/eap_peap_common.c +++ b/src/eap_common/eap_peap_common.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "sha1.h" +#include "crypto/sha1.h" #include "eap_peap_common.h" void peap_prfplus(int version, const u8 *key, size_t key_len, diff --git a/src/eap_common/eap_psk_common.c b/src/eap_common/eap_psk_common.c index 0def3e885..7417d5c73 100644 --- a/src/eap_common/eap_psk_common.c +++ b/src/eap_common/eap_psk_common.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "aes_wrap.h" +#include "crypto/aes_wrap.h" #include "eap_defs.h" #include "eap_psk_common.h" diff --git a/src/eap_common/eap_sake_common.c b/src/eap_common/eap_sake_common.c index eafad1d11..9002b0ca3 100644 --- a/src/eap_common/eap_sake_common.c +++ b/src/eap_common/eap_sake_common.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" -#include "sha1.h" #include "wpabuf.h" +#include "crypto/sha1.h" #include "eap_defs.h" #include "eap_sake_common.h" diff --git a/src/eap_common/eap_sim_common.c b/src/eap_common/eap_sim_common.c index 79fda1f45..56b4ded45 100644 --- a/src/eap_common/eap_sim_common.c +++ b/src/eap_common/eap_sim_common.c @@ -15,12 +15,12 @@ #include "includes.h" #include "common.h" -#include "eap_common/eap_defs.h" -#include "sha1.h" -#include "sha256.h" -#include "crypto.h" -#include "aes_wrap.h" #include "wpabuf.h" +#include "crypto/aes_wrap.h" +#include "crypto/crypto.h" +#include "crypto/sha1.h" +#include "crypto/sha256.h" +#include "eap_common/eap_defs.h" #include "eap_common/eap_sim_common.h" diff --git a/src/eap_common/ikev2_common.c b/src/eap_common/ikev2_common.c index 818b5bdba..67754d815 100644 --- a/src/eap_common/ikev2_common.c +++ b/src/eap_common/ikev2_common.c @@ -15,9 +15,9 @@ #include "includes.h" #include "common.h" -#include "sha1.h" -#include "md5.h" -#include "crypto.h" +#include "crypto/crypto.h" +#include "crypto/md5.h" +#include "crypto/sha1.h" #include "ikev2_common.h" diff --git a/src/eap_peer/eap.c b/src/eap_peer/eap.c index dd9a8be3d..0630f9a5a 100644 --- a/src/eap_peer/eap.c +++ b/src/eap_peer/eap.c @@ -24,14 +24,14 @@ #include "includes.h" #include "common.h" +#include "pcsc_funcs.h" +#include "state_machine.h" +#include "crypto/crypto.h" +#include "crypto/tls.h" +#include "common/wpa_ctrl.h" +#include "eap_common/eap_wsc_common.h" #include "eap_i.h" #include "eap_config.h" -#include "tls.h" -#include "crypto.h" -#include "pcsc_funcs.h" -#include "common/wpa_ctrl.h" -#include "state_machine.h" -#include "eap_common/eap_wsc_common.h" #define STATE_MACHINE_DATA struct eap_sm #define STATE_MACHINE_DEBUG_PREFIX "EAP" diff --git a/src/eap_peer/eap_aka.c b/src/eap_peer/eap_aka.c index f23714142..f00031e1a 100644 --- a/src/eap_peer/eap_aka.c +++ b/src/eap_peer/eap_aka.c @@ -15,16 +15,14 @@ #include "includes.h" #include "common.h" -#include "eap_peer/eap_i.h" #include "pcsc_funcs.h" -#include "eap_common/eap_sim_common.h" -#include "sha1.h" -#include "sha256.h" -#include "crypto.h" -#include "eap_peer/eap_config.h" -#ifdef CONFIG_USIM_SIMULATOR +#include "crypto/crypto.h" +#include "crypto/sha1.h" +#include "crypto/sha256.h" #include "hlr_auc_gw/milenage.h" -#endif /* CONFIG_USIM_SIMULATOR */ +#include "eap_common/eap_sim_common.h" +#include "eap_config.h" +#include "eap_i.h" struct eap_aka_data { diff --git a/src/eap_peer/eap_fast.c b/src/eap_peer/eap_fast.c index d00867099..c46db01f7 100644 --- a/src/eap_peer/eap_fast.c +++ b/src/eap_peer/eap_fast.c @@ -15,12 +15,12 @@ #include "includes.h" #include "common.h" +#include "crypto/tls.h" +#include "crypto/sha1.h" +#include "eap_common/eap_tlv_common.h" #include "eap_i.h" #include "eap_tls_common.h" #include "eap_config.h" -#include "tls.h" -#include "eap_common/eap_tlv_common.h" -#include "sha1.h" #include "eap_fast_pac.h" #ifdef EAP_FAST_DYNAMIC diff --git a/src/eap_peer/eap_leap.c b/src/eap_peer/eap_leap.c index 526ce93a8..a7c94a4d4 100644 --- a/src/eap_peer/eap_leap.c +++ b/src/eap_peer/eap_leap.c @@ -15,9 +15,9 @@ #include "includes.h" #include "common.h" +#include "crypto/ms_funcs.h" +#include "crypto/crypto.h" #include "eap_i.h" -#include "ms_funcs.h" -#include "crypto.h" #define LEAP_VERSION 1 #define LEAP_CHALLENGE_LEN 8 diff --git a/src/eap_peer/eap_mschapv2.c b/src/eap_peer/eap_mschapv2.c index d0ca44d05..cd410d91b 100644 --- a/src/eap_peer/eap_mschapv2.c +++ b/src/eap_peer/eap_mschapv2.c @@ -22,11 +22,11 @@ #include "includes.h" #include "common.h" -#include "eap_i.h" -#include "eap_config.h" -#include "ms_funcs.h" +#include "crypto/ms_funcs.h" #include "common/wpa_ctrl.h" #include "mschapv2.h" +#include "eap_i.h" +#include "eap_config.h" #ifdef _MSC_VER diff --git a/src/eap_peer/eap_pax.c b/src/eap_peer/eap_pax.c index afd56dd49..2e04831ae 100644 --- a/src/eap_peer/eap_pax.c +++ b/src/eap_peer/eap_pax.c @@ -15,10 +15,8 @@ #include "includes.h" #include "common.h" -#include "eap_peer/eap_i.h" #include "eap_common/eap_pax_common.h" -#include "sha1.h" -#include "crypto.h" +#include "eap_i.h" /* * Note: only PAX_STD subprotocol is currently supported diff --git a/src/eap_peer/eap_peap.c b/src/eap_peer/eap_peap.c index 894fc632f..2864f452a 100644 --- a/src/eap_peer/eap_peap.c +++ b/src/eap_peer/eap_peap.c @@ -16,12 +16,12 @@ #include "common.h" #include "crypto/sha1.h" +#include "crypto/tls.h" +#include "eap_common/eap_tlv_common.h" +#include "eap_common/eap_peap_common.h" #include "eap_i.h" #include "eap_tls_common.h" #include "eap_config.h" -#include "tls.h" -#include "eap_common/eap_tlv_common.h" -#include "eap_common/eap_peap_common.h" #include "tncc.h" diff --git a/src/eap_peer/eap_psk.c b/src/eap_peer/eap_psk.c index 1ce635663..ccf871e13 100644 --- a/src/eap_peer/eap_psk.c +++ b/src/eap_peer/eap_psk.c @@ -18,9 +18,9 @@ #include "includes.h" #include "common.h" -#include "eap_peer/eap_i.h" -#include "aes_wrap.h" +#include "crypto/aes_wrap.h" #include "eap_common/eap_psk_common.h" +#include "eap_i.h" struct eap_psk_data { diff --git a/src/eap_peer/eap_tls.c b/src/eap_peer/eap_tls.c index 31344a913..20b2212e1 100644 --- a/src/eap_peer/eap_tls.c +++ b/src/eap_peer/eap_tls.c @@ -15,10 +15,10 @@ #include "includes.h" #include "common.h" +#include "crypto/tls.h" #include "eap_i.h" #include "eap_tls_common.h" #include "eap_config.h" -#include "tls.h" static void eap_tls_deinit(struct eap_sm *sm, void *priv); diff --git a/src/eap_peer/eap_tls_common.c b/src/eap_peer/eap_tls_common.c index 19afb90dc..43ee58405 100644 --- a/src/eap_peer/eap_tls_common.c +++ b/src/eap_peer/eap_tls_common.c @@ -15,11 +15,11 @@ #include "includes.h" #include "common.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "eap_i.h" #include "eap_tls_common.h" #include "eap_config.h" -#include "sha1.h" -#include "tls.h" static int eap_tls_check_blob(struct eap_sm *sm, const char **name, diff --git a/src/eap_peer/eap_ttls.c b/src/eap_peer/eap_ttls.c index f2eb0db26..800f1b57d 100644 --- a/src/eap_peer/eap_ttls.c +++ b/src/eap_peer/eap_ttls.c @@ -15,15 +15,14 @@ #include "includes.h" #include "common.h" -#include "eap_peer/eap_i.h" -#include "eap_peer/eap_tls_common.h" -#include "eap_peer/eap_config.h" -#include "ms_funcs.h" -#include "sha1.h" +#include "crypto/ms_funcs.h" +#include "crypto/tls.h" #include "eap_common/chap.h" -#include "tls.h" -#include "mschapv2.h" #include "eap_common/eap_ttls.h" +#include "mschapv2.h" +#include "eap_i.h" +#include "eap_tls_common.h" +#include "eap_config.h" /* Maximum supported TTLS version diff --git a/src/eap_peer/ikev2.c b/src/eap_peer/ikev2.c index 9172e1f34..309a33112 100644 --- a/src/eap_peer/ikev2.c +++ b/src/eap_peer/ikev2.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "dh_groups.h" +#include "crypto/dh_groups.h" #include "ikev2.h" diff --git a/src/eap_peer/mschapv2.c b/src/eap_peer/mschapv2.c index 49235b5bf..b8fb07502 100644 --- a/src/eap_peer/mschapv2.c +++ b/src/eap_peer/mschapv2.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "ms_funcs.h" +#include "crypto/ms_funcs.h" #include "mschapv2.h" const u8 * mschapv2_remove_domain(const u8 *username, size_t *len) diff --git a/src/eap_server/eap_aka.c b/src/eap_server/eap_aka.c index 033dfbb3f..4e7db48d0 100644 --- a/src/eap_server/eap_aka.c +++ b/src/eap_server/eap_aka.c @@ -15,12 +15,11 @@ #include "includes.h" #include "common.h" -#include "eap_server/eap_i.h" +#include "crypto/sha256.h" +#include "crypto/crypto.h" #include "eap_common/eap_sim_common.h" +#include "eap_server/eap_i.h" #include "eap_server/eap_sim_db.h" -#include "sha1.h" -#include "sha256.h" -#include "crypto.h" struct eap_aka_data { diff --git a/src/eap_server/eap_fast.c b/src/eap_server/eap_fast.c index 356390848..e42b2af9e 100644 --- a/src/eap_server/eap_fast.c +++ b/src/eap_server/eap_fast.c @@ -15,13 +15,13 @@ #include "includes.h" #include "common.h" -#include "aes_wrap.h" -#include "sha1.h" -#include "eap_i.h" -#include "eap_tls_common.h" -#include "tls.h" +#include "crypto/aes_wrap.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "eap_common/eap_tlv_common.h" #include "eap_common/eap_fast_common.h" +#include "eap_i.h" +#include "eap_tls_common.h" static void eap_fast_reset(struct eap_sm *sm, void *priv); diff --git a/src/eap_server/eap_mschapv2.c b/src/eap_server/eap_mschapv2.c index 8b7b352ce..39d1c6ef2 100644 --- a/src/eap_server/eap_mschapv2.c +++ b/src/eap_server/eap_mschapv2.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" +#include "crypto/ms_funcs.h" #include "eap_i.h" -#include "ms_funcs.h" struct eap_mschapv2_hdr { diff --git a/src/eap_server/eap_peap.c b/src/eap_server/eap_peap.c index 4789e5756..9ffb15d9d 100644 --- a/src/eap_server/eap_peap.c +++ b/src/eap_server/eap_peap.c @@ -15,12 +15,12 @@ #include "includes.h" #include "common.h" -#include "sha1.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "eap_i.h" #include "eap_tls_common.h" #include "eap_common/eap_tlv_common.h" #include "eap_common/eap_peap_common.h" -#include "tls.h" #include "tncs.h" diff --git a/src/eap_server/eap_psk.c b/src/eap_server/eap_psk.c index c68d4c34d..4c30346e5 100644 --- a/src/eap_server/eap_psk.c +++ b/src/eap_server/eap_psk.c @@ -18,9 +18,9 @@ #include "includes.h" #include "common.h" -#include "eap_server/eap_i.h" -#include "aes_wrap.h" +#include "crypto/aes_wrap.h" #include "eap_common/eap_psk_common.h" +#include "eap_server/eap_i.h" struct eap_psk_data { diff --git a/src/eap_server/eap_tls.c b/src/eap_server/eap_tls.c index 5747940f7..412bb8a6c 100644 --- a/src/eap_server/eap_tls.c +++ b/src/eap_server/eap_tls.c @@ -17,7 +17,7 @@ #include "common.h" #include "eap_i.h" #include "eap_tls_common.h" -#include "tls.h" +#include "crypto/tls.h" static void eap_tls_reset(struct eap_sm *sm, void *priv); diff --git a/src/eap_server/eap_tls_common.c b/src/eap_server/eap_tls_common.c index befc1bf80..d26aa233b 100644 --- a/src/eap_server/eap_tls_common.c +++ b/src/eap_server/eap_tls_common.c @@ -15,10 +15,10 @@ #include "includes.h" #include "common.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "eap_i.h" #include "eap_tls_common.h" -#include "sha1.h" -#include "tls.h" int eap_server_tls_ssl_init(struct eap_sm *sm, struct eap_ssl_data *data, diff --git a/src/eap_server/eap_ttls.c b/src/eap_server/eap_ttls.c index 6fe3bb13d..c59b9d105 100644 --- a/src/eap_server/eap_ttls.c +++ b/src/eap_server/eap_ttls.c @@ -15,12 +15,12 @@ #include "includes.h" #include "common.h" +#include "crypto/ms_funcs.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "eap_server/eap_i.h" #include "eap_server/eap_tls_common.h" -#include "ms_funcs.h" -#include "sha1.h" #include "eap_common/chap.h" -#include "tls.h" #include "eap_common/eap_ttls.h" diff --git a/src/eap_server/ikev2.c b/src/eap_server/ikev2.c index 46767c501..435ba2624 100644 --- a/src/eap_server/ikev2.c +++ b/src/eap_server/ikev2.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "dh_groups.h" +#include "crypto/dh_groups.h" #include "ikev2.h" diff --git a/src/eapol_supp/eapol_supp_sm.c b/src/eapol_supp/eapol_supp_sm.c index f3dc4bfbf..01f0ec12a 100644 --- a/src/eapol_supp/eapol_supp_sm.c +++ b/src/eapol_supp/eapol_supp_sm.c @@ -15,14 +15,14 @@ #include "includes.h" #include "common.h" -#include "eapol_supp_sm.h" -#include "eap_peer/eap.h" -#include "eloop.h" -#include "common/eapol_common.h" -#include "md5.h" -#include "crypto.h" #include "state_machine.h" #include "wpabuf.h" +#include "eloop.h" +#include "crypto/crypto.h" +#include "crypto/md5.h" +#include "common/eapol_common.h" +#include "eap_peer/eap.h" +#include "eapol_supp_sm.h" #define STATE_MACHINE_DATA struct eapol_sm #define STATE_MACHINE_DEBUG_PREFIX "EAPOL" diff --git a/src/hlr_auc_gw/milenage.c b/src/hlr_auc_gw/milenage.c index 0ce5ef3ff..43186c78f 100644 --- a/src/hlr_auc_gw/milenage.c +++ b/src/hlr_auc_gw/milenage.c @@ -24,8 +24,8 @@ #include "includes.h" #include "common.h" +#include "crypto/aes_wrap.h" #include "milenage.h" -#include "aes_wrap.h" /** diff --git a/src/radius/radius.c b/src/radius/radius.c index 1d964997a..75c2677b0 100644 --- a/src/radius/radius.c +++ b/src/radius/radius.c @@ -16,8 +16,8 @@ #include "common.h" #include "radius.h" -#include "md5.h" -#include "crypto.h" +#include "crypto/md5.h" +#include "crypto/crypto.h" static struct radius_attr_hdr * diff --git a/src/rsn_supp/peerkey.c b/src/rsn_supp/peerkey.c index ae567ca9b..59f7279b9 100644 --- a/src/rsn_supp/peerkey.c +++ b/src/rsn_supp/peerkey.c @@ -17,13 +17,13 @@ #ifdef CONFIG_PEERKEY #include "common.h" -#include "sha1.h" -#include "sha256.h" #include "eloop.h" +#include "crypto/sha1.h" +#include "crypto/sha256.h" +#include "common/ieee802_11_defs.h" #include "wpa.h" #include "wpa_i.h" #include "wpa_ie.h" -#include "common/ieee802_11_defs.h" #include "peerkey.h" diff --git a/src/rsn_supp/pmksa_cache.c b/src/rsn_supp/pmksa_cache.c index 94b255f8b..cac8c83e6 100644 --- a/src/rsn_supp/pmksa_cache.c +++ b/src/rsn_supp/pmksa_cache.c @@ -15,12 +15,10 @@ #include "includes.h" #include "common.h" -#include "wpa.h" #include "eloop.h" -#include "sha1.h" -#include "sha256.h" -#include "wpa_i.h" #include "eapol_supp/eapol_supp_sm.h" +#include "wpa.h" +#include "wpa_i.h" #include "pmksa_cache.h" #if defined(IEEE8021X_EAPOL) && !defined(CONFIG_NO_WPA2) diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c index 887bf00ba..e84771f5d 100644 --- a/src/rsn_supp/wpa.c +++ b/src/rsn_supp/wpa.c @@ -15,17 +15,17 @@ #include "includes.h" #include "common.h" -#include "crypto.h" -#include "aes_wrap.h" +#include "crypto/aes_wrap.h" +#include "crypto/crypto.h" +#include "common/ieee802_11_defs.h" +#include "eapol_supp/eapol_supp_sm.h" #include "wpa.h" #include "eloop.h" -#include "eapol_supp/eapol_supp_sm.h" #include "preauth.h" #include "pmksa_cache.h" #include "wpa_i.h" #include "wpa_ie.h" #include "peerkey.h" -#include "common/ieee802_11_defs.h" /** diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c index 5b7d52867..a7da7e0b9 100644 --- a/src/rsn_supp/wpa_ft.c +++ b/src/rsn_supp/wpa_ft.c @@ -15,12 +15,12 @@ #include "includes.h" #include "common.h" +#include "crypto/aes_wrap.h" +#include "common/ieee802_11_defs.h" +#include "common/ieee802_11_common.h" #include "wpa.h" #include "wpa_i.h" #include "wpa_ie.h" -#include "aes_wrap.h" -#include "common/ieee802_11_defs.h" -#include "common/ieee802_11_common.h" #ifdef CONFIG_IEEE80211R diff --git a/src/tls/pkcs5.c b/src/tls/pkcs5.c index 9b8e42565..4291b84f1 100644 --- a/src/tls/pkcs5.c +++ b/src/tls/pkcs5.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" -#include "crypto.h" -#include "md5.h" +#include "crypto/crypto.h" +#include "crypto/md5.h" #include "asn1.h" #include "pkcs5.h" diff --git a/src/tls/rsa.c b/src/tls/rsa.c index 4965a2a31..03676babe 100644 --- a/src/tls/rsa.c +++ b/src/tls/rsa.c @@ -15,7 +15,6 @@ #include "includes.h" #include "common.h" -#include "crypto.h" #include "asn1.h" #include "bignum.h" #include "rsa.h" diff --git a/src/tls/tlsv1_client.c b/src/tls/tlsv1_client.c index 0bf11742c..21977853d 100644 --- a/src/tls/tlsv1_client.c +++ b/src/tls/tlsv1_client.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" -#include "sha1.h" -#include "tls.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "tlsv1_common.h" #include "tlsv1_record.h" #include "tlsv1_client.h" diff --git a/src/tls/tlsv1_client_read.c b/src/tls/tlsv1_client_read.c index ee20330ce..ed3f2606c 100644 --- a/src/tls/tlsv1_client_read.c +++ b/src/tls/tlsv1_client_read.c @@ -15,10 +15,10 @@ #include "includes.h" #include "common.h" -#include "md5.h" -#include "sha1.h" +#include "crypto/md5.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "x509v3.h" -#include "tls.h" #include "tlsv1_common.h" #include "tlsv1_record.h" #include "tlsv1_client.h" diff --git a/src/tls/tlsv1_client_write.c b/src/tls/tlsv1_client_write.c index e0c95cbe8..2220dec96 100644 --- a/src/tls/tlsv1_client_write.c +++ b/src/tls/tlsv1_client_write.c @@ -15,10 +15,10 @@ #include "includes.h" #include "common.h" -#include "md5.h" -#include "sha1.h" +#include "crypto/md5.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "x509v3.h" -#include "tls.h" #include "tlsv1_common.h" #include "tlsv1_record.h" #include "tlsv1_client.h" diff --git a/src/tls/tlsv1_common.h b/src/tls/tlsv1_common.h index 77505649a..763a4af3d 100644 --- a/src/tls/tlsv1_common.h +++ b/src/tls/tlsv1_common.h @@ -15,7 +15,7 @@ #ifndef TLSV1_COMMON_H #define TLSV1_COMMON_H -#include "crypto.h" +#include "crypto/crypto.h" #define TLS_VERSION 0x0301 /* TLSv1 */ #define TLS_RANDOM_LEN 32 diff --git a/src/tls/tlsv1_cred.c b/src/tls/tlsv1_cred.c index a416998a4..aa467efc8 100644 --- a/src/tls/tlsv1_cred.c +++ b/src/tls/tlsv1_cred.c @@ -16,7 +16,7 @@ #include "common.h" #include "base64.h" -#include "crypto.h" +#include "crypto/crypto.h" #include "x509v3.h" #include "tlsv1_cred.h" diff --git a/src/tls/tlsv1_record.c b/src/tls/tlsv1_record.c index f226ac3f9..e811f0e33 100644 --- a/src/tls/tlsv1_record.c +++ b/src/tls/tlsv1_record.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" -#include "md5.h" -#include "sha1.h" +#include "crypto/md5.h" +#include "crypto/sha1.h" #include "tlsv1_common.h" #include "tlsv1_record.h" diff --git a/src/tls/tlsv1_record.h b/src/tls/tlsv1_record.h index 9170fb1a2..9c7c0a4e6 100644 --- a/src/tls/tlsv1_record.h +++ b/src/tls/tlsv1_record.h @@ -15,7 +15,7 @@ #ifndef TLSV1_RECORD_H #define TLSV1_RECORD_H -#include "crypto.h" +#include "crypto/crypto.h" #define TLS_MAX_WRITE_MAC_SECRET_LEN 20 #define TLS_MAX_WRITE_KEY_LEN 32 diff --git a/src/tls/tlsv1_server.c b/src/tls/tlsv1_server.c index 093c8748f..fdb9a74ef 100644 --- a/src/tls/tlsv1_server.c +++ b/src/tls/tlsv1_server.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" -#include "sha1.h" -#include "tls.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "tlsv1_common.h" #include "tlsv1_record.h" #include "tlsv1_server.h" diff --git a/src/tls/tlsv1_server_read.c b/src/tls/tlsv1_server_read.c index e6a71f92c..e7a195aa6 100644 --- a/src/tls/tlsv1_server_read.c +++ b/src/tls/tlsv1_server_read.c @@ -15,10 +15,10 @@ #include "includes.h" #include "common.h" -#include "md5.h" -#include "sha1.h" +#include "crypto/md5.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "x509v3.h" -#include "tls.h" #include "tlsv1_common.h" #include "tlsv1_record.h" #include "tlsv1_server.h" diff --git a/src/tls/tlsv1_server_write.c b/src/tls/tlsv1_server_write.c index 738615010..16a8a29ae 100644 --- a/src/tls/tlsv1_server_write.c +++ b/src/tls/tlsv1_server_write.c @@ -15,10 +15,10 @@ #include "includes.h" #include "common.h" -#include "md5.h" -#include "sha1.h" +#include "crypto/md5.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "x509v3.h" -#include "tls.h" #include "tlsv1_common.h" #include "tlsv1_record.h" #include "tlsv1_server.h" diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c index b3420e3f0..87bcde99f 100644 --- a/src/tls/x509v3.c +++ b/src/tls/x509v3.c @@ -18,8 +18,8 @@ #ifdef CONFIG_INTERNAL_X509 +#include "crypto/crypto.h" #include "asn1.h" -#include "crypto.h" #include "x509v3.h" diff --git a/src/wps/wps.c b/src/wps/wps.c index 251883d77..5be2b9abf 100644 --- a/src/wps/wps.c +++ b/src/wps/wps.c @@ -15,10 +15,10 @@ #include "includes.h" #include "common.h" -#include "dh_group5.h" +#include "crypto/dh_group5.h" +#include "common/ieee802_11_defs.h" #include "wps_i.h" #include "wps_dev_attr.h" -#include "common/ieee802_11_defs.h" /** diff --git a/src/wps/wps_attr_build.c b/src/wps/wps_attr_build.c index 265eb180e..bb21c40f8 100644 --- a/src/wps/wps_attr_build.c +++ b/src/wps/wps_attr_build.c @@ -15,10 +15,10 @@ #include "includes.h" #include "common.h" -#include "dh_group5.h" -#include "crypto.h" -#include "sha256.h" -#include "aes_wrap.h" +#include "crypto/aes_wrap.h" +#include "crypto/crypto.h" +#include "crypto/dh_group5.h" +#include "crypto/sha256.h" #include "wps_i.h" diff --git a/src/wps/wps_attr_process.c b/src/wps/wps_attr_process.c index ae6e906c2..7c84ca98d 100644 --- a/src/wps/wps_attr_process.c +++ b/src/wps/wps_attr_process.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "sha256.h" +#include "crypto/sha256.h" #include "wps_i.h" diff --git a/src/wps/wps_common.c b/src/wps/wps_common.c index dab85b72a..b5e1d0fc1 100644 --- a/src/wps/wps_common.c +++ b/src/wps/wps_common.c @@ -15,11 +15,11 @@ #include "includes.h" #include "common.h" -#include "dh_group5.h" -#include "sha1.h" -#include "sha256.h" -#include "aes_wrap.h" -#include "crypto.h" +#include "crypto/aes_wrap.h" +#include "crypto/crypto.h" +#include "crypto/dh_group5.h" +#include "crypto/sha1.h" +#include "crypto/sha256.h" #include "wps_i.h" #include "wps_dev_attr.h" diff --git a/src/wps/wps_enrollee.c b/src/wps/wps_enrollee.c index a7b8227e7..33b442061 100644 --- a/src/wps/wps_enrollee.c +++ b/src/wps/wps_enrollee.c @@ -15,10 +15,10 @@ #include "includes.h" #include "common.h" -#include "sha256.h" +#include "crypto/crypto.h" +#include "crypto/sha256.h" #include "wps_i.h" #include "wps_dev_attr.h" -#include "crypto.h" static int wps_build_mac_addr(struct wps_data *wps, struct wpabuf *msg) diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c index fe4b49b4a..2da674bf1 100644 --- a/src/wps/wps_registrar.c +++ b/src/wps/wps_registrar.c @@ -15,14 +15,14 @@ #include "includes.h" #include "common.h" -#include "sha256.h" #include "base64.h" -#include "common/ieee802_11_defs.h" #include "eloop.h" +#include "crypto/crypto.h" +#include "crypto/sha256.h" +#include "common/ieee802_11_defs.h" #include "wps_i.h" #include "wps_dev_attr.h" #include "wps_upnp.h" -#include "crypto.h" #include "uuid.h" #define WPS_WORKAROUNDS diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index a8d2a1d4e..8daae7591 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -10,7 +10,6 @@ export LIBDIR ?= /usr/local/lib/ export BINDIR ?= /usr/local/sbin/ CFLAGS += -I../src -CFLAGS += -I../src/crypto CFLAGS += -I../src/utils ALL=wpa_supplicant wpa_passphrase wpa_cli @@ -1365,7 +1364,7 @@ TEST_EAP_SIM_COMMON_OBJS = $(SHA1OBJS) $(MD5OBJS) \ ../src/utils/wpa_debug.o $(AESOBJS) \ tests/test_eap_sim_common.o test-eap_sim_common: $(TEST_EAP_SIM_COMMON_OBJS) - $(LDO) $(LDFLAGS) -o $@ $(TEST_AES_OBJS) $(LIBS) + $(LDO) $(LDFLAGS) -o $@ $(TEST_EAP_SIM_COMMON_OBJS) $(LIBS) ./test-eap_sim_common rm test-eap_sim_common diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 473461477..35c46fa99 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" +#include "crypto/sha1.h" #include "rsn_supp/wpa.h" -#include "sha1.h" #include "eap_peer/eap.h" #include "config.h" diff --git a/wpa_supplicant/nmake.mak b/wpa_supplicant/nmake.mak index 34da9782f..2b20f6407 100644 --- a/wpa_supplicant/nmake.mak +++ b/wpa_supplicant/nmake.mak @@ -48,7 +48,7 @@ CFLAGS = $(CFLAGS) /DPCSC_FUNCS CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE_NAMED_PIPE CFLAGS = $(CFLAGS) /DCONFIG_DRIVER_NDIS -CFLAGS = $(CFLAGS) /I..\src /I..\src\utils /I..\src\crypto +CFLAGS = $(CFLAGS) /I..\src /I..\src\utils CFLAGS = $(CFLAGS) /I. CFLAGS = $(CFLAGS) /DWIN32 CFLAGS = $(CFLAGS) /Fo$(OBJDIR)\\ /c diff --git a/wpa_supplicant/symbian/wpa_supplicant.mmp b/wpa_supplicant/symbian/wpa_supplicant.mmp index 52e741162..217908e9b 100644 --- a/wpa_supplicant/symbian/wpa_supplicant.mmp +++ b/wpa_supplicant/symbian/wpa_supplicant.mmp @@ -5,7 +5,7 @@ TARGETTYPE exe SYSTEMINCLUDE \epoc32\include \epoc32\include\variant \epoc32\include\ecom \epoc32\include\libc -USERINCLUDE .. ..\..\src ..\..\src\utils ..\..\src\crypto +USERINCLUDE .. ..\..\src ..\..\src\utils SOURCEPATH .. SOURCE main_symbian.cpp diff --git a/wpa_supplicant/tests/test_aes.c b/wpa_supplicant/tests/test_aes.c index 38a9cf58d..8c0b152e4 100644 --- a/wpa_supplicant/tests/test_aes.c +++ b/wpa_supplicant/tests/test_aes.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" -#include "crypto.h" -#include "aes_wrap.h" +#include "crypto/crypto.h" +#include "crypto/aes_wrap.h" #define BLOCK_SIZE 16 diff --git a/wpa_supplicant/tests/test_eap_sim_common.c b/wpa_supplicant/tests/test_eap_sim_common.c index ee3eee4d2..deb19f659 100644 --- a/wpa_supplicant/tests/test_eap_sim_common.c +++ b/wpa_supplicant/tests/test_eap_sim_common.c @@ -12,7 +12,7 @@ * See README and COPYING for more details. */ -#include "eap_sim_common.c" +#include "eap_common/eap_sim_common.c" static int test_eap_sim_prf(void) diff --git a/wpa_supplicant/tests/test_md4.c b/wpa_supplicant/tests/test_md4.c index e92e9a5fa..4058486a7 100644 --- a/wpa_supplicant/tests/test_md4.c +++ b/wpa_supplicant/tests/test_md4.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "crypto.h" +#include "crypto/crypto.h" int main(int argc, char *argv[]) { diff --git a/wpa_supplicant/tests/test_md5.c b/wpa_supplicant/tests/test_md5.c index d8fb41ef6..ecd3183e2 100644 --- a/wpa_supplicant/tests/test_md5.c +++ b/wpa_supplicant/tests/test_md5.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "crypto.h" +#include "crypto/crypto.h" int main(int argc, char *argv[]) { diff --git a/wpa_supplicant/tests/test_ms_funcs.c b/wpa_supplicant/tests/test_ms_funcs.c index 09b53c46f..231ccd2c4 100644 --- a/wpa_supplicant/tests/test_ms_funcs.c +++ b/wpa_supplicant/tests/test_ms_funcs.c @@ -12,7 +12,7 @@ * See README and COPYING for more details. */ -#include "ms_funcs.c" +#include "crypto/ms_funcs.c" int main(int argc, char *argv[]) diff --git a/wpa_supplicant/tests/test_sha1.c b/wpa_supplicant/tests/test_sha1.c index d2e6a9942..a2343cf6b 100644 --- a/wpa_supplicant/tests/test_sha1.c +++ b/wpa_supplicant/tests/test_sha1.c @@ -15,9 +15,9 @@ #include "includes.h" #include "common.h" -#include "sha1.h" -#include "md5.h" -#include "crypto.h" +#include "crypto/crypto.h" +#include "crypto/md5.h" +#include "crypto/sha1.h" static int test_eap_fast(void) diff --git a/wpa_supplicant/tests/test_sha256.c b/wpa_supplicant/tests/test_sha256.c index 7dc460d48..f194ff95a 100644 --- a/wpa_supplicant/tests/test_sha256.c +++ b/wpa_supplicant/tests/test_sha256.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" -#include "sha256.h" -#include "crypto.h" +#include "crypto/sha256.h" +#include "crypto/crypto.h" struct { char *data; diff --git a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj index 8ef522bdf..45b49baae 100755 --- a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj +++ b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj @@ -40,7 +40,7 @@