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.

9 files changed, 17 insertions, 21 deletions

diff --git a/src/eap_common/chap.c b/src/eap_common/chap.c
index 5b7e07e..60bfc1c 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 4d3deaf..4de34a8 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 414610c..4076262 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 8011046..32dc80c 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 14625f9..3a64b8e 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 0def3e8..7417d5c 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 eafad1d..9002b0c 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 79fda1f..56b4ded 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 818b5bd..67754d8 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"