From 9ec363a25d8c68c18e99027b60f099531cd5885b Mon Sep 17 00:00:00 2001
From: Nachiket Kukade <nachiket.kukade@espressif.com>
Date: Tue, 6 Aug 2019 17:10:16 +0530
Subject: [PATCH] wpa_supplicant: Make internally used crypto headers private

A lot of internally used crypto headers are publicly includeable
in user projects. This leads to bug reports when these headers
are incorrectly used or the API's are not used as intended.

Move all crypto headers into private crypto src folder, also move
crypto_ops into Supplicant to remove dependecy on crypto headers.

Closes IDF-476
---
 components/esp32/esp_adapter.c                   |  5 -----
 components/esp_wifi/CMakeLists.txt               |  1 -
 components/wpa_supplicant/CMakeLists.txt         |  1 +
 .../wpa_supplicant/include/crypto/wepkey.h       | 10 ----------
 .../include/esp_supplicant/esp_wpa.h             |  5 ++++-
 components/wpa_supplicant/src/ap/ieee802_1x.c    |  1 -
 components/wpa_supplicant/src/crypto/aes-cbc.c   |  4 ++--
 .../wpa_supplicant/src/crypto/aes-internal-dec.c |  4 ++--
 .../wpa_supplicant/src/crypto/aes-internal-enc.c |  4 ++--
 .../wpa_supplicant/src/crypto/aes-internal.c     |  4 ++--
 .../wpa_supplicant/src/crypto/aes-unwrap.c       |  4 ++--
 components/wpa_supplicant/src/crypto/aes-wrap.c  |  4 ++--
 .../wpa_supplicant/{include => src}/crypto/aes.h |  0
 components/wpa_supplicant/src/crypto/aes_i.h     |  2 +-
 .../{include => src}/crypto/aes_wrap.h           |  0
 .../{include => src}/crypto/crypto.h             |  0
 .../src/crypto/crypto_internal-cipher.c          |  6 +++---
 .../src/crypto/crypto_internal-modexp.c          |  2 +-
 .../src/crypto/crypto_internal-rsa.c             |  2 +-
 .../wpa_supplicant/src/crypto/crypto_internal.c  |  6 +++---
 .../wpa_supplicant/src/crypto/crypto_mbedtls.c   |  2 +-
 .../src/crypto}/crypto_ops.c                     | 16 ++++++++--------
 .../wpa_supplicant/src/crypto/des-internal.c     |  2 +-
 components/wpa_supplicant/src/crypto/dh_group5.c |  4 ++--
 .../{include => src}/crypto/dh_group5.h          |  0
 components/wpa_supplicant/src/crypto/dh_groups.c |  6 +++---
 .../{include => src}/crypto/dh_groups.h          |  0
 .../wpa_supplicant/src/crypto/md4-internal.c     |  2 +-
 .../wpa_supplicant/src/crypto/md5-internal.c     |  6 +++---
 components/wpa_supplicant/src/crypto/md5.c       |  4 ++--
 .../wpa_supplicant/{include => src}/crypto/md5.h |  0
 components/wpa_supplicant/src/crypto/ms_funcs.c  |  6 +++---
 .../{include => src}/crypto/ms_funcs.h           |  0
 .../{include => src}/crypto/random.h             |  0
 components/wpa_supplicant/src/crypto/rc4.c       |  2 +-
 .../wpa_supplicant/src/crypto/sha1-internal.c    |  8 ++++----
 .../wpa_supplicant/src/crypto/sha1-pbkdf2.c      |  6 +++---
 components/wpa_supplicant/src/crypto/sha1.c      |  4 ++--
 .../{include => src}/crypto/sha1.h               |  0
 .../wpa_supplicant/src/crypto/sha256-internal.c  |  4 ++--
 components/wpa_supplicant/src/crypto/sha256.c    |  4 ++--
 .../{include => src}/crypto/sha256.h             |  0
 .../wpa_supplicant/src/eap_peer/eap_ttls.c       |  1 -
 .../src/esp_supplicant/esp_wpa_main.c            |  1 -
 components/wpa_supplicant/src/rsn_supp/wpa.c     |  1 -
 components/wpa_supplicant/src/wps/wps.c          |  2 --
 .../wpa_supplicant/src/wps/wps_attr_build.c      |  2 +-
 components/wpa_supplicant/src/wps/wps_common.c   |  2 +-
 48 files changed, 66 insertions(+), 84 deletions(-)
 delete mode 100644 components/wpa_supplicant/include/crypto/wepkey.h
 rename components/wpa_supplicant/{include => src}/crypto/aes.h (100%)
 rename components/wpa_supplicant/{include => src}/crypto/aes_wrap.h (100%)
 rename components/wpa_supplicant/{include => src}/crypto/crypto.h (100%)
 rename components/{esp_wifi/src => wpa_supplicant/src/crypto}/crypto_ops.c (91%)
 rename components/wpa_supplicant/{include => src}/crypto/dh_group5.h (100%)
 rename components/wpa_supplicant/{include => src}/crypto/dh_groups.h (100%)
 rename components/wpa_supplicant/{include => src}/crypto/md5.h (100%)
 rename components/wpa_supplicant/{include => src}/crypto/ms_funcs.h (100%)
 rename components/wpa_supplicant/{include => src}/crypto/random.h (100%)
 rename components/wpa_supplicant/{include => src}/crypto/sha1.h (100%)
 rename components/wpa_supplicant/{include => src}/crypto/sha256.h (100%)

diff --git a/components/esp32/esp_adapter.c b/components/esp32/esp_adapter.c
index 0699bf70ca0..4fdd5ce65eb 100644
--- a/components/esp32/esp_adapter.c
+++ b/components/esp32/esp_adapter.c
@@ -38,11 +38,6 @@
 #include "esp_private/wifi_os_adapter.h"
 #include "esp_private/wifi.h"
 #include "esp_phy_init.h"
-#include "crypto/md5.h"
-#include "crypto/sha1.h"
-#include "crypto/crypto.h"
-#include "crypto/aes.h"
-#include "crypto/dh_group5.h"
 #include "driver/periph_ctrl.h"
 #include "nvs.h"
 #include "os.h"
diff --git a/components/esp_wifi/CMakeLists.txt b/components/esp_wifi/CMakeLists.txt
index 4994e19dc3b..925704f9334 100644
--- a/components/esp_wifi/CMakeLists.txt
+++ b/components/esp_wifi/CMakeLists.txt
@@ -5,7 +5,6 @@ if(NOT CONFIG_ESP32_NO_BLOBS)
 endif()
 
 idf_component_register(SRCS "src/coexist.c"
-                            "src/crypto_ops.c"
                             "src/lib_printf.c"
                             "src/mesh_event.c"
                             "src/phy_init.c"
diff --git a/components/wpa_supplicant/CMakeLists.txt b/components/wpa_supplicant/CMakeLists.txt
index 2b7e14924f2..330b94d6c29 100644
--- a/components/wpa_supplicant/CMakeLists.txt
+++ b/components/wpa_supplicant/CMakeLists.txt
@@ -12,6 +12,7 @@ set(srcs "port/os_xtensa.c"
     "src/crypto/aes-wrap.c"
     "src/crypto/bignum.c"
     "src/crypto/crypto_mbedtls.c"
+    "src/crypto/crypto_ops.c"
     "src/crypto/crypto_internal-cipher.c"
     "src/crypto/crypto_internal-modexp.c"
     "src/crypto/crypto_internal-rsa.c"
diff --git a/components/wpa_supplicant/include/crypto/wepkey.h b/components/wpa_supplicant/include/crypto/wepkey.h
deleted file mode 100644
index 32a8cf9b374..00000000000
--- a/components/wpa_supplicant/include/crypto/wepkey.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef WEPKEY_H
-#define WEPKEY_H
-
-#define WEPKEY_64_BYTES   5
-#define WePKEY_128_BYTES  13
-
-unsigned int wepkey_64(uint8_t *out, unsigned int size, const char *in, int n);
-unsigned int wepkey_128(uint8_t *out, unsigned int size, const char *in, int n);
-
-#endif /* WEPKEY_H */
\ No newline at end of file
diff --git a/components/wpa_supplicant/include/esp_supplicant/esp_wpa.h b/components/wpa_supplicant/include/esp_supplicant/esp_wpa.h
index 33f0fe57a4d..c7fbcfacbe4 100644
--- a/components/wpa_supplicant/include/esp_supplicant/esp_wpa.h
+++ b/components/wpa_supplicant/include/esp_supplicant/esp_wpa.h
@@ -40,7 +40,10 @@ extern "C" {
 /** @addtogroup WPA_APIs
   * @{
   */
-
+/* Crypto callback functions */
+const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
+/* Mesh crypto callback functions */
+const mesh_crypto_funcs_t g_wifi_default_mesh_crypto_funcs;
 
 /**
   * @brief     Supplicant initialization
diff --git a/components/wpa_supplicant/src/ap/ieee802_1x.c b/components/wpa_supplicant/src/ap/ieee802_1x.c
index 5b459a78659..62de7f5940d 100644
--- a/components/wpa_supplicant/src/ap/ieee802_1x.c
+++ b/components/wpa_supplicant/src/ap/ieee802_1x.c
@@ -10,7 +10,6 @@
 
 #include "utils/common.h"
 #include "crypto/crypto.h"
-#include "crypto/random.h"
 #include "common/ieee802_11_defs.h"
 #include "hostapd.h"
 #include "ap/sta_info.h"
diff --git a/components/wpa_supplicant/src/crypto/aes-cbc.c b/components/wpa_supplicant/src/crypto/aes-cbc.c
index 24c5670090f..03d7a68ba6f 100644
--- a/components/wpa_supplicant/src/crypto/aes-cbc.c
+++ b/components/wpa_supplicant/src/crypto/aes-cbc.c
@@ -31,8 +31,8 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/aes.h"
-#include "crypto/aes_wrap.h"
+#include "aes.h"
+#include "aes_wrap.h"
 
 #ifdef USE_MBEDTLS_CRYPTO
 #include "mbedtls/aes.h"
diff --git a/components/wpa_supplicant/src/crypto/aes-internal-dec.c b/components/wpa_supplicant/src/crypto/aes-internal-dec.c
index 5cea5f745f9..8c91b5c00e6 100644
--- a/components/wpa_supplicant/src/crypto/aes-internal-dec.c
+++ b/components/wpa_supplicant/src/crypto/aes-internal-dec.c
@@ -24,8 +24,8 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/crypto.h"
-#include "crypto/aes_i.h"
+#include "crypto.h"
+#include "aes_i.h"
 
 
 
diff --git a/components/wpa_supplicant/src/crypto/aes-internal-enc.c b/components/wpa_supplicant/src/crypto/aes-internal-enc.c
index 5b714fedbab..56084e44899 100644
--- a/components/wpa_supplicant/src/crypto/aes-internal-enc.c
+++ b/components/wpa_supplicant/src/crypto/aes-internal-enc.c
@@ -23,8 +23,8 @@
 
 #include "utils/includes.h"
 #include "utils/common.h"
-#include "crypto/crypto.h"
-#include "crypto/aes_i.h"
+#include "crypto.h"
+#include "aes_i.h"
 
 #include "os.h"
 
diff --git a/components/wpa_supplicant/src/crypto/aes-internal.c b/components/wpa_supplicant/src/crypto/aes-internal.c
index 537d4034a71..93592f1dc8a 100644
--- a/components/wpa_supplicant/src/crypto/aes-internal.c
+++ b/components/wpa_supplicant/src/crypto/aes-internal.c
@@ -24,8 +24,8 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/crypto.h"
-#include "crypto/aes_i.h"
+#include "crypto.h"
+#include "aes_i.h"
 
 /*
  * rijndael-alg-fst.c
diff --git a/components/wpa_supplicant/src/crypto/aes-unwrap.c b/components/wpa_supplicant/src/crypto/aes-unwrap.c
index 9f513b0ac5d..090c2a90951 100644
--- a/components/wpa_supplicant/src/crypto/aes-unwrap.c
+++ b/components/wpa_supplicant/src/crypto/aes-unwrap.c
@@ -34,8 +34,8 @@
 #ifdef USE_MBEDTLS_CRYPTO
 #include "mbedtls/aes.h"
 #else /* USE_MBEDTLS_CRYPTO */
-#include "crypto/aes.h"
-#include "crypto/aes_wrap.h"
+#include "aes.h"
+#include "aes_wrap.h"
 #endif /* USE_MBEDTLS_CRYPTO */
 
 /**
diff --git a/components/wpa_supplicant/src/crypto/aes-wrap.c b/components/wpa_supplicant/src/crypto/aes-wrap.c
index 9d180f5222c..42e60660b69 100644
--- a/components/wpa_supplicant/src/crypto/aes-wrap.c
+++ b/components/wpa_supplicant/src/crypto/aes-wrap.c
@@ -25,8 +25,8 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/aes.h"
-#include "crypto/aes_wrap.h"
+#include "aes.h"
+#include "aes_wrap.h"
 #ifdef USE_MBEDTLS_CRYPTO
 #include "mbedtls/aes.h"
 #endif /* USE_MBEDTLS_CRYPTO */
diff --git a/components/wpa_supplicant/include/crypto/aes.h b/components/wpa_supplicant/src/crypto/aes.h
similarity index 100%
rename from components/wpa_supplicant/include/crypto/aes.h
rename to components/wpa_supplicant/src/crypto/aes.h
diff --git a/components/wpa_supplicant/src/crypto/aes_i.h b/components/wpa_supplicant/src/crypto/aes_i.h
index 290ac423bdb..1063422a810 100644
--- a/components/wpa_supplicant/src/crypto/aes_i.h
+++ b/components/wpa_supplicant/src/crypto/aes_i.h
@@ -15,7 +15,7 @@
 #ifndef AES_I_H
 #define AES_I_H
 
-#include "crypto/aes.h"
+#include "aes.h"
 
 /* #define FULL_UNROLL */
 #define AES_SMALL_TABLES
diff --git a/components/wpa_supplicant/include/crypto/aes_wrap.h b/components/wpa_supplicant/src/crypto/aes_wrap.h
similarity index 100%
rename from components/wpa_supplicant/include/crypto/aes_wrap.h
rename to components/wpa_supplicant/src/crypto/aes_wrap.h
diff --git a/components/wpa_supplicant/include/crypto/crypto.h b/components/wpa_supplicant/src/crypto/crypto.h
similarity index 100%
rename from components/wpa_supplicant/include/crypto/crypto.h
rename to components/wpa_supplicant/src/crypto/crypto.h
diff --git a/components/wpa_supplicant/src/crypto/crypto_internal-cipher.c b/components/wpa_supplicant/src/crypto/crypto_internal-cipher.c
index 3fe2412e100..9ca428cfe34 100644
--- a/components/wpa_supplicant/src/crypto/crypto_internal-cipher.c
+++ b/components/wpa_supplicant/src/crypto/crypto_internal-cipher.c
@@ -23,10 +23,10 @@
 
 #include "utils/common.h"
 #include "utils/includes.h"
-#include "crypto/crypto.h"
-#include "crypto/aes.h"
+#include "crypto.h"
+#include "aes.h"
 #if defined(CONFIG_DES) || defined(CONFIG_DES3)
-#include "crypto/des_i.h"
+#include "des_i.h"
 #endif
 #ifdef USE_MBEDTLS_CRYPTO
 #include "mbedtls/aes.h"
diff --git a/components/wpa_supplicant/src/crypto/crypto_internal-modexp.c b/components/wpa_supplicant/src/crypto/crypto_internal-modexp.c
index f37139ba19a..8d9d7fe83dd 100644
--- a/components/wpa_supplicant/src/crypto/crypto_internal-modexp.c
+++ b/components/wpa_supplicant/src/crypto/crypto_internal-modexp.c
@@ -35,7 +35,7 @@
 #else /* USE_MBEDTLS_CRYPTO */
 #include "bignum.h"
 #endif /* USE_MBEDTLS_CRYPTO */
-#include "crypto/crypto.h"
+#include "crypto.h"
 
 #ifdef USE_MBEDTLS_CRYPTO
 int
diff --git a/components/wpa_supplicant/src/crypto/crypto_internal-rsa.c b/components/wpa_supplicant/src/crypto/crypto_internal-rsa.c
index de7c8091e98..1d63137fa59 100644
--- a/components/wpa_supplicant/src/crypto/crypto_internal-rsa.c
+++ b/components/wpa_supplicant/src/crypto/crypto_internal-rsa.c
@@ -7,7 +7,7 @@
  */
 
 #include "utils/common.h"
-#include "crypto/crypto.h"
+#include "crypto.h"
 
 #include "utils/includes.h"
 #include "utils/common.h"
diff --git a/components/wpa_supplicant/src/crypto/crypto_internal.c b/components/wpa_supplicant/src/crypto/crypto_internal.c
index 4622cfcb899..ca82d0d52b6 100644
--- a/components/wpa_supplicant/src/crypto/crypto_internal.c
+++ b/components/wpa_supplicant/src/crypto/crypto_internal.c
@@ -23,9 +23,9 @@
 
 #include "utils/includes.h"
 #include "utils/common.h"
-#include "crypto/crypto.h"
-#include "crypto/sha1_i.h"
-#include "crypto/md5_i.h"
+#include "crypto.h"
+#include "sha1_i.h"
+#include "md5_i.h"
 #ifdef USE_MBEDTLS_CRYPTO
 #include "mbedtls/sha256.h"
 #endif
diff --git a/components/wpa_supplicant/src/crypto/crypto_mbedtls.c b/components/wpa_supplicant/src/crypto/crypto_mbedtls.c
index 315a6834ffe..d6a91b5329f 100644
--- a/components/wpa_supplicant/src/crypto/crypto_mbedtls.c
+++ b/components/wpa_supplicant/src/crypto/crypto_mbedtls.c
@@ -19,7 +19,7 @@
 
 #include "utils/includes.h"
 #include "utils/common.h"
-#include "crypto/crypto.h"
+#include "crypto.h"
 
 #include "mbedtls/ecp.h"
 #include "mbedtls/entropy.h"
diff --git a/components/esp_wifi/src/crypto_ops.c b/components/wpa_supplicant/src/crypto/crypto_ops.c
similarity index 91%
rename from components/esp_wifi/src/crypto_ops.c
rename to components/wpa_supplicant/src/crypto/crypto_ops.c
index fdef5ca57e9..f46d823dfe5 100644
--- a/components/esp_wifi/src/crypto_ops.c
+++ b/components/wpa_supplicant/src/crypto/crypto_ops.c
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 #include "utils/common.h"
-#include "crypto/aes_wrap.h"
-#include "crypto/sha256.h"
-#include "crypto/crypto.h"
-#include "crypto/md5.h"
-#include "crypto/sha1.h"
-#include "crypto/aes.h"
-#include "crypto/dh_group5.h"
-#include "esp_wifi_crypto_types.h"
+#include "aes_wrap.h"
+#include "sha256.h"
+#include "crypto.h"
+#include "md5.h"
+#include "sha1.h"
+#include "aes.h"
+#include "esp_wpa.h"
+
 /* 
  * This structure is used to set the cyrpto callback function for station to connect when in security mode.
  * These functions either call MbedTLS API's if USE_MBEDTLS_CRYPTO flag is set through Kconfig, or native
diff --git a/components/wpa_supplicant/src/crypto/des-internal.c b/components/wpa_supplicant/src/crypto/des-internal.c
index 7c66412286f..077b7d013c7 100644
--- a/components/wpa_supplicant/src/crypto/des-internal.c
+++ b/components/wpa_supplicant/src/crypto/des-internal.c
@@ -12,7 +12,7 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/crypto.h"
+#include "crypto.h"
 //#include "des_i.h"
 
 /*
diff --git a/components/wpa_supplicant/src/crypto/dh_group5.c b/components/wpa_supplicant/src/crypto/dh_group5.c
index 5ae75da2e19..d5adaf24fde 100644
--- a/components/wpa_supplicant/src/crypto/dh_group5.c
+++ b/components/wpa_supplicant/src/crypto/dh_group5.c
@@ -15,8 +15,8 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/dh_groups.h"
-#include "crypto/dh_group5.h"
+#include "dh_groups.h"
+#include "dh_group5.h"
 
 
 void * 
diff --git a/components/wpa_supplicant/include/crypto/dh_group5.h b/components/wpa_supplicant/src/crypto/dh_group5.h
similarity index 100%
rename from components/wpa_supplicant/include/crypto/dh_group5.h
rename to components/wpa_supplicant/src/crypto/dh_group5.h
diff --git a/components/wpa_supplicant/src/crypto/dh_groups.c b/components/wpa_supplicant/src/crypto/dh_groups.c
index e3c7519ece6..6f699d9be6e 100644
--- a/components/wpa_supplicant/src/crypto/dh_groups.c
+++ b/components/wpa_supplicant/src/crypto/dh_groups.c
@@ -15,9 +15,9 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/crypto.h"
-#include "crypto/random.h"
-#include "crypto/dh_groups.h"
+#include "crypto.h"
+#include "random.h"
+#include "dh_groups.h"
 #include "utils/wpabuf.h"
 #include "utils/wpa_debug.h"
 #include "esp_wifi_crypto_types.h"
diff --git a/components/wpa_supplicant/include/crypto/dh_groups.h b/components/wpa_supplicant/src/crypto/dh_groups.h
similarity index 100%
rename from components/wpa_supplicant/include/crypto/dh_groups.h
rename to components/wpa_supplicant/src/crypto/dh_groups.h
diff --git a/components/wpa_supplicant/src/crypto/md4-internal.c b/components/wpa_supplicant/src/crypto/md4-internal.c
index cc988492d3f..9c99b7cbe17 100644
--- a/components/wpa_supplicant/src/crypto/md4-internal.c
+++ b/components/wpa_supplicant/src/crypto/md4-internal.c
@@ -6,7 +6,7 @@
 
 #include "utils/includes.h"
 #include "utils/common.h"
-#include "crypto/crypto.h"
+#include "crypto.h"
 
 #define MD4_BLOCK_LENGTH	64
 #define MD4_DIGEST_LENGTH	16
diff --git a/components/wpa_supplicant/src/crypto/md5-internal.c b/components/wpa_supplicant/src/crypto/md5-internal.c
index 3a98b36d491..a6b394006b0 100644
--- a/components/wpa_supplicant/src/crypto/md5-internal.c
+++ b/components/wpa_supplicant/src/crypto/md5-internal.c
@@ -15,9 +15,9 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/md5.h"
-#include "crypto/md5_i.h"
-#include "crypto/crypto.h"
+#include "md5.h"
+#include "md5_i.h"
+#include "crypto.h"
 
 
 static void MD5Transform(u32 buf[4], u32 const in[16]);
diff --git a/components/wpa_supplicant/src/crypto/md5.c b/components/wpa_supplicant/src/crypto/md5.c
index 3a057429618..57ec4ea983b 100644
--- a/components/wpa_supplicant/src/crypto/md5.c
+++ b/components/wpa_supplicant/src/crypto/md5.c
@@ -15,8 +15,8 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/md5.h"
-#include "crypto/crypto.h"
+#include "md5.h"
+#include "crypto.h"
 
 
 /**
diff --git a/components/wpa_supplicant/include/crypto/md5.h b/components/wpa_supplicant/src/crypto/md5.h
similarity index 100%
rename from components/wpa_supplicant/include/crypto/md5.h
rename to components/wpa_supplicant/src/crypto/md5.h
diff --git a/components/wpa_supplicant/src/crypto/ms_funcs.c b/components/wpa_supplicant/src/crypto/ms_funcs.c
index 191aa2bcf2d..750a4083bd8 100644
--- a/components/wpa_supplicant/src/crypto/ms_funcs.c
+++ b/components/wpa_supplicant/src/crypto/ms_funcs.c
@@ -10,9 +10,9 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/sha1.h"
-#include "crypto/ms_funcs.h"
-#include "crypto/crypto.h"
+#include "sha1.h"
+#include "ms_funcs.h"
+#include "crypto.h"
 
 /**
  * utf8_to_ucs2 - Convert UTF-8 string to UCS-2 encoding
diff --git a/components/wpa_supplicant/include/crypto/ms_funcs.h b/components/wpa_supplicant/src/crypto/ms_funcs.h
similarity index 100%
rename from components/wpa_supplicant/include/crypto/ms_funcs.h
rename to components/wpa_supplicant/src/crypto/ms_funcs.h
diff --git a/components/wpa_supplicant/include/crypto/random.h b/components/wpa_supplicant/src/crypto/random.h
similarity index 100%
rename from components/wpa_supplicant/include/crypto/random.h
rename to components/wpa_supplicant/src/crypto/random.h
diff --git a/components/wpa_supplicant/src/crypto/rc4.c b/components/wpa_supplicant/src/crypto/rc4.c
index aa914dcc727..a014afe6e35 100644
--- a/components/wpa_supplicant/src/crypto/rc4.c
+++ b/components/wpa_supplicant/src/crypto/rc4.c
@@ -15,7 +15,7 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/crypto.h"
+#include "crypto.h"
 
 #define S_SWAP(a,b) do { u8 t = S[a]; S[a] = S[b]; S[b] = t; } while(0)
 
diff --git a/components/wpa_supplicant/src/crypto/sha1-internal.c b/components/wpa_supplicant/src/crypto/sha1-internal.c
index 3bcd88116c7..9210af03fe8 100644
--- a/components/wpa_supplicant/src/crypto/sha1-internal.c
+++ b/components/wpa_supplicant/src/crypto/sha1-internal.c
@@ -15,10 +15,10 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/sha1.h"
-#include "crypto/sha1_i.h"
-#include "crypto/md5.h"
-#include "crypto/crypto.h"
+#include "sha1.h"
+#include "sha1_i.h"
+#include "md5.h"
+#include "crypto.h"
 
 #ifdef USE_MBEDTLS_CRYPTO
 #include "mbedtls/sha1.h"
diff --git a/components/wpa_supplicant/src/crypto/sha1-pbkdf2.c b/components/wpa_supplicant/src/crypto/sha1-pbkdf2.c
index b842a57d4e7..79e1bc382c9 100644
--- a/components/wpa_supplicant/src/crypto/sha1-pbkdf2.c
+++ b/components/wpa_supplicant/src/crypto/sha1-pbkdf2.c
@@ -14,9 +14,9 @@
 
 #include "utils/includes.h"
 #include "utils/common.h"
-#include "crypto/sha1.h"
-#include "crypto/md5.h"
-#include "crypto/crypto.h"
+#include "sha1.h"
+#include "md5.h"
+#include "crypto.h"
 
 #ifdef USE_MBEDTLS_CRYPTO
 #include "mbedtls/pkcs5.h"
diff --git a/components/wpa_supplicant/src/crypto/sha1.c b/components/wpa_supplicant/src/crypto/sha1.c
index 5b228292b28..27cf58b6852 100644
--- a/components/wpa_supplicant/src/crypto/sha1.c
+++ b/components/wpa_supplicant/src/crypto/sha1.c
@@ -15,8 +15,8 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/sha1.h"
-#include "crypto/crypto.h"
+#include "sha1.h"
+#include "crypto.h"
 
 
 /**
diff --git a/components/wpa_supplicant/include/crypto/sha1.h b/components/wpa_supplicant/src/crypto/sha1.h
similarity index 100%
rename from components/wpa_supplicant/include/crypto/sha1.h
rename to components/wpa_supplicant/src/crypto/sha1.h
diff --git a/components/wpa_supplicant/src/crypto/sha256-internal.c b/components/wpa_supplicant/src/crypto/sha256-internal.c
index df0706b5c1d..d6af5b5e9a2 100644
--- a/components/wpa_supplicant/src/crypto/sha256-internal.c
+++ b/components/wpa_supplicant/src/crypto/sha256-internal.c
@@ -33,8 +33,8 @@
 #ifdef USE_MBEDTLS_CRYPTO
 #include "mbedtls/sha256.h"
 #else /* USE_MBEDTLS_CRYPTO */
-#include "crypto/sha256.h"
-#include "crypto/crypto.h"
+#include "sha256.h"
+#include "crypto.h"
 #endif /* USE_MBEDTLS_CRYPTO */
 
 #ifdef USE_MBEDTLS_CRYPTO
diff --git a/components/wpa_supplicant/src/crypto/sha256.c b/components/wpa_supplicant/src/crypto/sha256.c
index 6380897e426..3e955b4d478 100644
--- a/components/wpa_supplicant/src/crypto/sha256.c
+++ b/components/wpa_supplicant/src/crypto/sha256.c
@@ -30,8 +30,8 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
-#include "crypto/sha256.h"
-#include "crypto/crypto.h"
+#include "sha256.h"
+#include "crypto.h"
 
 
 /**
diff --git a/components/wpa_supplicant/include/crypto/sha256.h b/components/wpa_supplicant/src/crypto/sha256.h
similarity index 100%
rename from components/wpa_supplicant/include/crypto/sha256.h
rename to components/wpa_supplicant/src/crypto/sha256.h
diff --git a/components/wpa_supplicant/src/eap_peer/eap_ttls.c b/components/wpa_supplicant/src/eap_peer/eap_ttls.c
index fb5515913e3..b014dbd395d 100644
--- a/components/wpa_supplicant/src/eap_peer/eap_ttls.c
+++ b/components/wpa_supplicant/src/eap_peer/eap_ttls.c
@@ -10,7 +10,6 @@
 
 #ifdef EAP_TTLS
 #include "utils/common.h"
-#include "crypto/ms_funcs.h"
 #include "crypto/sha1.h"
 #include "tls/tls.h"
 #include "eap_peer/eap.h"
diff --git a/components/wpa_supplicant/src/esp_supplicant/esp_wpa_main.c b/components/wpa_supplicant/src/esp_supplicant/esp_wpa_main.c
index 6f37b18500e..51f9e40f46c 100644
--- a/components/wpa_supplicant/src/esp_supplicant/esp_wpa_main.c
+++ b/components/wpa_supplicant/src/esp_supplicant/esp_wpa_main.c
@@ -29,7 +29,6 @@
 #include "crypto/crypto.h"
 #include "crypto/sha1.h"
 #include "crypto/aes_wrap.h"
-#include "crypto/wepkey.h"
 
 #include "esp_wifi_driver.h"
 #include "esp_private/wifi.h"
diff --git a/components/wpa_supplicant/src/rsn_supp/wpa.c b/components/wpa_supplicant/src/rsn_supp/wpa.c
index 2ce7bbebe53..2f014712647 100644
--- a/components/wpa_supplicant/src/rsn_supp/wpa.c
+++ b/components/wpa_supplicant/src/rsn_supp/wpa.c
@@ -26,7 +26,6 @@
 #include "crypto/crypto.h"
 #include "crypto/sha1.h"
 #include "crypto/aes_wrap.h"
-#include "crypto/wepkey.h"
 
 /**
  * eapol_sm_notify_eap_success - Notification of external EAP success trigger
diff --git a/components/wpa_supplicant/src/wps/wps.c b/components/wpa_supplicant/src/wps/wps.c
index 1700f0f4b1f..b19e187a46d 100644
--- a/components/wpa_supplicant/src/wps/wps.c
+++ b/components/wpa_supplicant/src/wps/wps.c
@@ -14,8 +14,6 @@
 #include "utils/wpa_debug.h"
 #include "common/ieee802_11_defs.h"
 
-#include "crypto/dh_group5.h"
-
 #include "wps/wps_i.h"
 #include "wps/wps_dev_attr.h"
 
diff --git a/components/wpa_supplicant/src/wps/wps_attr_build.c b/components/wpa_supplicant/src/wps/wps_attr_build.c
index bd2aa5e947f..437c92b69a3 100644
--- a/components/wpa_supplicant/src/wps/wps_attr_build.c
+++ b/components/wpa_supplicant/src/wps/wps_attr_build.c
@@ -11,9 +11,9 @@
 
 #include "crypto/aes_wrap.h"
 #include "crypto/crypto.h"
-#include "crypto/dh_group5.h"
 #include "crypto/sha256.h"
 #include "crypto/random.h"
+#include "crypto/dh_group5.h"
 
 #include "common/ieee802_11_defs.h"
 #include "wps/wps_i.h"
diff --git a/components/wpa_supplicant/src/wps/wps_common.c b/components/wpa_supplicant/src/wps/wps_common.c
index e37a35b2733..ead31af3e0a 100644
--- a/components/wpa_supplicant/src/wps/wps_common.c
+++ b/components/wpa_supplicant/src/wps/wps_common.c
@@ -12,9 +12,9 @@
 
 #include "crypto/aes_wrap.h"
 #include "crypto/crypto.h"
-#include "crypto/dh_group5.h"
 #include "crypto/sha1.h"
 #include "crypto/sha256.h"
+#include "crypto/dh_group5.h"
 #include "crypto/random.h"
 
 #include "wps/wps_i.h"