espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-07-15 08:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(wpa_supplicant): modify direction of include files

Browse Source
This commit is contained in:
Zhang Jun Hao
2020-05-26 10:01:53 +08:00
parent 75f1ceeb64
commit b987cee1d2
81 changed files with 309 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/wpa_supplicant/src/ap/ap_config.h
View File

@ -9,9 +9,9 @@
#ifndef HOSTAPD_CONFIG_H
#define HOSTAPD_CONFIG_H
#include "wpa/defs.h"
#include "common/defs.h"
//#include "ip_addr.h"
#include "wpa/wpa_common.h"
#include "common/wpa_common.h"
//#include "common/ieee802_11_common.h"
//#include "wps/wps.h"

4
components/wpa_supplicant/src/crypto/aes-cbc.c
View File

@ -17,9 +17,9 @@
#ifndef CONFIG_ESP_AES
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/aes.h"
#include "crypto/aes_wrap.h"

4
components/wpa_supplicant/src/crypto/aes-internal-dec.c
View File

@ -25,9 +25,9 @@
#ifndef CONFIG_ESP_AES
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "crypto/aes_i.h"

4
components/wpa_supplicant/src/crypto/aes-internal-enc.c
View File

@ -25,8 +25,8 @@
#ifndef CONFIG_ESP_AES
#include "crypto/includes.h"
#include "crypto/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "crypto/aes_i.h"

5
components/wpa_supplicant/src/crypto/aes-internal.c
View File

@ -21,10 +21,9 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "utils/includes.h"
//#include "wpa/common.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "crypto/aes_i.h"

4
components/wpa_supplicant/src/crypto/aes-unwrap.c
View File

@ -17,9 +17,9 @@
#ifndef CONFIG_ESP_AES
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/aes.h"
#include "crypto/aes_wrap.h"

4
components/wpa_supplicant/src/crypto/aes-wrap.c
View File

@ -11,9 +11,9 @@
#ifndef CONFIG_ESP_AES
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/aes.h"
#include "crypto/aes_wrap.h"

8
components/wpa_supplicant/src/crypto/bignum.c
View File

@ -12,10 +12,10 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "crypto/common.h"
#include "wpa/wpabuf.h"
#include "wpa/wpa_debug.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/wpabuf.h"
#include "utils/wpa_debug.h"
#include "bignum.h"
#define CONFIG_INTERNAL_LIBTOMMATH

2
components/wpa_supplicant/src/crypto/crypto.h
View File

@ -27,7 +27,7 @@
#ifndef CRYPTO_H
#define CRYPTO_H
#include "common.h"
#include "utils/common.h"
/**
* md4_vector - MD4 hash for data vector

5
components/wpa_supplicant/src/crypto/crypto_internal-cipher.c
View File

@ -6,10 +6,9 @@
* See README for more details.
*/
//#include "wpa/includes.h"
//#include "utils/includes.h"
//#include "wpa/common.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "crypto/aes.h"
#if defined(CONFIG_DES) || defined(CONFIG_DES3)

4
components/wpa_supplicant/src/crypto/crypto_internal-modexp.c
View File

@ -12,9 +12,9 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "bignum.h"
#include "crypto/crypto.h"

13
components/wpa_supplicant/src/crypto/crypto_internal-rsa.c
View File

@ -6,16 +6,15 @@
* See README for more details.
*/
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "wpa/includes.h"
#include "wpa/common.h"
#include "wpa/wpa_debug.h"
#include "utils/includes.h"
#include "utils/wpa_debug.h"
#include "wpa2/tls/rsa.h"
#include "wpa2/tls/pkcs1.h"
#include "wpa2/tls/pkcs8.h"
#include "tls/rsa.h"
#include "tls/pkcs1.h"
#include "tls/pkcs8.h"
/* Dummy structures; these are just typecast to struct crypto_rsa_key */
struct crypto_public_key;

4
components/wpa_supplicant/src/crypto/crypto_internal.c
View File

@ -6,8 +6,8 @@
* See README for more details.
*/
#include "crypto/includes.h"
#include "crypto/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "crypto/sha1_i.h"
#include "crypto/md5_i.h"

4
components/wpa_supplicant/src/crypto/des-internal.c
View File

@ -9,8 +9,8 @@
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/crypto.h"
//#include "des_i.h"

4
components/wpa_supplicant/src/crypto/dh_group5.c
View File

@ -12,9 +12,9 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/dh_groups.h"
#include "crypto/dh_group5.h"

2
components/wpa_supplicant/src/crypto/dh_group5.h
View File

@ -15,7 +15,7 @@
#ifndef DH_GROUP5_H
#define DH_GROUP5_H
#include "wpa/wpabuf.h"
#include "utils/wpabuf.h"
void * dh5_init(struct wpabuf **priv, struct wpabuf **publ);
struct wpabuf * dh5_derive_shared(void *ctx, const struct wpabuf *peer_public,

15
components/wpa_supplicant/src/crypto/dh_groups.c
View File

@ -12,15 +12,14 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "crypto/common.h"
#include "crypto/crypto.h"
#include "crypto/random.h"
#include "crypto/dh_groups.h"
#include "wpa/wpabuf.h"
#include "wpa/wpa_debug.h"
#include "utils/includes.h"
#include "utils/common.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"
extern wps_crypto_funcs_t wps_crypto_funcs;

4
components/wpa_supplicant/src/crypto/md4-internal.c
View File

@ -4,8 +4,8 @@
* This software may be distributed under the terms of BSD license.
*/
#include "crypto/includes.h"
#include "crypto/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#define MD4_BLOCK_LENGTH 64

4
components/wpa_supplicant/src/crypto/md5-internal.c
View File

@ -16,9 +16,9 @@
#ifndef CONFIG_ESP_MD5
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/md5.h"
#include "crypto/md5_i.h"
#include "crypto/crypto.h"

4
components/wpa_supplicant/src/crypto/md5.c
View File

@ -12,9 +12,9 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/md5.h"
#include "crypto/crypto.h"

4
components/wpa_supplicant/src/crypto/ms_funcs.c
View File

@ -7,8 +7,8 @@
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "crypto/ms_funcs.h"

4
components/wpa_supplicant/src/crypto/rc4.c
View File

@ -12,9 +12,9 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#define S_SWAP(a,b) do { u8 t = S[a]; S[a] = S[b]; S[b] = t; } while(0)

4
components/wpa_supplicant/src/crypto/sha1-internal.c
View File

@ -12,9 +12,9 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "crypto/sha1_i.h"
#include "crypto/md5.h"

4
components/wpa_supplicant/src/crypto/sha1-pbkdf2.c
View File

@ -12,8 +12,8 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "crypto/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "crypto/md5.h"
#include "crypto/crypto.h"

4
components/wpa_supplicant/src/crypto/sha1.c
View File

@ -12,9 +12,9 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "crypto/crypto.h"

4
components/wpa_supplicant/src/crypto/sha256-internal.c
View File

@ -12,9 +12,9 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/sha256.h"
#include "crypto/crypto.h"

8
components/wpa_supplicant/src/crypto/sha256.c
View File

@ -12,11 +12,11 @@
* See README and COPYING for more details.
*/
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "crypto/sha256.h"
#include "crypto/crypto.h"
#include "utils/common.h"
#include "sha256.h"
#include "crypto.h"
/**

4
components/wpa_supplicant/src/eap_peer/chap.c
View File

@ -4,8 +4,8 @@
*/
#ifdef CHAP_MD5
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "wpa2/eap_peer/chap.h"

28
components/wpa_supplicant/src/eap_peer/eap.c
View File

@ -18,24 +18,24 @@
#include "esp_err.h"
#include "wpa/includes.h"
#include "wpa/common.h"
#include "wpa/wpa_debug.h"
#include "wpa/eapol_common.h"
#include "wpa/ieee802_11_defs.h"
#include "wpa/state_machine.h"
#include "wpa/wpa.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/wpa_debug.h"
#include "common/eapol_common.h"
#include "common/ieee802_11_defs.h"
#include "utils/state_machine.h"
#include "rsn_supp/wpa.h"
#include "crypto/crypto.h"
#include "wpa2/utils/ext_password.h"
#include "wpa2/tls/tls.h"
#include "wpa2/eap_peer/eap_i.h"
#include "wpa2/eap_peer/eap_config.h"
#include "wpa2/eap_peer/eap.h"
#include "wpa2/eap_peer/eap_tls.h"
#include "utils/ext_password.h"
#include "tls/tls.h"
#include "eap_peer/eap_i.h"
#include "eap_peer/eap_config.h"
#include "eap_peer/eap.h"
#include "eap_peer/eap_tls.h"
#ifdef EAP_PEER_METHOD
#include "wpa2/eap_peer/eap_methods.h"
#include "eap_peer/eap_methods.h"
#endif

4
components/wpa_supplicant/src/eap_peer/eap.h
View File

@ -9,8 +9,8 @@
#ifndef EAP_H
#define EAP_H
#include "wpa/defs.h"
#include "wpa2/eap_peer/eap_defs.h"
#include "common/defs.h"
#include "eap_peer/eap_defs.h"
struct eap_sm;

8
components/wpa_supplicant/src/eap_peer/eap_common.c
View File

@ -6,11 +6,11 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "wpa2/eap_peer/eap_defs.h"
#include "wpa2/eap_peer/eap_common.h"
#include "utils/common.h"
#include "eap_peer/eap_defs.h"
#include "eap_peer/eap_common.h"
/**
* eap_hdr_len_valid - Validate EAP header length field

2
components/wpa_supplicant/src/eap_peer/eap_common.h
View File

@ -9,7 +9,7 @@
#ifndef EAP_COMMON_H
#define EAP_COMMON_H
#include "wpa/wpabuf.h"
#include "utils/wpabuf.h"
int eap_hdr_len_valid(const struct wpabuf *msg, size_t min_payload);
const u8 * eap_hdr_validate(int vendor, EapType eap_type,

2
components/wpa_supplicant/src/eap_peer/eap_i.h
View File

@ -9,7 +9,7 @@
#ifndef EAP_I_H
#define EAP_I_H
#include "wpa/wpabuf.h"
#include "utils/wpabuf.h"
#include "eap.h"
#include "eap_common.h"
#include "eap_config.h"

20
components/wpa_supplicant/src/eap_peer/eap_mschapv2.c
View File

@ -9,18 +9,18 @@
#ifdef EAP_MSCHAPv2
#include "wpa/wpa.h"
#include "wpa/includes.h"
#include "wpa/common.h"
#include "rsn_supp/wpa.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/random.h"
#include "crypto/ms_funcs.h"
#include "wpa2/tls/tls.h"
#include "wpa2/eap_peer/eap_i.h"
#include "wpa2/eap_peer/eap_defs.h"
#include "wpa2/eap_peer/eap_tls_common.h"
#include "wpa2/eap_peer/eap_config.h"
#include "wpa2/eap_peer/mschapv2.h"
#include "wpa2/eap_peer/eap_methods.h"
#include "tls/tls.h"
#include "eap_peer/eap_i.h"
#include "eap_peer/eap_defs.h"
#include "eap_peer/eap_tls_common.h"
#include "eap_peer/eap_config.h"
#include "eap_peer/mschapv2.h"
#include "eap_peer/eap_methods.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

18
components/wpa_supplicant/src/eap_peer/eap_peap.c
View File

@ -7,17 +7,17 @@
*/
#ifdef EAP_PEAP
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "wpa2/tls/tls.h"
#include "wpa2/eap_peer/eap_tlv_common.h"
#include "wpa2/eap_peer/eap_peap_common.h"
#include "wpa2/eap_peer/eap_i.h"
#include "wpa2/eap_peer/eap_tls_common.h"
#include "wpa2/eap_peer/eap_config.h"
#include "wpa2/eap_peer/eap_methods.h"
#include "tls/tls.h"
#include "eap_peer/eap_tlv_common.h"
#include "eap_peer/eap_peap_common.h"
#include "eap_peer/eap_i.h"
#include "eap_peer/eap_tls_common.h"
#include "eap_peer/eap_config.h"
#include "eap_peer/eap_methods.h"
//#include "tncc.h"
#ifdef MEMLEAK_DEBUG

6
components/wpa_supplicant/src/eap_peer/eap_peap_common.c
View File

@ -8,11 +8,11 @@
#ifdef EAP_PEAP
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "wpa2/eap_peer/eap_peap_common.h"
#include "eap_peer/eap_peap_common.h"
int
peap_prfplus(int version, const u8* key, size_t key_len,

16
components/wpa_supplicant/src/eap_peer/eap_tls.c
View File

@ -7,15 +7,15 @@
*/
#ifdef EAP_TLS
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "wpa2/tls/tls.h"
#include "wpa2/eap_peer/eap_i.h"
#include "wpa2/eap_peer/eap_defs.h"
#include "wpa2/eap_peer/eap_tls_common.h"
#include "wpa2/eap_peer/eap_config.h"
#include "wpa2/eap_peer/eap_methods.h"
#include "utils/common.h"
#include "tls/tls.h"
#include "eap_peer/eap_i.h"
#include "eap_peer/eap_defs.h"
#include "eap_peer/eap_tls_common.h"
#include "eap_peer/eap_config.h"
#include "eap_peer/eap_methods.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

2
components/wpa_supplicant/src/eap_peer/eap_tls.h
View File

@ -12,7 +12,7 @@
#include "eap_i.h"
#include "eap_common.h"
#include "eap.h"
#include "wpa/wpabuf.h"
#include "utils/wpabuf.h"
void * eap_tls_init(struct eap_sm *sm);
void eap_tls_deinit(struct eap_sm *sm, void *priv);

14
components/wpa_supplicant/src/eap_peer/eap_tls_common.c
View File

@ -6,14 +6,14 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "wpa2/tls/tls.h"
#include "wpa2/eap_peer/eap_i.h"
#include "wpa2/eap_peer/eap_tls_common.h"
#include "wpa2/eap_peer/eap_config.h"
#include "wpa2/eap_peer/eap_methods.h"
#include "tls/tls.h"
#include "eap_peer/eap_i.h"
#include "eap_peer/eap_tls_common.h"
#include "eap_peer/eap_config.h"
#include "eap_peer/eap_methods.h"
static struct wpabuf* eap_tls_msg_alloc(EapType type, size_t payload_len,
u8 code, u8 identifier)

22
components/wpa_supplicant/src/eap_peer/eap_ttls.c
View File

@ -8,21 +8,21 @@
#ifdef EAP_TTLS
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/ms_funcs.h"
#include "crypto/sha1.h"
#include "wpa2/tls/tls.h"
#include "tls/tls.h"
//#include "eap_common/chap.h"
#include "wpa2/eap_peer/eap.h"
#include "wpa2/eap_peer/eap_ttls.h"
#include "wpa2/eap_peer/mschapv2.h"
//#include "wpa2/eap_peer/chap.h"
#include "wpa2/eap_peer/eap_i.h"
#include "wpa2/eap_peer/eap_tls_common.h"
#include "wpa2/eap_peer/eap_config.h"
#include "wpa2/eap_peer/eap_methods.h"
#include "eap_peer/eap.h"
#include "eap_peer/eap_ttls.h"
#include "eap_peer/mschapv2.h"
//#include "eap_peer/chap.h"
#include "eap_peer/eap_i.h"
#include "eap_peer/eap_tls_common.h"
#include "eap_peer/eap_config.h"
#include "eap_peer/eap_methods.h"
#define EAP_TTLS_VERSION 0

6
components/wpa_supplicant/src/eap_peer/mschapv2.c
View File

@ -4,10 +4,10 @@
#ifdef EAP_MSCHAPv2
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/ms_funcs.h"
#include "wpa2/eap_peer/mschapv2.h"
#include "eap_peer/mschapv2.h"
const u8* mschapv2_remove_domain(const u8* username, size_t* len)
{

4
components/wpa_supplicant/src/fast_crypto/fast_aes-cbc.c
View File

@ -4,8 +4,8 @@
#include "sdkconfig.h"
#include "crypto/includes.h"
#include "crypto/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/aes.h"
#include "crypto/aes_wrap.h"

4
components/wpa_supplicant/src/fast_crypto/fast_aes-unwrap.c
View File

@ -13,8 +13,8 @@
// limitations under the License.
#include "sdkconfig.h"
#include "crypto/includes.h"
#include "crypto/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#if CONFIG_SSL_USING_MBEDTLS
#include "mbedtls/aes.h"

4
components/wpa_supplicant/src/fast_crypto/fast_aes-wrap.c
View File

@ -14,9 +14,9 @@
#include "sdkconfig.h"
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/aes.h"
#include "crypto/aes_wrap.h"

5
components/wpa_supplicant/src/fast_crypto/fast_crypto_internal-cipher.c
View File

@ -12,11 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//#include "wpa/includes.h"
//#include "utils/includes.h"
#include "sdkconfig.h"
//#include "wpa/common.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "crypto/aes.h"
#if defined(CONFIG_DES) || defined(CONFIG_DES3)

4
components/wpa_supplicant/src/fast_crypto/fast_crypto_internal-modexp.c
View File

@ -14,9 +14,9 @@
#include "sdkconfig.h"
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#if CONFIG_SSL_USING_MBEDTLS

4
components/wpa_supplicant/src/fast_crypto/fast_crypto_internal.c
View File

@ -9,8 +9,8 @@
*/
#include "sdkconfig.h"
#include "crypto/includes.h"
#include "crypto/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "crypto/sha1_i.h"
#include "crypto/md5_i.h"

12
components/wpa_supplicant/src/fast_crypto/fast_crypto_ops.c
View File

@ -14,7 +14,7 @@
#include "sdkconfig.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/aes_wrap.h"
#include "crypto/sha256.h"
#include "crypto/crypto.h"
@ -25,11 +25,11 @@
#include "wps/wps.h"
#include "wps/wps_i.h"
#include "wpa2/eap_peer/eap.h"
#include "wpa2/tls/tls.h"
#include "wpa2/eap_peer/eap_methods.h"
#include "wpa2/eap_peer/eap_i.h"
#include "wpa2/eap_peer/eap_common.h"
#include "eap_peer/eap.h"
#include "tls/tls.h"
#include "eap_peer/eap_methods.h"
#include "eap_peer/eap_i.h"
#include "eap_peer/eap_common.h"
#include "esp_wifi_crypto_types.h"
#if CONFIG_SSL_USING_MBEDTLS

4
components/wpa_supplicant/src/fast_crypto/fast_sha256-internal.c
View File

@ -14,8 +14,8 @@
#include "sdkconfig.h"
#include "crypto/includes.h"
#include "crypto/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#if CONFIG_SSL_USING_MBEDTLS
#include "mbedtls/sha256.h"

4
components/wpa_supplicant/src/fast_crypto/fast_sha256.c
View File

@ -15,9 +15,9 @@
*/
#include "sdkconfig.h"
#include "crypto/includes.h"
#include "utils/includes.h"
#include "crypto/common.h"
#include "utils/common.h"
#include "crypto/sha256.h"
#include "crypto/crypto.h"

9
components/wpa_supplicant/src/rsn_supp/wpa.h
View File

@ -15,10 +15,13 @@
#ifndef WPA_H
#define WPA_H
#include "common.h"
#include "utils/common.h"
#include "rom/ets_sys.h"
#include "wpa/defs.h"
#include "wpa/wpa_common.h"
#include "common/defs.h"
#include "common/wpa_common.h"
#include "esp_wifi_types.h"
#include "esp_wifi_crypto_types.h"
#include "wpa_i.h"
//#include "net80211/ieee80211_var.h"
//#include "net80211/ieee80211_node.h"

6
components/wpa_supplicant/src/tls/asn1.c
View File

@ -6,10 +6,10 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "wpa2/tls/asn1.h"
#include "utils/common.h"
#include "tls/asn1.h"
int asn1_get_next(const u8* buf, size_t len, struct asn1_hdr* hdr)
{

12
components/wpa_supplicant/src/tls/bignum.c
View File

@ -13,15 +13,15 @@
*/
#include "lwip/mem.h"
#include "crypto/includes.h"
#include "crypto/common.h"
#include "wpa/wpabuf.h"
#include "wpa/wpa_debug.h"
#include "wpa2/tls/bignum.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/wpabuf.h"
#include "utils/wpa_debug.h"
#include "tls/bignum.h"
#define CONFIG_INTERNAL_LIBTOMMATH
#ifdef CONFIG_INTERNAL_LIBTOMMATH
#include "wpa2/tls/libtommath.h"
#include "tls/libtommath.h"
#else /* CONFIG_INTERNAL_LIBTOMMATH */
#include <tommath.h>
#endif /* CONFIG_INTERNAL_LIBTOMMATH */

8
components/wpa_supplicant/src/tls/pkcs1.c
View File

@ -6,11 +6,11 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "wpa2/tls/rsa.h"
#include "wpa2/tls/pkcs1.h"
#include "utils/common.h"
#include "tls/rsa.h"
#include "tls/pkcs1.h"
static int pkcs1_generate_encryption_block(u8 block_type, size_t modlen,

8
components/wpa_supplicant/src/tls/pkcs5.c
View File

@ -6,13 +6,13 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "crypto/md5.h"
#include "wpa2/tls/asn1.h"
#include "wpa2/tls/pkcs5.h"
#include "tls/asn1.h"
#include "tls/pkcs5.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

14
components/wpa_supplicant/src/tls/pkcs8.c
View File

@ -6,14 +6,14 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "wpa2/tls/asn1.h"
#include "wpa2/tls/bignum.h"
#include "wpa2/tls/rsa.h"
#include "wpa2/tls/pkcs5.h"
#include "wpa2/tls/pkcs8.h"
#include "utils/common.h"
#include "tls/asn1.h"
#include "tls/bignum.h"
#include "tls/rsa.h"
#include "tls/pkcs5.h"
#include "tls/pkcs8.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

10
components/wpa_supplicant/src/tls/rsa.c
View File

@ -6,11 +6,11 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "wpa2/tls/asn1.h"
#include "wpa2/tls/bignum.h"
#include "wpa2/tls/rsa.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "tls/asn1.h"
#include "tls/bignum.h"
#include "tls/rsa.h"
#include "esp_system.h"
#ifdef MEMLEAK_DEBUG

10
components/wpa_supplicant/src/tls/tls_internal.c
View File

@ -9,14 +9,14 @@
* integrated TLSv1 implementation.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "crypto/md5.h"
#include "wpa2/tls/tls.h"
#include "wpa2/tls/tlsv1_client.h"
#include "wpa2/tls/tlsv1_server.h"
#include "tls/tls.h"
#include "tls/tlsv1_client.h"
#include "tls/tlsv1_server.h"
#ifndef CONFIG_TLS_INTERNAL_CLIENT
#define CONFIG_TLS_INTERNAL_CLIENT

14
components/wpa_supplicant/src/tls/tlsv1_client.c
View File

@ -6,15 +6,15 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "wpa2/tls/tls.h"
#include "wpa2/tls/tlsv1_common.h"
#include "wpa2/tls/tlsv1_record.h"
#include "wpa2/tls/tlsv1_client.h"
#include "wpa2/tls/tlsv1_client_i.h"
#include "tls/tls.h"
#include "tls/tlsv1_common.h"
#include "tls/tlsv1_record.h"
#include "tls/tlsv1_client.h"
#include "tls/tlsv1_client_i.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

16
components/wpa_supplicant/src/tls/tlsv1_client_read.c
View File

@ -6,18 +6,18 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/md5.h"
#include "crypto/sha1.h"
#include "crypto/sha256.h"
#include "wpa2/tls/tls.h"
#include "wpa2/tls/x509v3.h"
#include "wpa2/tls/tlsv1_common.h"
#include "wpa2/tls/tlsv1_record.h"
#include "wpa2/tls/tlsv1_client.h"
#include "wpa2/tls/tlsv1_client_i.h"
#include "tls/tls.h"
#include "tls/x509v3.h"
#include "tls/tlsv1_common.h"
#include "tls/tlsv1_record.h"
#include "tls/tlsv1_client.h"
#include "tls/tlsv1_client_i.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

16
components/wpa_supplicant/src/tls/tlsv1_client_write.c
View File

@ -6,19 +6,19 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/md5.h"
#include "crypto/sha1.h"
#include "crypto/sha256.h"
#include "crypto/random.h"
#include "wpa2/tls/tls.h"
#include "wpa2/tls/x509v3.h"
#include "wpa2/tls/tlsv1_common.h"
#include "wpa2/tls/tlsv1_record.h"
#include "wpa2/tls/tlsv1_client.h"
#include "wpa2/tls/tlsv1_client_i.h"
#include "tls/tls.h"
#include "tls/x509v3.h"
#include "tls/tlsv1_common.h"
#include "tls/tlsv1_record.h"
#include "tls/tlsv1_client.h"
#include "tls/tlsv1_client_i.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

10
components/wpa_supplicant/src/tls/tlsv1_common.c
View File

@ -6,14 +6,14 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "crypto/sha256.h"
#include "wpa2/tls/tls.h"
#include "wpa2/tls/x509v3.h"
#include "wpa2/tls/tlsv1_common.h"
#include "tls/tls.h"
#include "tls/x509v3.h"
#include "tls/tlsv1_common.h"
/*

10
components/wpa_supplicant/src/tls/tlsv1_cred.c
View File

@ -6,13 +6,13 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "wpa2/utils/base64.h"
#include "utils/common.h"
#include "utils/base64.h"
#include "crypto/crypto.h"
#include "wpa2/tls/x509v3.h"
#include "wpa2/tls/tlsv1_cred.h"
#include "tls/x509v3.h"
#include "tls/tlsv1_cred.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

8
components/wpa_supplicant/src/tls/tlsv1_record.c
View File

@ -6,14 +6,14 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/md5.h"
#include "crypto/sha1.h"
#include "crypto/sha256.h"
#include "wpa2/tls/tlsv1_common.h"
#include "wpa2/tls/tlsv1_record.h"
#include "tls/tlsv1_common.h"
#include "tls/tlsv1_record.h"
/**

14
components/wpa_supplicant/src/tls/tlsv1_server.c
View File

@ -6,15 +6,15 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/sha1.h"
#include "wpa2/tls/tls.h"
#include "wpa2/tls/tlsv1_common.h"
#include "wpa2/tls/tlsv1_record.h"
#include "wpa2/tls/tlsv1_server.h"
#include "wpa2/tls/tlsv1_server_i.h"
#include "tls/tls.h"
#include "tls/tlsv1_common.h"
#include "tls/tlsv1_record.h"
#include "tls/tlsv1_server.h"
#include "tls/tlsv1_server_i.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

16
components/wpa_supplicant/src/tls/tlsv1_server_read.c
View File

@ -6,18 +6,18 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/md5.h"
#include "crypto/sha1.h"
#include "crypto/sha256.h"
#include "wpa2/tls/tls.h"
#include "wpa2/tls/x509v3.h"
#include "wpa2/tls/tlsv1_common.h"
#include "wpa2/tls/tlsv1_record.h"
#include "wpa2/tls/tlsv1_server.h"
#include "wpa2/tls/tlsv1_server_i.h"
#include "tls/tls.h"
#include "tls/x509v3.h"
#include "tls/tlsv1_common.h"
#include "tls/tlsv1_record.h"
#include "tls/tlsv1_server.h"
#include "tls/tlsv1_server_i.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

16
components/wpa_supplicant/src/tls/tlsv1_server_write.c
View File

@ -6,19 +6,19 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/md5.h"
#include "crypto/sha1.h"
#include "crypto/sha256.h"
#include "crypto/random.h"
#include "wpa2/tls/tls.h"
#include "wpa2/tls/x509v3.h"
#include "wpa2/tls/tlsv1_common.h"
#include "wpa2/tls/tlsv1_record.h"
#include "wpa2/tls/tlsv1_server.h"
#include "wpa2/tls/tlsv1_server_i.h"
#include "tls/tls.h"
#include "tls/x509v3.h"
#include "tls/tlsv1_common.h"
#include "tls/tlsv1_record.h"
#include "tls/tlsv1_server.h"
#include "tls/tlsv1_server_i.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

8
components/wpa_supplicant/src/tls/x509v3.c
View File

@ -6,12 +6,12 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "utils/common.h"
#include "crypto/crypto.h"
#include "wpa2/tls/asn1.h"
#include "wpa2/tls/x509v3.h"
#include "tls/asn1.h"
#include "tls/x509v3.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

4
components/wpa_supplicant/src/utils/base64.c
View File

@ -6,10 +6,10 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "os.h"
#include "wpa2/utils/base64.h"
#include "utils/base64.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

4
components/wpa_supplicant/src/utils/common.h
View File

@ -319,8 +319,8 @@ static inline int is_zero_ether_addr(const u8 *a)
extern const struct eth_addr ethbroadcast;
#define broadcast_ether_addr &ethbroadcast
#include "wpabuf.h"
#include "wpa_debug.h"
#include "utils/wpabuf.h"
#include "utils/wpa_debug.h"
/*

6
components/wpa_supplicant/src/utils/ext_password.c
View File

@ -6,10 +6,10 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "utils/includes.h"
#include "wpa/common.h"
#include "wpa2/utils/ext_password_i.h"
#include "utils/common.h"
#include "utils/ext_password_i.h"
#ifdef MEMLEAK_DEBUG
static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;

6
components/wpa_supplicant/src/utils/uuid.c
View File

@ -5,9 +5,9 @@
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "wps/utils/uuid.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/uuid.h"
int uuid_str2bin(const char* str, u8* bin)
{

20
components/wpa_supplicant/src/wps/wps.c
View File

@ -7,22 +7,22 @@
*/
#include <string.h>
#include "wpa/includes.h"
//#include "wpa/wpa.h"
#include "wpa/common.h"
#include "wpa/eapol_common.h"
#include "wpa/wpa_debug.h"
#include "wpa/ieee802_11_defs.h"
#include "utils/includes.h"
//#include "rsn_supp/wpa.h"
#include "utils/common.h"
#include "common/eapol_common.h"
#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"
//#include "wpa2/eap_peer/eap_defs.h"
//#include "wpa2/eap_peer/eap_common.h"
#include "eap/eap_defs.h"
#include "eap/eap_common.h"
//#include "eap_peer/eap_defs.h"
//#include "eap_peer/eap_common.h"
#include "eap_peer/eap_defs.h"
#include "eap_peer/eap_common.h"
/**
* wps_process_msg - Process a WPS message

9
components/wpa_supplicant/src/wps/wps_attr_build.c
View File

@ -6,10 +6,10 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "wpa/wpa_debug.h"
#include "wpa/ieee802_11_defs.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/wpa_debug.h"
#include "common/ieee802_11_defs.h"
#include "crypto/aes_wrap.h"
#include "crypto/crypto.h"
@ -19,7 +19,6 @@
#include "wps/wps_i.h"
#ifdef CONFIG_IDF_TARGET_ESP8266
#include "wps/asm/irqflags.h"
#define API_MUTEX_DECLARE(t) local_irq_declare(t)
#define API_MUTEX_TAKE(t) local_irq_save(t)

4
components/wpa_supplicant/src/wps/wps_attr_parse.c
View File

@ -5,8 +5,8 @@
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "wps/wps_defs.h"
#include "wps/wps_attr_parse.h"

4
components/wpa_supplicant/src/wps/wps_attr_process.c
View File

@ -5,8 +5,8 @@
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "wps/wps_i.h"
#include "crypto/sha256.h"

4
components/wpa_supplicant/src/wps/wps_common.c
View File

@ -7,8 +7,8 @@
*/
#include <string.h>
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "crypto/aes_wrap.h"
#include "crypto/crypto.h"

4
components/wpa_supplicant/src/wps/wps_dev_attr.c
View File

@ -5,8 +5,8 @@
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "wps/wps_i.h"
#include "wps/wps_dev_attr.h"

5
components/wpa_supplicant/src/wps/wps_enrollee.c
View File

@ -6,8 +6,8 @@
* See README for more details.
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "wps/wps_i.h"
#include "wps/wps.h"
#include "wps/wps_dev_attr.h"
@ -18,7 +18,6 @@
//#include "pp/mac_register_v6.h"
#ifdef CONFIG_IDF_TARGET_ESP8266
#include "wps/asm/irqflags.h"
#include "esp_wifi_osi.h"
#ifdef MEMLEAK_DEBUG

12
components/wpa_supplicant/src/wps/wps_registrar.c
View File

@ -5,16 +5,16 @@
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "wpa/list.h"
#include "wpa/ieee802_11_defs.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "utils/list.h"
#include "common/ieee802_11_defs.h"
#include "wps/utils/uuid.h"
#include "utils/uuid.h"
#include "wps/wps_i.h"
#include "wps/wps_dev_attr.h"
#include "crypto/base64.h"
#include "utils/base64.h"
#include "crypto/crypto.h"
#include "crypto/sha256.h"
#include "crypto/random.h"

4
components/wpa_supplicant/src/wps/wps_validate.c
View File

@ -5,8 +5,8 @@
* This software may be distributed under the terms of the BSD license.
* See README for more details.
*/
#include "wpa/includes.h"
#include "wpa/common.h"
#include "utils/includes.h"
#include "utils/common.h"
#include "wps/wps_i.h"
#include "wps/wps.h"