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.

diff --git a/eap_example/Makefile b/eap_example/Makefile
index 3efbdfab3b8b153cc30d05dbc8e2d23743fd01da..28feb8f128a49500feacf8259f14b83427e35476 100644 (file)
--- 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 0e28995ed13df7b69a041c864fc78796c4bef89c..531383f35444046f2f549df8dbfee8284d86dce3 100644 (file)
--- 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 d2130cdbb8efcbd49b989bba6d5df068b5c7bdf4..6524ff0190ffa829d58437be8a62f8c595205be4 100644 (file)
--- 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 a13adaf446d91031a682b4aeac518e92df268a6d..d4ce22744b20a819d852cba718de9f51455a8b23 100644 (file)
--- 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 7799316c6b6e364d6023ac4c7c8d9628dbd13a3d..da873d0b947feb5788c260d8fe551b328784ea03 100644 (file)
--- 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 b92065e0d66161e78a50426fcb21cc7c2cb6bc09..f9d519e8e8a9b72ae356e6dadc3f8b61cc76778d 100644 (file)
--- 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 1399e1dbce1d650f700b62b51711c98ac127a66d..9336750b6cf0a72702517bc63417ade4f956b241 100644 (file)
--- 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 4f403563d1cf9966b4d04b81c6aaa1a1f544b300..20efca092b6a87106d7c7cf28aa0c6bf95939321 100644 (file)
--- 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 99290f06368e5992e2091a7323a133031dcc6b58..839802a744c5df861d2538204a6e6b2898bffbcf 100644 (file)
--- 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 e74b936c4030fff9c6100d7e295c91b65fd5e489..4bee2d94b49ee78d75951dabb0a69a00f46cf8e1 100644 (file)
--- 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 265235fd65236f1f54c7a94f650675932ecfdd02..a2b964effdd9e2cc6a009c563fe33b6fe76016d0 100644 (file)
--- 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 ab9555709ad42dd09863f386eb4d20ed10ca5126..73425e660f78758678b94db622bb5a8b4ec7c2fa 100644 (file)
--- a/hostapd/wpa.c
+++ b/hostapd/wpa.c
@@ -17,14 +17,14 @@
 #ifndef CONFIG_NATIVE_WINDOWS
 
 #include "common.h"
-#include "config.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 "sha1.h"
-#include "sha256.h"
-#include "aes_wrap.h"
-#include "crypto.h"
-#include "eloop.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 55104239beb19eb71494eeea1878ca25634c495b..495f27f11df452400f929008e2d013974fe41b83 100644 (file)
--- 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 61746426ea1bab0eb11e81d56f0836cc85a9b2ad..e82a74f1ccad0107468ad31c6f8ca79d80df12b9 100644 (file)
--- 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 1362947572cc88a142b44120cb051b33668ee781..c9c0e0077b4391c3f20c9c4f675ee74705a5137a 100644 (file)
--- 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 8e64ffdcc08a1e4ed2d7273d2903ac9cb0cfaa26..8213fdacc32e8482487193c04e174103c08c9f07 100644 (file)
--- 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 546adb922d7824ae09e3206ed23b11918d0d2d44..9dece958917ca154c333dd5f5b3dd4a52721bbfe 100644 (file)
--- 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 5b7e07ea80947c16b346241de42fbc5850fd8680..60bfc1c8168fbf03400a4714e6f00f477e63f2fd 100644 (file)
--- 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 4d3deafa0cec9691383805bfb4517832e7fe0b5e..4de34a87b611d47b095ee5ea687fafd67ac3daad 100644 (file)
--- 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 414610cf5a4edf5bdcd24e4f5dd2cf83b366d02c..4076262880613e7deef144d065427711c1af21d8 100644 (file)
--- 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 80110469dcc384df9101fab1697634a633036db3..32dc80c74dc5b76030ebf487506bc41a758ec9c2 100644 (file)
--- 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 14625f963921860820a24fe679b7e8287593b4c7..3a64b8ecc44c33e307f6e15bb64bd809f31edd27 100644 (file)
--- 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 0def3e885371c29df60b28b5bd1187df670ce86e..7417d5c73df5ec08287f3822a42ec057af93d7bb 100644 (file)
--- 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 eafad1d1172302196785949975c31a5b7d71413d..9002b0ca328a48b378d27f9a137f9280a60929ac 100644 (file)
--- 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 79fda1f45b5dc8a51043b03610bf6d2223c40a61..56b4ded45963e48906805f51d7b751faaad94886 100644 (file)
--- 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 818b5bdbaad8eddcd990816bceacb0573845e714..67754d8159d0e44bc324f36458d4b3b086638f05 100644 (file)
--- 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 dd9a8be3ddffa41ade9ae5dfe9de4e30eaa46295..0630f9a5aef6e1ff574a0da57b2936c254bddc84 100644 (file)
--- a/src/eap_peer/eap.c
+++ b/src/eap_peer/eap.c
@@ -24,14 +24,14 @@
 #include "includes.h"
 
 #include "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 "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"
 
 #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 f23714142586c418b093bf38264abd8afb8202b7..f00031e1af13963e7551eec82ea2706f6dc78980 100644 (file)
--- 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 d00867099aa3a75708a4969bfe184f980ed24b59..c46db01f7793fe765892b98606c6ba99746285e9 100644 (file)
--- 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 526ce93a8636b3c2af4b4d5b59e2955b12bf5ed2..a7c94a4d4480de03e22db861b150fb70e18dff02 100644 (file)
--- 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 d0ca44d05e8ad728c9038dcedaae8eb3e8ca877a..cd410d91b5df8b02702b5060da5ff7a2e71222ce 100644 (file)
--- 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 afd56dd49b7faec1380413a3aeef6056539ee953..2e04831ae53dc72dd604f5074d76904999c84c8b 100644 (file)
--- 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 894fc632fda369815cfda8bac3ab5b061d0b6250..2864f452a95d2c3385af20d007e86755f32e417a 100644 (file)
--- 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 1ce635663982fd1619f72f8ab680cd651d00b55e..ccf871e13ba0bbe52dc77bcbb4fa88bc4d158130 100644 (file)
--- 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 31344a9136b2981efc63f58ff456fe14cf4af2c1..20b2212e1cdc4fff0e6e9cfe7ef2a95f8c5d3f91 100644 (file)
--- 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 19afb90dcf2e7c9edece99e6fc5e16af6497b1bb..43ee584055b81ae8f7b36f17b36cd817bef9b23f 100644 (file)
--- 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 f2eb0db260d0cadba7b79799cd5fcd45c4646707..800f1b57db6227969862ec15c0010fb4b322f2a1 100644 (file)
--- 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 9172e1f3481d4d05493c8488a90cd494b9768f5e..309a331124eb86a306f0994d019d0e6044cdb80c 100644 (file)
--- 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 49235b5bff3d53ad8b807e12da191690012981d5..b8fb07502fd73d332b55a05a4cb9149c0506bc97 100644 (file)
--- 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 033dfbb3f599f6e2df9ea97bfdee7c84918d5787..4e7db48d0793d6c579fca2f66668eeab97bdf847 100644 (file)
--- 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 356390848bb8550732bb7d94d35ae2386835e457..e42b2af9e433a06174fda0d0913c7a30e6b20284 100644 (file)
--- 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 8b7b352ce4aa2929e3532bcbce13032c39972479..39d1c6ef2b368b2d9026040cf8e4ad0135b0ee17 100644 (file)
--- 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 4789e5756a1636bbe6fa4d9fba5ca2ea18942b36..9ffb15d9d5cdf255c984551c8379fa43af919908 100644 (file)
--- 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 c68d4c34d4514b579af453c87fe6976a5910b998..4c30346e59cedef119d02fabe1b13fe5e6e06ff6 100644 (file)
--- 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 5747940f7806d0ee10100720db0569cbd8f2ea4f..412bb8a6c225c370c34b8c21f2483ad69ef2ea1f 100644 (file)
--- 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 befc1bf80f83da100354bc900bfea2b90628c1a6..d26aa233bf174811a971399fa5c972898685935e 100644 (file)
--- 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 6fe3bb13d33d17895a7e166123885e5ac1eb8446..c59b9d105d5b1f5c2e58097bae646b4cfae37793 100644 (file)
--- 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 46767c501405319fdd2bb73b834f3b9ba57384c7..435ba26249332ff9d943885f8287de06f629d035 100644 (file)
--- 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 f3dc4bfbf64d90fedbe895447a59c7009cb2b8b7..01f0ec12a51442825a19a5dbf979cc87b036173f 100644 (file)
--- 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 0ce5ef3ff671e7314232a0cd2be277fec27bec59..43186c78ffafa3eb534b4a1efc48db85f903dd66 100644 (file)
--- 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 1d964997a24c844879eea4996e79d92a161ad8d0..75c2677b04e7d83a9b8b07aeed6462d4ef7f8a12 100644 (file)
--- 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 ae567ca9b8ca703f502e546d76cee4ba33e6d8f5..59f7279b9ce98cbcf4baecbb2d751c425d77c5c8 100644 (file)
--- 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 94b255f8bb9f9a48dd91085bc99b10a49ff25abe..cac8c83e6eeb4569794d9d2b3294686242484b5c 100644 (file)
--- 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 887bf00baf5b24cd3f2e950cb7711ab551fa07b8..e84771f5dfee76f1ff039a95673e914be2986f52 100644 (file)
--- 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 5b7d52867f1c243316f018e3667faf2b86855bbe..a7da7e0b9f30905c2034a966deee0ca5583eb3bc 100644 (file)
--- 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 9b8e4256509a7dc914824e199c1cae4f41d2b674..4291b84f16d7fc862968ed3237003edf333f29c4 100644 (file)
--- 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 4965a2a311cc6182ce407965376f06b93fd67fb5..03676babe5683ddd3d35f72e8b2a3aae6757ff14 100644 (file)
--- 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 0bf11742ca9343e8dd9eb185616050fcdf3c9eab..21977853dce95a8f2e3c94d4929739fda17c96dd 100644 (file)
--- 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 ee20330ce2c6b6174da4f034cf39a48fa49df013..ed3f2606c8cc24d87effcbe93e0999ed22f4222c 100644 (file)
--- 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 e0c95cbe8ebece744ce13c819ee39dad59039c32..2220dec966fb1a8c634a8e43e30486def6c64129 100644 (file)
--- 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 77505649a252817669a236b42a2d60fe102140a7..763a4af3d5611ff43af307f4205ce05de1d721fa 100644 (file)
--- 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 a416998a405a3278773af71a10e06307fc1dfb46..aa467efc8c3c28bcf8cbebac558af5b99295a904 100644 (file)
--- 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 f226ac3f9b3787a03ebcc1c55c958eb5e947f16a..e811f0e33b440145014b61162d71bc81f349ff04 100644 (file)
--- 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 9170fb1a2fe45661191ff95c289e1130386befc7..9c7c0a4e644e2167795687df0e25dc74607c2c00 100644 (file)
--- 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 093c8748f37dd9b4b5c887f1eecf97655f7aef02..fdb9a74efdcc66d3cb987c41fcaa63d716566077 100644 (file)
--- 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 e6a71f92c139d30bba0549bf702a7d8a5b31e521..e7a195aa650b289e847b03b3d97e5e95e7adcb86 100644 (file)
--- 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 73861501004dd63c24e0fe17c06c7c73bb60c3d4..16a8a29aef7eac4c43a3571c59c4671c17433372 100644 (file)
--- 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 b3420e3f04250c574cac117097838ca759e10f8f..87bcde99fb987fd3715935118a19b87754129754 100644 (file)
--- 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 251883d77024c531625cbad9dc01256ce8b95e72..5be2b9abf4e96fe9d7c3751a73ce815d21011af3 100644 (file)
--- 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 265eb180ef50d890f07090798948636055af5a4f..bb21c40f8c703c0c13042593dc081209a6286cab 100644 (file)
--- 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 ae6e906c265a25f0f5b1e15d7476adeb596b2429..7c84ca98d2e3eb7baa97883dec446b9a56e930d2 100644 (file)
--- 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 dab85b72a2c93e9c5506626c3af69520e3df7546..b5e1d0fc135cb65b3aa5e925d48e21efea02fa18 100644 (file)
--- 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 a7b8227e777962c383a665f5bc160594daafafe3..33b44206117c95aa786d187b13959de31ea9a116 100644 (file)
--- 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 fe4b49b4a1069d3bb3ffbe6fc5e7b43808d96224..2da674bf115b6a35857e851419b176b97fa4720d 100644 (file)
--- 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 a8d2a1d4e3107258ba0e8f76b6d0eee72a38eafb..8daae759176172aa52695f984f5e5c664eb0f9c1 100644 (file)
--- 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 473461477ca6fa7af5689a0bc76a0665d2a6c3d9..35c46fa99686630047d1d08c58f6512d4ef3abab 100644 (file)
--- 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 34da9782f019c18ba4042f1a4b26c4a20481ce45..2b20f64073b95dab4dd665660aff45448ea088a8 100644 (file)
--- 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 52e741162a4069e586694fa198d19d383ac6a738..217908e9b0032d733a21a5b45a01b7becac37f72 100644 (file)
--- 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 38a9cf58d4309cadbe19e059524b649b94a4507a..8c0b152e473e62494073c5625e49dcedd3adfd73 100644 (file)
--- 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 ee3eee4d2911d9c39f298dff889a744e0ed005df..deb19f6591de4de86c403debaae5c912682b2cec 100644 (file)
--- 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 e92e9a5fafdd480b09b0a49a8b0365a11e5980ed..4058486a7de11962cd6e43a1585f1aa62d15a0dd 100644 (file)
--- 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 d8fb41ef694ed6dbaded97abd7caa7a81ea6c26c..ecd3183e288e0da9949a62b5fae7a172d81b08e4 100644 (file)
--- 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 09b53c46f34f73ba7b824455efdd308051802873..231ccd2c4b7af6a63c3f6c024a7cb3d460740edd 100644 (file)
--- 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 d2e6a9942597d4c9d4491a041bc8dc117c443cf7..a2343cf6b44d24b69aa5b35517b894f0373d808e 100644 (file)
--- 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 7dc460d483e8e16146b4378f9ca250ec4f2b1810..f194ff95a244dcc13bca42ae9fc6520f11a61dc1 100644 (file)
--- 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 8ef522bdf2f7b418d9fffd16ec318612623996c8..45b49baae1d7be96667ea3db0fe5784d7f54172a 100755 (executable)
--- a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
+++ b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj b/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
index 4fa28dfbc62d0e66928e3295ebad4e87dda56c8e..dccf9b5cb3dc82ae06933e300f26114b429b3375 100755 (executable)
--- a/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
+++ b/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\src\utils;..\..\..\src\crypto;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..\..\src\utils;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\src\utils;..\..\..\src\crypto;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..\..\src\utils;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
index 41a7c67a054a3146ece599e4bb1e722942b9a10c..9d14f520fa1c92836a4ce66c9576becc4f49b14b 100755 (executable)
--- a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
+++ b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
index 947cd9db56bc0bcc3727d19af1fd7f70b7bfa6b8..f7223da27ec16dcf9bb62a1a9ddf511e286c886f 100755 (executable)
--- a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
+++ b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/wpa_passphrase.c b/wpa_supplicant/wpa_passphrase.c
index 96b0c32c2cee982f4142ef60d90e43fe5cbe1256..67465aaf08f91e528beeb37c50a51758d8d39e21 100644 (file)
--- a/wpa_supplicant/wpa_passphrase.c
+++ b/wpa_supplicant/wpa_passphrase.c
@@ -15,7 +15,7 @@
 #include "includes.h"
 
 #include "common.h"
-#include "sha1.h"
+#include "crypto/sha1.h"
 
 
 int main(int argc, char *argv[])

diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 2833e21b5ffe0acb619217ef7fcf3ee9f910705b..b25e8df3627f885c7a66e57d66028fecfd5a29d6 100644 (file)
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -15,22 +15,22 @@
 #include "includes.h"
 
 #include "common.h"
+#include "eloop.h"
+#include "uuid.h"
+#include "crypto/dh_group5.h"
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"
 #include "common/wpa_common.h"
-#include "config.h"
+#include "common/wpa_ctrl.h"
+#include "eap_common/eap_wsc_common.h"
 #include "eap_peer/eap.h"
+#include "rsn_supp/wpa.h"
+#include "config.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
-#include "eloop.h"
-#include "uuid.h"
-#include "common/wpa_ctrl.h"
 #include "notify.h"
-#include "eap_common/eap_wsc_common.h"
 #include "blacklist.h"
-#include "rsn_supp/wpa.h"
 #include "wps_supplicant.h"
-#include "dh_group5.h"
 
 #define WPS_PIN_SCAN_IGNORE_SEL_REG 3
 

diff --git a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
index 8029fff6770c0dd5b18490dc34867992ba752c0f..dc5aeb2024297b4e5101530ecf0792bbfadf630b 100644 (file)
--- a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
+++ b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
@@ -453,7 +453,6 @@
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                HEADER_SEARCH_PATHS = (
                                        ../../src,
-                                       ../../src/crypto,
                                        ../../src/utils,
                                );
                                ONLY_ACTIVE_ARCH = YES;
@@ -475,7 +474,6 @@
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                HEADER_SEARCH_PATHS = (
                                        ../../src,
-                                       ../../src/crypto,
                                        ../../src/utils,
                                );
                                OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS";