From 6c32f572845ab215c6fd0b1a3fa0b9677fd8ece8 Mon Sep 17 00:00:00 2001 From: Fledge68 Date: Mon, 6 Sep 2021 17:33:21 -0500 Subject: [PATCH] - properly updating libwolfssl since my compiler missed a lot. thanks blackb0x! --- out/bins/ext_booter.bin | Bin 227104 -> 227104 bytes out/boot.dol | Bin 4524160 -> 4524160 bytes source/defines.h | 2 +- source/libwolfssl/crl.h | 4 +- source/libwolfssl/error-ssl.h | 2 +- source/libwolfssl/internal.h | 82 +++++++++--------- source/libwolfssl/ocsp.h | 4 +- source/libwolfssl/openssl/aes.h | 4 +- source/libwolfssl/openssl/asn1.h | 2 +- source/libwolfssl/openssl/asn1t.h | 4 +- source/libwolfssl/openssl/bio.h | 2 +- source/libwolfssl/openssl/bn.h | 4 +- source/libwolfssl/openssl/buffer.h | 4 +- source/libwolfssl/openssl/conf.h | 6 +- source/libwolfssl/openssl/crypto.h | 6 +- source/libwolfssl/openssl/des.h | 2 +- source/libwolfssl/openssl/dh.h | 4 +- source/libwolfssl/openssl/dsa.h | 2 +- source/libwolfssl/openssl/ec.h | 6 +- source/libwolfssl/openssl/ecdh.h | 4 +- source/libwolfssl/openssl/ecdsa.h | 4 +- source/libwolfssl/openssl/engine.h | 2 +- source/libwolfssl/openssl/err.h | 2 +- source/libwolfssl/openssl/evp.h | 36 ++++---- source/libwolfssl/openssl/hmac.h | 8 +- source/libwolfssl/openssl/lhash.h | 2 +- source/libwolfssl/openssl/md4.h | 2 +- source/libwolfssl/openssl/md5.h | 4 +- source/libwolfssl/openssl/objects.h | 6 +- source/libwolfssl/openssl/ocsp.h | 2 +- source/libwolfssl/openssl/ossl_typ.h | 2 +- source/libwolfssl/openssl/pem.h | 10 +-- source/libwolfssl/openssl/pkcs12.h | 4 +- source/libwolfssl/openssl/pkcs7.h | 4 +- source/libwolfssl/openssl/rand.h | 4 +- source/libwolfssl/openssl/rc4.h | 4 +- source/libwolfssl/openssl/ripemd.h | 2 +- source/libwolfssl/openssl/rsa.h | 6 +- source/libwolfssl/openssl/sha.h | 4 +- source/libwolfssl/openssl/sha3.h | 4 +- source/libwolfssl/openssl/ssl.h | 26 +++--- source/libwolfssl/openssl/x509.h | 12 +-- source/libwolfssl/openssl/x509_vfy.h | 2 +- source/libwolfssl/openssl/x509v3.h | 4 +- source/libwolfssl/sniffer.h | 4 +- source/libwolfssl/ssl.h | 10 +-- source/libwolfssl/wolfcrypt/aes.h | 22 ++--- source/libwolfssl/wolfcrypt/arc4.h | 4 +- source/libwolfssl/wolfcrypt/asn.h | 16 ++-- source/libwolfssl/wolfcrypt/blake2-impl.h | 2 +- source/libwolfssl/wolfcrypt/blake2-int.h | 2 +- source/libwolfssl/wolfcrypt/blake2.h | 4 +- source/libwolfssl/wolfcrypt/camellia.h | 2 +- source/libwolfssl/wolfcrypt/chacha.h | 2 +- .../libwolfssl/wolfcrypt/chacha20_poly1305.h | 6 +- source/libwolfssl/wolfcrypt/cmac.h | 6 +- source/libwolfssl/wolfcrypt/coding.h | 2 +- source/libwolfssl/wolfcrypt/compress.h | 2 +- source/libwolfssl/wolfcrypt/cpuid.h | 2 +- source/libwolfssl/wolfcrypt/cryptocb.h | 26 +++--- source/libwolfssl/wolfcrypt/curve25519.h | 8 +- source/libwolfssl/wolfcrypt/curve448.h | 8 +- source/libwolfssl/wolfcrypt/des3.h | 6 +- source/libwolfssl/wolfcrypt/dh.h | 10 +-- source/libwolfssl/wolfcrypt/ecc.h | 22 ++--- source/libwolfssl/wolfcrypt/ed25519.h | 12 +-- source/libwolfssl/wolfcrypt/ed448.h | 12 +-- source/libwolfssl/wolfcrypt/error-crypt.h | 2 +- source/libwolfssl/wolfcrypt/fe_448.h | 4 +- source/libwolfssl/wolfcrypt/fe_operations.h | 4 +- source/libwolfssl/wolfcrypt/fips_test.h | 2 +- source/libwolfssl/wolfcrypt/ge_448.h | 4 +- source/libwolfssl/wolfcrypt/ge_operations.h | 4 +- source/libwolfssl/wolfcrypt/hash.h | 34 ++++---- source/libwolfssl/wolfcrypt/hc128.h | 2 +- source/libwolfssl/wolfcrypt/hmac.h | 6 +- source/libwolfssl/wolfcrypt/idea.h | 2 +- source/libwolfssl/wolfcrypt/md2.h | 2 +- source/libwolfssl/wolfcrypt/md4.h | 2 +- source/libwolfssl/wolfcrypt/md5.h | 8 +- source/libwolfssl/wolfcrypt/misc.h | 2 +- source/libwolfssl/wolfcrypt/pkcs12.h | 2 +- source/libwolfssl/wolfcrypt/pkcs7.h | 14 +-- source/libwolfssl/wolfcrypt/poly1305.h | 2 +- .../port/Renesas/renesas-tsip-crypt.h | 2 +- .../wolfcrypt/port/af_alg/afalg_hash.h | 2 +- .../wolfcrypt/port/af_alg/wc_afalg.h | 2 +- .../wolfcrypt/port/arm/cryptoCell.h | 2 +- .../libwolfssl/wolfcrypt/port/atmel/atmel.h | 6 +- .../libwolfssl/wolfcrypt/port/caam/wolfcaam.h | 6 +- .../wolfcrypt/port/caam/wolfcaam_sha.h | 4 +- .../wolfcrypt/port/cypress/psoc6_crypto.h | 10 +-- .../wolfcrypt/port/devcrypto/wc_devcrypto.h | 2 +- source/libwolfssl/wolfcrypt/port/nrf51.h | 2 +- .../libwolfssl/wolfcrypt/port/nxp/dcp_port.h | 8 +- .../libwolfssl/wolfcrypt/port/nxp/ksdk_port.h | 14 +-- .../wolfcrypt/port/pic32/pic32mz-crypt.h | 2 +- source/libwolfssl/wolfcrypt/port/st/stm32.h | 4 +- source/libwolfssl/wolfcrypt/port/st/stsafe.h | 10 +-- source/libwolfssl/wolfcrypt/port/ti/ti-ccm.h | 2 +- source/libwolfssl/wolfcrypt/port/ti/ti-hash.h | 2 +- source/libwolfssl/wolfcrypt/pwdbased.h | 2 +- source/libwolfssl/wolfcrypt/rabbit.h | 2 +- source/libwolfssl/wolfcrypt/random.h | 2 +- source/libwolfssl/wolfcrypt/ripemd.h | 2 +- source/libwolfssl/wolfcrypt/rsa.h | 16 ++-- source/libwolfssl/wolfcrypt/selftest.h | 2 +- source/libwolfssl/wolfcrypt/settings.h | 2 +- source/libwolfssl/wolfcrypt/sha.h | 14 +-- source/libwolfssl/wolfcrypt/sha256.h | 2 +- source/libwolfssl/wolfcrypt/sha3.h | 8 +- source/libwolfssl/wolfcrypt/sha512.h | 10 +-- source/libwolfssl/wolfcrypt/signature.h | 6 +- source/libwolfssl/wolfcrypt/sp.h | 8 +- source/libwolfssl/wolfcrypt/sp_int.h | 4 +- source/libwolfssl/wolfcrypt/srp.h | 10 +-- source/libwolfssl/wolfcrypt/tfm.h | 6 +- source/libwolfssl/wolfcrypt/types.h | 4 +- source/libwolfssl/wolfcrypt/wc_encrypt.h | 10 +-- source/libwolfssl/wolfcrypt/wc_pkcs11.h | 6 +- source/libwolfssl/wolfcrypt/wolfevent.h | 2 +- 121 files changed, 392 insertions(+), 392 deletions(-) diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin index fb9510f21bdc75a59d36c9c47501bf6c744ac951..12a212b9a4933dfca86fcfc4747b3b2c41ecbb7d 100644 GIT binary patch delta 21 dcmZ4Rj(5R3-i8*&Elk(9FdA>av4zRw5CCw#3IG5A delta 21 dcmZ4Rj(5R3-i8*&Elk(9FdA*Yv4zRw5CCwu3I6~9 diff --git a/out/boot.dol b/out/boot.dol index 45e1cb88a5271a77898bf61842626f4ec1da36c1..2c378e6f3e8f79d0380dd11eaea8bd1d1a76d0cc 100644 GIT binary patch delta 189 zcmWl|MGnGH6hP6mxVyW%7Po$69jv8;n=mF}6&;hXJzh_8toKK^oM`B{aO1&?4?h8d zga{KMN{l!OlB7tJAxn-t1&Wj?Q=v+YIt`k%Xw#ufk3Iv2j2JUv%8WS+mS4lPHRGjh h=Sr^SMsDR!?&U!q69MVeB{tGvnkPuUOk`~yz3LxlhU delta 189 zcmWl|MGnGH6hP6mxVyW%wYc>o>tHP%+=MX+tLT`7?eRFtv0rc9{zpT{g&PlEeE10v zBt)19QDVeNkR(N#3|VsIDNv+DnF>{E)M?P9MVk&?dh{7EWW<;WQ)bLrV0=u=(Tt~Z hOu3XRxt1Hbl{>kY2YHkyd6t$`@*=PD_EpYZJ$_DULxcbT diff --git a/source/defines.h b/source/defines.h index 37925364..799929ef 100644 --- a/source/defines.h +++ b/source/defines.h @@ -1,6 +1,6 @@ #define APP_NAME "WiiFlow WFL" -#define APP_VERSION "5.5.0 beta 2" +#define APP_VERSION "5.5.0 beta 3" #define APP_DATA_DIR "wiiflow" #define APPS_DIR "apps/wiiflow" diff --git a/source/libwolfssl/crl.h b/source/libwolfssl/crl.h index 9b3ec3f6..754dae7c 100644 --- a/source/libwolfssl/crl.h +++ b/source/libwolfssl/crl.h @@ -27,8 +27,8 @@ #ifdef HAVE_CRL -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/error-ssl.h b/source/libwolfssl/error-ssl.h index f2e58094..4dff153a 100644 --- a/source/libwolfssl/error-ssl.h +++ b/source/libwolfssl/error-ssl.h @@ -24,7 +24,7 @@ #ifndef WOLFSSL_ERROR_H #define WOLFSSL_ERROR_H -#include /* pull in wolfCrypt errors */ +#include /* pull in wolfCrypt errors */ #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/internal.h b/source/libwolfssl/internal.h index 2510ed66..8c8c66b8 100644 --- a/source/libwolfssl/internal.h +++ b/source/libwolfssl/internal.h @@ -25,113 +25,113 @@ #define WOLFSSL_INT_H -#include -#include +#include +#include #ifdef HAVE_CRL - #include + #include #endif -#include +#include #ifndef NO_DES3 - #include + #include #endif #ifndef NO_HC128 - #include + #include #endif #ifndef NO_RABBIT - #include + #include #endif #ifdef HAVE_CHACHA - #include + #include #endif #ifndef NO_ASN - #include - #include + #include + #include #endif #ifndef NO_MD5 - #include + #include #endif #ifndef NO_SHA - #include + #include #endif #ifndef NO_AES - #include + #include #endif #ifdef HAVE_POLY1305 - #include + #include #endif #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) && defined(OPENSSL_EXTRA) - #include + #include #endif #ifdef HAVE_CAMELLIA - #include + #include #endif -#include +#include #ifndef NO_HMAC - #include + #include #endif #ifndef NO_RC4 - #include + #include #endif #ifndef NO_SHA256 - #include + #include #endif #if defined(WOLFSSL_SHA384) - #include + #include #endif #ifdef HAVE_OCSP - #include + #include #endif #ifdef WOLFSSL_SHA384 - #include + #include #endif #ifdef WOLFSSL_SHA512 - #include + #include #endif #ifdef HAVE_AESGCM - #include + #include #endif #ifdef WOLFSSL_RIPEMD - #include + #include #endif #ifdef HAVE_IDEA - #include + #include #endif #ifndef NO_RSA - #include + #include #endif #ifdef HAVE_ECC - #include + #include #endif #ifndef NO_DH - #include + #include #endif #ifdef HAVE_ED25519 - #include + #include #endif #ifdef HAVE_CURVE25519 - #include + #include #endif #ifdef HAVE_ED448 - #include + #include #endif #ifdef HAVE_CURVE448 - #include + #include #endif #ifndef WOLFSSL_NO_DEF_TICKET_ENC_CB #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) && \ !defined(WOLFSSL_TICKET_ENC_AES128_GCM) && \ !defined(WOLFSSL_TICKET_ENC_AES256_GCM) - #include + #include #else - #include + #include #endif #endif -#include -#include +#include +#include #if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA) - #include + #include #endif #ifdef WOLFSSL_CALLBACKS #include @@ -230,12 +230,12 @@ #endif #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif #ifdef OPENSSL_EXTRA #ifdef WOLFCRYPT_HAVE_SRP - #include + #include #endif #endif diff --git a/source/libwolfssl/ocsp.h b/source/libwolfssl/ocsp.h index 8a8dcc53..96a19870 100644 --- a/source/libwolfssl/ocsp.h +++ b/source/libwolfssl/ocsp.h @@ -28,8 +28,8 @@ #ifdef HAVE_OCSP -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/aes.h b/source/libwolfssl/openssl/aes.h index afd6fcec..88400d6c 100644 --- a/source/libwolfssl/openssl/aes.h +++ b/source/libwolfssl/openssl/aes.h @@ -29,10 +29,10 @@ #ifndef WOLFSSL_AES_H_ #define WOLFSSL_AES_H_ -#include +#include #ifndef NO_AES -#include /* for size_t */ +#include /* for size_t */ #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/asn1.h b/source/libwolfssl/openssl/asn1.h index 14efe494..e4bba5b9 100644 --- a/source/libwolfssl/openssl/asn1.h +++ b/source/libwolfssl/openssl/asn1.h @@ -24,7 +24,7 @@ #ifndef WOLFSSL_ASN1_H_ #define WOLFSSL_ASN1_H_ -#include +#include #define ASN1_STRING_new wolfSSL_ASN1_STRING_new #define ASN1_STRING_type_new wolfSSL_ASN1_STRING_type_new diff --git a/source/libwolfssl/openssl/asn1t.h b/source/libwolfssl/openssl/asn1t.h index feafbf09..05332c87 100644 --- a/source/libwolfssl/openssl/asn1t.h +++ b/source/libwolfssl/openssl/asn1t.h @@ -24,7 +24,7 @@ #ifndef WOLFSSL_ASN1T_H_ #define WOLFSSL_ASN1T_H_ -#include -#include +#include +#include #endif /* WOLFSSL_ASN1T_H_ */ diff --git a/source/libwolfssl/openssl/bio.h b/source/libwolfssl/openssl/bio.h index 7f9b049a..ef5cccb1 100644 --- a/source/libwolfssl/openssl/bio.h +++ b/source/libwolfssl/openssl/bio.h @@ -25,7 +25,7 @@ #ifndef WOLFSSL_BIO_H_ #define WOLFSSL_BIO_H_ -#include +#include #ifdef __cplusplus diff --git a/source/libwolfssl/openssl/bn.h b/source/libwolfssl/openssl/bn.h index 474001d8..d4fec9c3 100644 --- a/source/libwolfssl/openssl/bn.h +++ b/source/libwolfssl/openssl/bn.h @@ -30,8 +30,8 @@ #ifndef WOLFSSL_BN_H_ #define WOLFSSL_BN_H_ -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/buffer.h b/source/libwolfssl/openssl/buffer.h index f090d19f..5dafcdd6 100644 --- a/source/libwolfssl/openssl/buffer.h +++ b/source/libwolfssl/openssl/buffer.h @@ -23,8 +23,8 @@ #ifndef WOLFSSL_BUFFER_H_ #define WOLFSSL_BUFFER_H_ -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/conf.h b/source/libwolfssl/openssl/conf.h index 246fccca..834b7e90 100644 --- a/source/libwolfssl/openssl/conf.h +++ b/source/libwolfssl/openssl/conf.h @@ -28,8 +28,8 @@ extern "C" { #endif -#include -#include +#include +#include typedef struct WOLFSSL_CONF_VALUE { char *section; @@ -38,7 +38,7 @@ typedef struct WOLFSSL_CONF_VALUE { } WOLFSSL_CONF_VALUE; /* ssl.h requires WOLFSSL_CONF_VALUE */ -#include +#include typedef struct WOLFSSL_CONF { void *meth_data; diff --git a/source/libwolfssl/openssl/crypto.h b/source/libwolfssl/openssl/crypto.h index 9b804b43..02736c07 100644 --- a/source/libwolfssl/openssl/crypto.h +++ b/source/libwolfssl/openssl/crypto.h @@ -24,7 +24,7 @@ #ifndef WOLFSSL_CRYPTO_H_ #define WOLFSSL_CRYPTO_H_ -#include +#include typedef struct WOLFSSL_INIT_SETTINGS { char* appname; @@ -40,8 +40,8 @@ typedef struct CRYPTO_EX_DATA CRYPTO_EX_DATA; typedef void (CRYPTO_free_func)(void* parent, void* ptr, CRYPTO_EX_DATA* ad, int idx, long argl, void* argp); -#include -#include +#include +#include #ifdef WOLFSSL_PREFIX #include "prefix_crypto.h" diff --git a/source/libwolfssl/openssl/des.h b/source/libwolfssl/openssl/des.h index a6bf3d7f..0693f334 100644 --- a/source/libwolfssl/openssl/des.h +++ b/source/libwolfssl/openssl/des.h @@ -29,7 +29,7 @@ #ifndef WOLFSSL_DES_H_ #define WOLFSSL_DES_H_ -#include +#include #ifndef NO_DES3 diff --git a/source/libwolfssl/openssl/dh.h b/source/libwolfssl/openssl/dh.h index a18e78c1..f88fdbde 100644 --- a/source/libwolfssl/openssl/dh.h +++ b/source/libwolfssl/openssl/dh.h @@ -25,8 +25,8 @@ #ifndef WOLFSSL_DH_H_ #define WOLFSSL_DH_H_ -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/dsa.h b/source/libwolfssl/openssl/dsa.h index e34943aa..2405657d 100644 --- a/source/libwolfssl/openssl/dsa.h +++ b/source/libwolfssl/openssl/dsa.h @@ -25,7 +25,7 @@ #ifndef WOLFSSL_DSA_H_ #define WOLFSSL_DSA_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/ec.h b/source/libwolfssl/openssl/ec.h index 77019dcc..16d4d8b9 100644 --- a/source/libwolfssl/openssl/ec.h +++ b/source/libwolfssl/openssl/ec.h @@ -24,9 +24,9 @@ #ifndef WOLFSSL_EC_H_ #define WOLFSSL_EC_H_ -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/ecdh.h b/source/libwolfssl/openssl/ecdh.h index b40f99c7..eadd15aa 100644 --- a/source/libwolfssl/openssl/ecdh.h +++ b/source/libwolfssl/openssl/ecdh.h @@ -24,8 +24,8 @@ #ifndef WOLFSSL_ECDH_H_ #define WOLFSSL_ECDH_H_ -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/ecdsa.h b/source/libwolfssl/openssl/ecdsa.h index a1383940..434d7991 100644 --- a/source/libwolfssl/openssl/ecdsa.h +++ b/source/libwolfssl/openssl/ecdsa.h @@ -24,8 +24,8 @@ #ifndef WOLFSSL_ECDSA_H_ #define WOLFSSL_ECDSA_H_ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/source/libwolfssl/openssl/engine.h b/source/libwolfssl/openssl/engine.h index d097e146..d9294b4a 100644 --- a/source/libwolfssl/openssl/engine.h +++ b/source/libwolfssl/openssl/engine.h @@ -1,6 +1,6 @@ /* engine.h for libcurl */ -#include +#include #undef HAVE_OPENSSL_ENGINE_H diff --git a/source/libwolfssl/openssl/err.h b/source/libwolfssl/openssl/err.h index 9debeeee..74a24414 100644 --- a/source/libwolfssl/openssl/err.h +++ b/source/libwolfssl/openssl/err.h @@ -22,7 +22,7 @@ #ifndef WOLFSSL_OPENSSL_ERR_ #define WOLFSSL_OPENSSL_ERR_ -#include +#include /* err.h for openssl */ #define ERR_load_crypto_strings wolfSSL_ERR_load_crypto_strings diff --git a/source/libwolfssl/openssl/evp.h b/source/libwolfssl/openssl/evp.h index 4c29c3c2..e9446b74 100644 --- a/source/libwolfssl/openssl/evp.h +++ b/source/libwolfssl/openssl/evp.h @@ -30,37 +30,37 @@ #ifndef WOLFSSL_EVP_H_ #define WOLFSSL_EVP_H_ -#include +#include #ifdef WOLFSSL_PREFIX #include "prefix_evp.h" #endif #ifndef NO_MD4 - #include + #include #endif #ifndef NO_MD5 - #include + #include #endif -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef HAVE_IDEA - #include + #include #endif -#include +#include #if defined(WOLFSSL_BASE64_ENCODE) || defined(WOLFSSL_BASE64_DECODE) -#include +#include #endif #ifdef __cplusplus @@ -1023,6 +1023,6 @@ WOLFSSL_API void printPKEY(WOLFSSL_EVP_PKEY *k); } /* extern "C" */ #endif -#include +#include #endif /* WOLFSSL_EVP_H_ */ diff --git a/source/libwolfssl/openssl/hmac.h b/source/libwolfssl/openssl/hmac.h index a139343e..0eff3033 100644 --- a/source/libwolfssl/openssl/hmac.h +++ b/source/libwolfssl/openssl/hmac.h @@ -29,13 +29,13 @@ #ifndef WOLFSSL_HMAC_H_ #define WOLFSSL_HMAC_H_ -#include +#include #ifdef WOLFSSL_PREFIX #include "prefix_hmac.h" #endif -#include +#include typedef struct WOLFSSL_HMAC_CTX { Hmac hmac; @@ -44,8 +44,8 @@ typedef struct WOLFSSL_HMAC_CTX { word32 save_opad[WC_HMAC_BLOCK_SIZE / sizeof(word32)]; } WOLFSSL_HMAC_CTX; -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/lhash.h b/source/libwolfssl/openssl/lhash.h index cbf62991..8bd19b01 100644 --- a/source/libwolfssl/openssl/lhash.h +++ b/source/libwolfssl/openssl/lhash.h @@ -28,7 +28,7 @@ extern "C" { #endif -#include +#include #ifdef OPENSSL_ALL #define IMPLEMENT_LHASH_HASH_FN(name, type) \ diff --git a/source/libwolfssl/openssl/md4.h b/source/libwolfssl/openssl/md4.h index 52aaa082..484da5f9 100644 --- a/source/libwolfssl/openssl/md4.h +++ b/source/libwolfssl/openssl/md4.h @@ -23,7 +23,7 @@ #ifndef WOLFSSL_MD4_H_ #define WOLFSSL_MD4_H_ -#include +#include #ifndef NO_MD4 diff --git a/source/libwolfssl/openssl/md5.h b/source/libwolfssl/openssl/md5.h index 086fa800..a0f9268e 100644 --- a/source/libwolfssl/openssl/md5.h +++ b/source/libwolfssl/openssl/md5.h @@ -25,11 +25,11 @@ #ifndef WOLFSSL_MD5_H_ #define WOLFSSL_MD5_H_ -#include +#include #ifndef NO_MD5 -#include +#include #ifdef WOLFSSL_PREFIX #include "prefix_md5.h" diff --git a/source/libwolfssl/openssl/objects.h b/source/libwolfssl/openssl/objects.h index eedf5ecf..7a84e1b3 100644 --- a/source/libwolfssl/openssl/objects.h +++ b/source/libwolfssl/openssl/objects.h @@ -23,11 +23,11 @@ #ifndef WOLFSSL_OBJECTS_H_ #define WOLFSSL_OBJECTS_H_ -#include -//#include +#include +//#include #ifndef OPENSSL_EXTRA_SSL_GUARD #define OPENSSL_EXTRA_SSL_GUARD -#include +#include #endif /* OPENSSL_EXTRA_SSL_GUARD */ #ifdef __cplusplus diff --git a/source/libwolfssl/openssl/ocsp.h b/source/libwolfssl/openssl/ocsp.h index e0f97c16..1e090ab3 100644 --- a/source/libwolfssl/openssl/ocsp.h +++ b/source/libwolfssl/openssl/ocsp.h @@ -25,7 +25,7 @@ #define WOLFSSL_OCSP_H_ #ifdef HAVE_OCSP -#include +#include #define OCSP_REQUEST OcspRequest #define OCSP_RESPONSE OcspResponse diff --git a/source/libwolfssl/openssl/ossl_typ.h b/source/libwolfssl/openssl/ossl_typ.h index a6117356..51d5fc78 100644 --- a/source/libwolfssl/openssl/ossl_typ.h +++ b/source/libwolfssl/openssl/ossl_typ.h @@ -27,6 +27,6 @@ #ifndef WOLFSSL_OSSL_TYP_H_ #define WOLFSSL_OSSL_TYP_H_ -#include +#include #endif /* !WOLFSSL_OSSL_TYP_H_ */ diff --git a/source/libwolfssl/openssl/pem.h b/source/libwolfssl/openssl/pem.h index 50cfc276..38d2dbec 100644 --- a/source/libwolfssl/openssl/pem.h +++ b/source/libwolfssl/openssl/pem.h @@ -29,11 +29,11 @@ #ifndef WOLFSSL_PEM_H_ #define WOLFSSL_PEM_H_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/pkcs12.h b/source/libwolfssl/openssl/pkcs12.h index 5eee8706..a0c8cd33 100644 --- a/source/libwolfssl/openssl/pkcs12.h +++ b/source/libwolfssl/openssl/pkcs12.h @@ -22,8 +22,8 @@ /* pkcs12.h for openssl */ -#include -#include +#include +#include #ifndef WOLFSSL_PKCS12_COMPAT_H_ #define WOLFSSL_PKCS12_COMPAT_H_ diff --git a/source/libwolfssl/openssl/pkcs7.h b/source/libwolfssl/openssl/pkcs7.h index 1ea4330c..67219567 100644 --- a/source/libwolfssl/openssl/pkcs7.h +++ b/source/libwolfssl/openssl/pkcs7.h @@ -25,8 +25,8 @@ #ifndef WOLFSSL_PKCS7_H_ #define WOLFSSL_PKCS7_H_ -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/rand.h b/source/libwolfssl/openssl/rand.h index c4dca87d..185d53aa 100644 --- a/source/libwolfssl/openssl/rand.h +++ b/source/libwolfssl/openssl/rand.h @@ -21,8 +21,8 @@ /* rand.h for openSSL */ -#include -#include +#include +#include typedef WOLFSSL_RAND_METHOD RAND_METHOD; diff --git a/source/libwolfssl/openssl/rc4.h b/source/libwolfssl/openssl/rc4.h index 91ac416a..c9dec6f2 100644 --- a/source/libwolfssl/openssl/rc4.h +++ b/source/libwolfssl/openssl/rc4.h @@ -28,8 +28,8 @@ #ifndef WOLFSSL_RC4_COMPAT_H_ #define WOLFSSL_RC4_COMPAT_H_ -#include -#include /* included for size_t */ +#include +#include /* included for size_t */ #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/ripemd.h b/source/libwolfssl/openssl/ripemd.h index 73ae5ae5..e42c54c7 100644 --- a/source/libwolfssl/openssl/ripemd.h +++ b/source/libwolfssl/openssl/ripemd.h @@ -25,7 +25,7 @@ #ifndef WOLFSSL_RIPEMD_H_ #define WOLFSSL_RIPEMD_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/rsa.h b/source/libwolfssl/openssl/rsa.h index af3f2ddf..72189017 100644 --- a/source/libwolfssl/openssl/rsa.h +++ b/source/libwolfssl/openssl/rsa.h @@ -25,9 +25,9 @@ #ifndef WOLFSSL_RSA_H_ #define WOLFSSL_RSA_H_ -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/sha.h b/source/libwolfssl/openssl/sha.h index 172e07dc..02e4fc28 100644 --- a/source/libwolfssl/openssl/sha.h +++ b/source/libwolfssl/openssl/sha.h @@ -25,8 +25,8 @@ #ifndef WOLFSSL_SHA_H_ #define WOLFSSL_SHA_H_ -#include -#include +#include +#include #ifdef WOLFSSL_PREFIX #include "prefix_sha.h" diff --git a/source/libwolfssl/openssl/sha3.h b/source/libwolfssl/openssl/sha3.h index e906eefa..a79c605f 100644 --- a/source/libwolfssl/openssl/sha3.h +++ b/source/libwolfssl/openssl/sha3.h @@ -25,8 +25,8 @@ #ifndef WOLFSSL_SHA3_H_ #define WOLFSSL_SHA3_H_ -#include -#include +#include +#include #ifdef WOLFSSL_PREFIX #include "prefix_sha.h" diff --git a/source/libwolfssl/openssl/ssl.h b/source/libwolfssl/openssl/ssl.h index 5e406004..bb21c531 100644 --- a/source/libwolfssl/openssl/ssl.h +++ b/source/libwolfssl/openssl/ssl.h @@ -32,28 +32,28 @@ /* wolfssl_openssl compatibility layer */ #ifndef OPENSSL_EXTRA_SSL_GUARD #define OPENSSL_EXTRA_SSL_GUARD -#include +#include #endif /* OPENSSL_EXTRA_SSL_GUARD */ -#include -#include -#include +#include +#include +#include #ifdef OPENSSL_EXTRA -#include +#include #endif #if defined(WOLFSSL_QT) || defined(OPENSSL_ALL) -#include -#include +#include +#include #endif /* need MIN_CODE_E to determine wolfSSL error range */ -#include +#include /* all NID_* values are in asn.h */ -#include +#include -#include +#include #ifdef __cplusplus extern "C" { @@ -1059,7 +1059,7 @@ wolfSSL_X509_STORE_set_verify_cb((WOLFSSL_X509_STORE *)(s), (WOLFSSL_X509_STORE_ #if defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO) || defined(WOLFSSL_HAPROXY) \ || defined(WOLFSSL_NGINX) -#include +#include #define SSL_CTRL_CHAIN 88 #define ERR_LIB_SSL 20 @@ -1199,7 +1199,7 @@ wolfSSL_X509_STORE_set_verify_cb((WOLFSSL_X509_STORE *)(s), (WOLFSSL_X509_STORE_ #if defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) || defined(OPENSSL_EXTRA) \ || defined(OPENSSL_ALL) -#include +#include #define SSL23_ST_SR_CLNT_HELLO_A (0x210|0x2000) #define SSL3_ST_SR_CLNT_HELLO_A (0x110|0x2000) @@ -1307,7 +1307,7 @@ wolfSSL_X509_STORE_set_verify_cb((WOLFSSL_X509_STORE *)(s), (WOLFSSL_X509_STORE_ defined(WOLFSSL_MYSQL_COMPATIBLE) || defined(OPENSSL_ALL) || \ defined(HAVE_LIGHTY) || defined(HAVE_STUNNEL) -#include +#include #define OPENSSL_STRING WOLFSSL_STRING #define OPENSSL_CSTRING WOLFSSL_STRING diff --git a/source/libwolfssl/openssl/x509.h b/source/libwolfssl/openssl/x509.h index 5b151453..c97237da 100644 --- a/source/libwolfssl/openssl/x509.h +++ b/source/libwolfssl/openssl/x509.h @@ -1,11 +1,11 @@ /* x509.h for openssl */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /* wolfSSL_X509_print_ex flags */ #define X509_FLAG_COMPAT (0UL) diff --git a/source/libwolfssl/openssl/x509_vfy.h b/source/libwolfssl/openssl/x509_vfy.h index 6642dd54..4d11f839 100644 --- a/source/libwolfssl/openssl/x509_vfy.h +++ b/source/libwolfssl/openssl/x509_vfy.h @@ -24,7 +24,7 @@ #ifndef WOLFSSL_x509_vfy_H_ #define WOLFSSL_x509_vfy_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/openssl/x509v3.h b/source/libwolfssl/openssl/x509v3.h index 803777cf..8cd216ad 100644 --- a/source/libwolfssl/openssl/x509v3.h +++ b/source/libwolfssl/openssl/x509v3.h @@ -24,8 +24,8 @@ #ifndef WOLFSSL_x509v3_H #define WOLFSSL_x509v3_H -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/sniffer.h b/source/libwolfssl/sniffer.h index beb3601a..61cd1ce3 100644 --- a/source/libwolfssl/sniffer.h +++ b/source/libwolfssl/sniffer.h @@ -24,8 +24,8 @@ #ifndef WOLFSSL_SNIFFER_H #define WOLFSSL_SNIFFER_H -#include -#include +#include +#include #ifdef _WIN32 #ifdef SSL_SNIFFER_EXPORTS diff --git a/source/libwolfssl/ssl.h b/source/libwolfssl/ssl.h index d3e0cde3..e602acc7 100644 --- a/source/libwolfssl/ssl.h +++ b/source/libwolfssl/ssl.h @@ -87,8 +87,8 @@ #endif #elif (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)) - #include - #include + #include + #include /* We need the old SSL names */ #ifdef NO_OLD_SSL_NAMES @@ -3625,7 +3625,7 @@ WOLFSSL_API int wolfSSL_accept_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack, /* Smaller subset of X509 compatibility functions. Avoid increasing the size of * this subset and its memory usage */ -#include +#include struct WOLFSSL_X509_NAME_ENTRY { WOLFSSL_ASN1_OBJECT* object; /* static object just for keeping grp, type */ WOLFSSL_ASN1_STRING* value; /* points to data, for lighttpd port */ @@ -3977,7 +3977,7 @@ WOLFSSL_API WOLFSSL_X509 *wolfSSL_X509_to_X509_REQ(WOLFSSL_X509 *x, #if defined(OPENSSL_ALL) || defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) \ || defined(WOLFSSL_HAPROXY) || defined(OPENSSL_EXTRA) || defined(HAVE_LIGHTY) -#include +#include WOLFSSL_API int wolfSSL_CRYPTO_set_mem_functions( wolfSSL_Malloc_cb m, @@ -4183,7 +4183,7 @@ WOLFSSL_API WOLFSSL_X509_CRL *wolfSSL_X509_OBJECT_get0_X509_CRL(WOLFSSL_X509_OBJ #endif /* OPENSSL_ALL || HAVE_STUNNEL || WOLFSSL_NGINX || WOLFSSL_HAPROXY || HAVE_LIGHTY */ #if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) -#include +#include WOLFSSL_API void wolfSSL_sk_X509_pop_free(WOLF_STACK_OF(WOLFSSL_X509)* sk, void (*f) (WOLFSSL_X509*)); #endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL */ diff --git a/source/libwolfssl/wolfcrypt/aes.h b/source/libwolfssl/wolfcrypt/aes.h index ed0a0dce..a58f9f12 100644 --- a/source/libwolfssl/wolfcrypt/aes.h +++ b/source/libwolfssl/wolfcrypt/aes.h @@ -34,13 +34,13 @@ block cipher mechanism that uses n-bit binary string parameter key with 128-bits #ifndef WOLF_CRYPT_AES_H #define WOLF_CRYPT_AES_H -#include +#include #ifndef NO_AES #if defined(HAVE_FIPS) && \ defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) - #include + #include #endif /* HAVE_FIPS_VERSION >= 2 */ /* included for fips @wc_fips */ @@ -56,10 +56,10 @@ block cipher mechanism that uses n-bit binary string parameter key with 128-bits #endif #ifndef WC_NO_RNG - #include + #include #endif #ifdef STM32_CRYPTO - #include + #include #endif #ifdef WOLFSSL_IMXRT_DCP @@ -72,29 +72,29 @@ block cipher mechanism that uses n-bit binary string parameter key with 128-bits #if defined(WOLFSSL_AFALG) || defined(WOLFSSL_AFALG_XILINX_AES) /* included for struct msghdr */ -#include +#include #endif #if defined(WOLFSSL_DEVCRYPTO_AES) || defined(WOLFSSL_DEVCRYPTO_CBC) -#include +#include #endif #ifdef WOLFSSL_SILABS_SE_ACCEL - #include + #include #endif #if defined(HAVE_AESGCM) && !defined(WC_NO_RNG) - #include + #include #endif #if defined(WOLFSSL_CRYPTOCELL) - #include + #include #endif #if defined(WOLFSSL_RENESAS_TSIP_TLS) && \ defined(WOLFSSL_RENESAS_TSIP_TLS_AES_CRYPT) - #include + #include #endif #ifdef __cplusplus @@ -118,7 +118,7 @@ enum { (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)) #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif enum { diff --git a/source/libwolfssl/wolfcrypt/arc4.h b/source/libwolfssl/wolfcrypt/arc4.h index cfc625f3..c71b1c68 100644 --- a/source/libwolfssl/wolfcrypt/arc4.h +++ b/source/libwolfssl/wolfcrypt/arc4.h @@ -26,14 +26,14 @@ #ifndef WOLF_CRYPT_ARC4_H #define WOLF_CRYPT_ARC4_H -#include +#include #ifdef __cplusplus extern "C" { #endif #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif enum { diff --git a/source/libwolfssl/wolfcrypt/asn.h b/source/libwolfssl/wolfcrypt/asn.h index d87d8682..27e6add1 100644 --- a/source/libwolfssl/wolfcrypt/asn.h +++ b/source/libwolfssl/wolfcrypt/asn.h @@ -34,7 +34,7 @@ that can be serialized and deserialized in a cross-platform way. #ifndef WOLF_CRYPT_ASN_H #define WOLF_CRYPT_ASN_H -#include +#include #ifndef NO_ASN @@ -43,7 +43,7 @@ that can be serialized and deserialized in a cross-platform way. #define NO_ASN_TIME /* backwards compatibility with NO_TIME_H */ #endif -#include +#include /* fips declare of RsaPrivateKeyDecode @wc_fips */ #if defined(HAVE_FIPS) && !defined(NO_RSA) && \ @@ -52,19 +52,19 @@ that can be serialized and deserialized in a cross-platform way. #endif #ifndef NO_DH - #include + #include #endif #ifndef NO_DSA - #include + #include #endif #ifndef NO_SHA - #include + #include #endif #ifndef NO_MD5 - #include + #include #endif -#include -#include /* public interface */ +#include +#include /* public interface */ #if defined(NO_SHA) && defined(NO_SHA256) #define WC_SHA256_DIGEST_SIZE 32 diff --git a/source/libwolfssl/wolfcrypt/blake2-impl.h b/source/libwolfssl/wolfcrypt/blake2-impl.h index 72d2a510..e902874c 100644 --- a/source/libwolfssl/wolfcrypt/blake2-impl.h +++ b/source/libwolfssl/wolfcrypt/blake2-impl.h @@ -36,7 +36,7 @@ #ifndef WOLFCRYPT_BLAKE2_IMPL_H #define WOLFCRYPT_BLAKE2_IMPL_H -#include +#include static WC_INLINE word32 load32( const void *src ) { diff --git a/source/libwolfssl/wolfcrypt/blake2-int.h b/source/libwolfssl/wolfcrypt/blake2-int.h index a995e260..e71d6dcd 100644 --- a/source/libwolfssl/wolfcrypt/blake2-int.h +++ b/source/libwolfssl/wolfcrypt/blake2-int.h @@ -37,7 +37,7 @@ #ifndef WOLFCRYPT_BLAKE2_INT_H #define WOLFCRYPT_BLAKE2_INT_H -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/source/libwolfssl/wolfcrypt/blake2.h b/source/libwolfssl/wolfcrypt/blake2.h index f937acc9..c729fe69 100644 --- a/source/libwolfssl/wolfcrypt/blake2.h +++ b/source/libwolfssl/wolfcrypt/blake2.h @@ -26,11 +26,11 @@ #ifndef WOLF_CRYPT_BLAKE2_H #define WOLF_CRYPT_BLAKE2_H -#include +#include #if defined(HAVE_BLAKE2) || defined(HAVE_BLAKE2S) -#include +#include /* call old functions if using fips for the sake of hmac @wc_fips */ #ifdef HAVE_FIPS diff --git a/source/libwolfssl/wolfcrypt/camellia.h b/source/libwolfssl/wolfcrypt/camellia.h index 9b0c6cbe..aedae23b 100644 --- a/source/libwolfssl/wolfcrypt/camellia.h +++ b/source/libwolfssl/wolfcrypt/camellia.h @@ -54,7 +54,7 @@ #ifndef WOLF_CRYPT_CAMELLIA_H #define WOLF_CRYPT_CAMELLIA_H -#include +#include #ifdef HAVE_CAMELLIA diff --git a/source/libwolfssl/wolfcrypt/chacha.h b/source/libwolfssl/wolfcrypt/chacha.h index b01feba2..23f44f26 100644 --- a/source/libwolfssl/wolfcrypt/chacha.h +++ b/source/libwolfssl/wolfcrypt/chacha.h @@ -32,7 +32,7 @@ This library contains implementation for the ChaCha20 stream cipher. #ifndef WOLF_CRYPT_CHACHA_H #define WOLF_CRYPT_CHACHA_H -#include +#include #ifdef HAVE_CHACHA diff --git a/source/libwolfssl/wolfcrypt/chacha20_poly1305.h b/source/libwolfssl/wolfcrypt/chacha20_poly1305.h index 42a50eec..6f91b458 100644 --- a/source/libwolfssl/wolfcrypt/chacha20_poly1305.h +++ b/source/libwolfssl/wolfcrypt/chacha20_poly1305.h @@ -34,9 +34,9 @@ or Authenticated Encryption with Additional Data (AEAD) algorithm. #ifndef WOLF_CRYPT_CHACHA20_POLY1305_H #define WOLF_CRYPT_CHACHA20_POLY1305_H -#include -#include -#include +#include +#include +#include #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) diff --git a/source/libwolfssl/wolfcrypt/cmac.h b/source/libwolfssl/wolfcrypt/cmac.h index 6fd46ffc..0af26da6 100644 --- a/source/libwolfssl/wolfcrypt/cmac.h +++ b/source/libwolfssl/wolfcrypt/cmac.h @@ -23,14 +23,14 @@ #ifndef WOLF_CRYPT_CMAC_H #define WOLF_CRYPT_CMAC_H -#include -#include +#include +#include #if !defined(NO_AES) && defined(WOLFSSL_CMAC) #if defined(HAVE_FIPS) && \ defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) - #include + #include #endif /* HAVE_FIPS_VERSION >= 2 */ #ifdef __cplusplus diff --git a/source/libwolfssl/wolfcrypt/coding.h b/source/libwolfssl/wolfcrypt/coding.h index a5c2ba14..81d6a313 100644 --- a/source/libwolfssl/wolfcrypt/coding.h +++ b/source/libwolfssl/wolfcrypt/coding.h @@ -26,7 +26,7 @@ #ifndef WOLF_CRYPT_CODING_H #define WOLF_CRYPT_CODING_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/wolfcrypt/compress.h b/source/libwolfssl/wolfcrypt/compress.h index 8f3eb737..50af6af9 100644 --- a/source/libwolfssl/wolfcrypt/compress.h +++ b/source/libwolfssl/wolfcrypt/compress.h @@ -27,7 +27,7 @@ #ifndef WOLF_CRYPT_COMPRESS_H #define WOLF_CRYPT_COMPRESS_H -#include +#include #ifdef HAVE_LIBZ diff --git a/source/libwolfssl/wolfcrypt/cpuid.h b/source/libwolfssl/wolfcrypt/cpuid.h index 4eadb638..9e6a636b 100644 --- a/source/libwolfssl/wolfcrypt/cpuid.h +++ b/source/libwolfssl/wolfcrypt/cpuid.h @@ -25,7 +25,7 @@ #define WOLF_CRYPT_CPUID_H -#include +#include #ifdef __cplusplus diff --git a/source/libwolfssl/wolfcrypt/cryptocb.h b/source/libwolfssl/wolfcrypt/cryptocb.h index 249f2c11..2b3899fa 100644 --- a/source/libwolfssl/wolfcrypt/cryptocb.h +++ b/source/libwolfssl/wolfcrypt/cryptocb.h @@ -22,7 +22,7 @@ #ifndef _WOLF_CRYPTO_CB_H_ #define _WOLF_CRYPTO_CB_H_ -#include +#include #ifdef __cplusplus extern "C" { @@ -36,40 +36,40 @@ #ifdef WOLF_CRYPTO_CB #ifndef NO_RSA - #include + #include #endif #ifdef HAVE_ECC - #include + #include #endif #ifndef NO_AES - #include + #include #endif #ifndef NO_SHA - #include + #include #endif #ifndef NO_SHA256 - #include + #include #endif #ifndef NO_HMAC - #include + #include #endif #ifndef WC_NO_RNG - #include + #include #endif #ifndef NO_DES3 - #include + #include #endif #ifdef WOLFSSL_CMAC - #include + #include #endif #ifdef HAVE_ED25519 - #include + #include #endif #ifdef HAVE_CURVE25519 - #include + #include #endif #if defined(WOLFSSL_SHA512) || defined(WOLFSSL_SHA384) - #include + #include #endif /* Crypto Information Structure for callbacks */ diff --git a/source/libwolfssl/wolfcrypt/curve25519.h b/source/libwolfssl/wolfcrypt/curve25519.h index 2193f23a..7a136db3 100644 --- a/source/libwolfssl/wolfcrypt/curve25519.h +++ b/source/libwolfssl/wolfcrypt/curve25519.h @@ -27,15 +27,15 @@ #ifndef WOLF_CRYPT_CURVE25519_H #define WOLF_CRYPT_CURVE25519_H -#include +#include #ifdef HAVE_CURVE25519 -#include -#include +#include +#include #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif #ifdef __cplusplus diff --git a/source/libwolfssl/wolfcrypt/curve448.h b/source/libwolfssl/wolfcrypt/curve448.h index 55e1ae1b..422b1272 100644 --- a/source/libwolfssl/wolfcrypt/curve448.h +++ b/source/libwolfssl/wolfcrypt/curve448.h @@ -25,15 +25,15 @@ #ifndef WOLF_CRYPT_CURVE448_H #define WOLF_CRYPT_CURVE448_H -#include +#include #ifdef HAVE_CURVE448 -#include -#include +#include +#include #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif #ifdef __cplusplus diff --git a/source/libwolfssl/wolfcrypt/des3.h b/source/libwolfssl/wolfcrypt/des3.h index 438e72cf..b9d6bd0f 100644 --- a/source/libwolfssl/wolfcrypt/des3.h +++ b/source/libwolfssl/wolfcrypt/des3.h @@ -26,13 +26,13 @@ #ifndef WOLF_CRYPT_DES3_H #define WOLF_CRYPT_DES3_H -#include +#include #ifndef NO_DES3 #if defined(HAVE_FIPS) && \ defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) - #include + #include #endif /* HAVE_FIPS_VERSION >= 2 */ #if defined(HAVE_FIPS) && \ @@ -58,7 +58,7 @@ enum { (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)) #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif enum { diff --git a/source/libwolfssl/wolfcrypt/dh.h b/source/libwolfssl/wolfcrypt/dh.h index d41f125b..6fe9b570 100644 --- a/source/libwolfssl/wolfcrypt/dh.h +++ b/source/libwolfssl/wolfcrypt/dh.h @@ -26,24 +26,24 @@ #ifndef WOLF_CRYPT_DH_H #define WOLF_CRYPT_DH_H -#include +#include #ifndef NO_DH #if defined(HAVE_FIPS) && \ defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) - #include + #include #endif /* HAVE_FIPS_VERSION >= 2 */ -#include -#include +#include +#include #ifdef __cplusplus extern "C" { #endif #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif typedef struct DhParams { diff --git a/source/libwolfssl/wolfcrypt/ecc.h b/source/libwolfssl/wolfcrypt/ecc.h index a969d5cc..b59f1c5e 100644 --- a/source/libwolfssl/wolfcrypt/ecc.h +++ b/source/libwolfssl/wolfcrypt/ecc.h @@ -27,43 +27,43 @@ #ifndef WOLF_CRYPT_ECC_H #define WOLF_CRYPT_ECC_H -#include +#include #ifdef HAVE_ECC #if defined(HAVE_FIPS) && \ defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) - #include + #include #endif /* HAVE_FIPS_VERSION >= 2 */ -#include -#include +#include +#include #ifdef HAVE_X963_KDF - #include + #include #endif #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #ifdef WOLFSSL_CERT_GEN - #include + #include #endif #endif #if defined(WOLFSSL_ATECC508A) || defined(WOLFSSL_ATECC608A) - #include + #include #endif /* WOLFSSL_ATECC508A */ #if defined(WOLFSSL_CRYPTOCELL) - #include + #include #endif #ifdef WOLFSSL_SILABS_SE_ACCEL - #include + #include #endif #ifdef WOLFSSL_HAVE_SP_ECC - #include + #include #endif diff --git a/source/libwolfssl/wolfcrypt/ed25519.h b/source/libwolfssl/wolfcrypt/ed25519.h index 6a41e6fd..d13c797a 100644 --- a/source/libwolfssl/wolfcrypt/ed25519.h +++ b/source/libwolfssl/wolfcrypt/ed25519.h @@ -27,20 +27,20 @@ #ifndef WOLF_CRYPT_ED25519_H #define WOLF_CRYPT_ED25519_H -#include +#include #ifdef HAVE_ED25519 -#include -#include -#include +#include +#include +#include #ifndef WOLFSSL_SHA512 #error ED25519 requires SHA512 #endif -#include +#include #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif #ifdef __cplusplus diff --git a/source/libwolfssl/wolfcrypt/ed448.h b/source/libwolfssl/wolfcrypt/ed448.h index 37602bf1..2c90cf7a 100644 --- a/source/libwolfssl/wolfcrypt/ed448.h +++ b/source/libwolfssl/wolfcrypt/ed448.h @@ -27,20 +27,20 @@ #ifndef WOLF_CRYPT_ED448_H #define WOLF_CRYPT_ED448_H -#include +#include #ifdef HAVE_ED448 -#include -#include -#include +#include +#include +#include #ifndef WOLFSSL_SHAKE256 #error ED448 requires SHAKE256 #endif -#include +#include #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif #ifdef __cplusplus diff --git a/source/libwolfssl/wolfcrypt/error-crypt.h b/source/libwolfssl/wolfcrypt/error-crypt.h index 48af52ca..6af8f55e 100644 --- a/source/libwolfssl/wolfcrypt/error-crypt.h +++ b/source/libwolfssl/wolfcrypt/error-crypt.h @@ -31,7 +31,7 @@ the error status. #ifndef WOLF_CRYPT_ERROR_H #define WOLF_CRYPT_ERROR_H -#include +#include #if defined(HAVE_FIPS) && \ (!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)) diff --git a/source/libwolfssl/wolfcrypt/fe_448.h b/source/libwolfssl/wolfcrypt/fe_448.h index 4664ce4b..f9a9e5a8 100644 --- a/source/libwolfssl/wolfcrypt/fe_448.h +++ b/source/libwolfssl/wolfcrypt/fe_448.h @@ -23,11 +23,11 @@ #ifndef WOLF_CRYPT_FE_448_H #define WOLF_CRYPT_FE_448_H -#include +#include #if defined(HAVE_CURVE448) || defined(HAVE_ED448) -#include +#include #if defined(HAVE___UINT128_T) && !defined(NO_CURVED448_128BIT) #define CURVED448_128BIT diff --git a/source/libwolfssl/wolfcrypt/fe_operations.h b/source/libwolfssl/wolfcrypt/fe_operations.h index 1f287a0e..d1b5347d 100644 --- a/source/libwolfssl/wolfcrypt/fe_operations.h +++ b/source/libwolfssl/wolfcrypt/fe_operations.h @@ -23,11 +23,11 @@ #ifndef WOLF_CRYPT_FE_OPERATIONS_H #define WOLF_CRYPT_FE_OPERATIONS_H -#include +#include #if defined(HAVE_CURVE25519) || defined(HAVE_ED25519) -#include +#include #if defined(USE_INTEL_SPEEDUP) && !defined(NO_CURVED25519_X64) #define CURVED25519_X64 diff --git a/source/libwolfssl/wolfcrypt/fips_test.h b/source/libwolfssl/wolfcrypt/fips_test.h index b488817c..5430482f 100644 --- a/source/libwolfssl/wolfcrypt/fips_test.h +++ b/source/libwolfssl/wolfcrypt/fips_test.h @@ -24,7 +24,7 @@ #ifndef WOLF_CRYPT_FIPS_TEST_H #define WOLF_CRYPT_FIPS_TEST_H -#include +#include #ifdef __cplusplus diff --git a/source/libwolfssl/wolfcrypt/ge_448.h b/source/libwolfssl/wolfcrypt/ge_448.h index 585ec541..3a61492b 100644 --- a/source/libwolfssl/wolfcrypt/ge_448.h +++ b/source/libwolfssl/wolfcrypt/ge_448.h @@ -23,11 +23,11 @@ #ifndef WOLF_CRYPT_GE_448_H #define WOLF_CRYPT_GE_448_H -#include +#include #ifdef HAVE_ED448 -#include +#include /* ge448 means group element. diff --git a/source/libwolfssl/wolfcrypt/ge_operations.h b/source/libwolfssl/wolfcrypt/ge_operations.h index 9026c529..f847d971 100644 --- a/source/libwolfssl/wolfcrypt/ge_operations.h +++ b/source/libwolfssl/wolfcrypt/ge_operations.h @@ -25,11 +25,11 @@ #ifndef WOLF_CRYPT_GE_OPERATIONS_H #define WOLF_CRYPT_GE_OPERATIONS_H -#include +#include #ifdef HAVE_ED25519 -#include +#include /* ge means group element. diff --git a/source/libwolfssl/wolfcrypt/hash.h b/source/libwolfssl/wolfcrypt/hash.h index fb13fa9c..3c9b767f 100644 --- a/source/libwolfssl/wolfcrypt/hash.h +++ b/source/libwolfssl/wolfcrypt/hash.h @@ -26,34 +26,34 @@ #ifndef WOLF_CRYPT_HASH_H #define WOLF_CRYPT_HASH_H -#include +#include #ifndef NO_MD5 - #include + #include #endif #ifndef NO_SHA - #include + #include #endif #if defined(WOLFSSL_SHA224) || !defined(NO_SHA256) - #include + #include #endif #if defined(WOLFSSL_SHA384) || defined(WOLFSSL_SHA512) - #include + #include #endif #ifdef HAVE_BLAKE2 - #include + #include #endif #ifdef WOLFSSL_SHA3 - #include + #include #endif #ifndef NO_MD4 - #include + #include #endif #ifdef WOLFSSL_MD2 - #include + #include #endif #if defined(HAVE_BLAKE2) || defined(HAVE_BLAKE2S) - #include + #include #endif @@ -178,37 +178,37 @@ WOLFSSL_API int wc_HashFree(wc_HashAlg* hash, enum wc_HashType type); #endif #ifndef NO_MD5 -#include +#include WOLFSSL_API int wc_Md5Hash(const byte* data, word32 len, byte* hash); #endif #ifndef NO_SHA -#include +#include WOLFSSL_API int wc_ShaHash(const byte*, word32, byte*); #endif #ifdef WOLFSSL_SHA224 -#include +#include WOLFSSL_API int wc_Sha224Hash(const byte*, word32, byte*); #endif /* defined(WOLFSSL_SHA224) */ #ifndef NO_SHA256 -#include +#include WOLFSSL_API int wc_Sha256Hash(const byte*, word32, byte*); #endif #ifdef WOLFSSL_SHA384 -#include +#include WOLFSSL_API int wc_Sha384Hash(const byte*, word32, byte*); #endif /* defined(WOLFSSL_SHA384) */ #ifdef WOLFSSL_SHA512 -#include +#include WOLFSSL_API int wc_Sha512Hash(const byte*, word32, byte*); #endif /* WOLFSSL_SHA512 */ #ifdef WOLFSSL_SHA3 -#include +#include WOLFSSL_API int wc_Sha3_224Hash(const byte*, word32, byte*); WOLFSSL_API int wc_Sha3_256Hash(const byte*, word32, byte*); WOLFSSL_API int wc_Sha3_384Hash(const byte*, word32, byte*); diff --git a/source/libwolfssl/wolfcrypt/hc128.h b/source/libwolfssl/wolfcrypt/hc128.h index 00b04000..51152060 100644 --- a/source/libwolfssl/wolfcrypt/hc128.h +++ b/source/libwolfssl/wolfcrypt/hc128.h @@ -27,7 +27,7 @@ #ifndef WOLF_CRYPT_HC128_H #define WOLF_CRYPT_HC128_H -#include +#include #ifndef NO_HC128 diff --git a/source/libwolfssl/wolfcrypt/hmac.h b/source/libwolfssl/wolfcrypt/hmac.h index 76e0c510..1637d409 100644 --- a/source/libwolfssl/wolfcrypt/hmac.h +++ b/source/libwolfssl/wolfcrypt/hmac.h @@ -28,7 +28,7 @@ #ifndef WOLF_CRYPT_HMAC_H #define WOLF_CRYPT_HMAC_H -#include +#include #if defined(HAVE_FIPS) && \ (!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)) @@ -40,7 +40,7 @@ #if defined(HAVE_FIPS) && \ defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) - #include + #include #endif #ifdef __cplusplus @@ -52,7 +52,7 @@ (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)) #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif #ifndef NO_OLD_WC_NAMES diff --git a/source/libwolfssl/wolfcrypt/idea.h b/source/libwolfssl/wolfcrypt/idea.h index 44b8c4a3..27163cb1 100644 --- a/source/libwolfssl/wolfcrypt/idea.h +++ b/source/libwolfssl/wolfcrypt/idea.h @@ -26,7 +26,7 @@ #ifndef WOLF_CRYPT_IDEA_H #define WOLF_CRYPT_IDEA_H -#include +#include #ifdef HAVE_IDEA diff --git a/source/libwolfssl/wolfcrypt/md2.h b/source/libwolfssl/wolfcrypt/md2.h index d44b686c..793e9b9a 100644 --- a/source/libwolfssl/wolfcrypt/md2.h +++ b/source/libwolfssl/wolfcrypt/md2.h @@ -27,7 +27,7 @@ #ifndef WOLF_CRYPT_MD2_H #define WOLF_CRYPT_MD2_H -#include +#include #ifdef WOLFSSL_MD2 diff --git a/source/libwolfssl/wolfcrypt/md4.h b/source/libwolfssl/wolfcrypt/md4.h index 2e37fdcb..adb11392 100644 --- a/source/libwolfssl/wolfcrypt/md4.h +++ b/source/libwolfssl/wolfcrypt/md4.h @@ -26,7 +26,7 @@ #ifndef WOLF_CRYPT_MD4_H #define WOLF_CRYPT_MD4_H -#include +#include #ifndef NO_MD4 diff --git a/source/libwolfssl/wolfcrypt/md5.h b/source/libwolfssl/wolfcrypt/md5.h index 99a75ccc..4437a158 100644 --- a/source/libwolfssl/wolfcrypt/md5.h +++ b/source/libwolfssl/wolfcrypt/md5.h @@ -27,7 +27,7 @@ #ifndef WOLF_CRYPT_MD5_H #define WOLF_CRYPT_MD5_H -#include +#include #ifndef NO_MD5 @@ -63,13 +63,13 @@ enum { #ifdef WOLFSSL_MICROCHIP_PIC32MZ - #include + #include #endif #ifdef STM32_HASH - #include + #include #endif #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif #ifdef WOLFSSL_TI_HASH diff --git a/source/libwolfssl/wolfcrypt/misc.h b/source/libwolfssl/wolfcrypt/misc.h index b359650f..1a57f07c 100644 --- a/source/libwolfssl/wolfcrypt/misc.h +++ b/source/libwolfssl/wolfcrypt/misc.h @@ -29,7 +29,7 @@ masking and clearing memory logic. #define WOLF_CRYPT_MISC_H -#include +#include #ifdef __cplusplus diff --git a/source/libwolfssl/wolfcrypt/pkcs12.h b/source/libwolfssl/wolfcrypt/pkcs12.h index 9d92f5ef..5612f450 100644 --- a/source/libwolfssl/wolfcrypt/pkcs12.h +++ b/source/libwolfssl/wolfcrypt/pkcs12.h @@ -23,7 +23,7 @@ #ifndef WOLF_CRYPT_PKCS12_H #define WOLF_CRYPT_PKCS12_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/wolfcrypt/pkcs7.h b/source/libwolfssl/wolfcrypt/pkcs7.h index cbb66b30..b4744bf1 100644 --- a/source/libwolfssl/wolfcrypt/pkcs7.h +++ b/source/libwolfssl/wolfcrypt/pkcs7.h @@ -26,22 +26,22 @@ #ifndef WOLF_CRYPT_PKCS7_H #define WOLF_CRYPT_PKCS7_H -#include +#include #ifdef HAVE_PKCS7 #ifndef NO_ASN - #include + #include #endif -#include -#include +#include +#include #ifndef NO_AES - #include + #include #endif #ifndef NO_DES3 - #include + #include #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/wolfcrypt/poly1305.h b/source/libwolfssl/wolfcrypt/poly1305.h index 9c71b790..4c1e873a 100644 --- a/source/libwolfssl/wolfcrypt/poly1305.h +++ b/source/libwolfssl/wolfcrypt/poly1305.h @@ -26,7 +26,7 @@ #ifndef WOLF_CRYPT_POLY1305_H #define WOLF_CRYPT_POLY1305_H -#include +#include #ifdef HAVE_POLY1305 diff --git a/source/libwolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h b/source/libwolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h index d2214647..c09f50e9 100644 --- a/source/libwolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h +++ b/source/libwolfssl/wolfcrypt/port/Renesas/renesas-tsip-crypt.h @@ -29,7 +29,7 @@ #endif #include "r_tsip_rx_if.h" -#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/wolfcrypt/port/af_alg/afalg_hash.h b/source/libwolfssl/wolfcrypt/port/af_alg/afalg_hash.h index 41a382a6..72d61ca5 100644 --- a/source/libwolfssl/wolfcrypt/port/af_alg/afalg_hash.h +++ b/source/libwolfssl/wolfcrypt/port/af_alg/afalg_hash.h @@ -23,7 +23,7 @@ #ifndef WOLF_CRYPT_AFALG_HASH_H #define WOLF_CRYPT_AFALG_HASH_H -#include +#include #undef WOLFSSL_NO_HASH_RAW #define WOLFSSL_NO_HASH_RAW diff --git a/source/libwolfssl/wolfcrypt/port/af_alg/wc_afalg.h b/source/libwolfssl/wolfcrypt/port/af_alg/wc_afalg.h index 87bff31f..95fcca1f 100644 --- a/source/libwolfssl/wolfcrypt/port/af_alg/wc_afalg.h +++ b/source/libwolfssl/wolfcrypt/port/af_alg/wc_afalg.h @@ -23,7 +23,7 @@ #ifndef WOLFSSL_AFALG_H #define WOLFSSL_AFALG_H -#include +#include #include #include diff --git a/source/libwolfssl/wolfcrypt/port/arm/cryptoCell.h b/source/libwolfssl/wolfcrypt/port/arm/cryptoCell.h index 387ecff1..a86bd198 100644 --- a/source/libwolfssl/wolfcrypt/port/arm/cryptoCell.h +++ b/source/libwolfssl/wolfcrypt/port/arm/cryptoCell.h @@ -27,7 +27,7 @@ extern "C" { #endif -#include +#include #include "sns_silib.h" diff --git a/source/libwolfssl/wolfcrypt/port/atmel/atmel.h b/source/libwolfssl/wolfcrypt/port/atmel/atmel.h index 950e9192..7c745afa 100644 --- a/source/libwolfssl/wolfcrypt/port/atmel/atmel.h +++ b/source/libwolfssl/wolfcrypt/port/atmel/atmel.h @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include #if defined(WOLFSSL_ATECC508A) || defined(WOLFSSL_ATECC608A) || \ defined(WOLFSSL_ATECC_PKCB) @@ -68,7 +68,7 @@ #endif /* ATECC_KEY_SIZE required for ecc.h */ -#include +#include struct WOLFSSL; struct WOLFSSL_CTX; diff --git a/source/libwolfssl/wolfcrypt/port/caam/wolfcaam.h b/source/libwolfssl/wolfcrypt/port/caam/wolfcaam.h index c306edea..6a2f8a5f 100644 --- a/source/libwolfssl/wolfcrypt/port/caam/wolfcaam.h +++ b/source/libwolfssl/wolfcrypt/port/caam/wolfcaam.h @@ -22,12 +22,12 @@ #ifndef WOLF_CRYPT_CAAM_INIT_H #define WOLF_CRYPT_CAAM_INIT_H -#include -#include +#include +#include /* include for porting layer */ #ifdef WOLFSSL_QNX_CAAM - #include + #include #endif #if defined(WOLFSSL_IMX6_CAAM) || defined(WOLFSSL_IMX6_CAAM_RNG) || \ diff --git a/source/libwolfssl/wolfcrypt/port/caam/wolfcaam_sha.h b/source/libwolfssl/wolfcrypt/port/caam/wolfcaam_sha.h index 88c3c9c3..4eac5757 100644 --- a/source/libwolfssl/wolfcrypt/port/caam/wolfcaam_sha.h +++ b/source/libwolfssl/wolfcrypt/port/caam/wolfcaam_sha.h @@ -22,11 +22,11 @@ #ifndef WOLF_CRYPT_CAAM_SHA_H #define WOLF_CRYPT_CAAM_SHA_H -#include +#include #ifdef WOLFSSL_IMX6_CAAM -#include +#include #define WOLFSSL_NO_HASH_RAW diff --git a/source/libwolfssl/wolfcrypt/port/cypress/psoc6_crypto.h b/source/libwolfssl/wolfcrypt/port/cypress/psoc6_crypto.h index d3e4a09e..023497ed 100644 --- a/source/libwolfssl/wolfcrypt/port/cypress/psoc6_crypto.h +++ b/source/libwolfssl/wolfcrypt/port/cypress/psoc6_crypto.h @@ -22,7 +22,7 @@ #ifndef _PSOC6_CRYPTO_PORT_H_ #define _PSOC6_CRYPTO_PORT_H_ -#include +#include #include "cy_crypto_core_sha.h" #include "cy_device_headers.h" #include "psoc6_02_config.h" @@ -31,17 +31,17 @@ #ifdef WOLFSSL_SHA512 -#include +#include #endif #ifndef NO_SHA256 -#include -#include +#include +#include #endif /* !def NO_SHA256 */ #ifdef HAVE_ECC -#include +#include int psoc6_ecc_verify_hash_ex(mp_int *r, mp_int *s, const byte* hash, word32 hashlen, int* verif_res, ecc_key* key); #endif /* HAVE_ECC */ diff --git a/source/libwolfssl/wolfcrypt/port/devcrypto/wc_devcrypto.h b/source/libwolfssl/wolfcrypt/port/devcrypto/wc_devcrypto.h index 0181784d..dd3a0943 100644 --- a/source/libwolfssl/wolfcrypt/port/devcrypto/wc_devcrypto.h +++ b/source/libwolfssl/wolfcrypt/port/devcrypto/wc_devcrypto.h @@ -23,7 +23,7 @@ #ifndef WOLFSSL_DEVCRYPTO_H #define WOLFSSL_DEVCRYPTO_H -#include +#include #ifdef WOLFSSL_DEVCRYPTO diff --git a/source/libwolfssl/wolfcrypt/port/nrf51.h b/source/libwolfssl/wolfcrypt/port/nrf51.h index 88996740..1b2236cc 100644 --- a/source/libwolfssl/wolfcrypt/port/nrf51.h +++ b/source/libwolfssl/wolfcrypt/port/nrf51.h @@ -27,7 +27,7 @@ extern "C" { #endif -#include +#include /* Public Functions */ int nrf51_random_generate(byte* output, word32 sz); diff --git a/source/libwolfssl/wolfcrypt/port/nxp/dcp_port.h b/source/libwolfssl/wolfcrypt/port/nxp/dcp_port.h index fb400ff9..d09be8ca 100644 --- a/source/libwolfssl/wolfcrypt/port/nxp/dcp_port.h +++ b/source/libwolfssl/wolfcrypt/port/nxp/dcp_port.h @@ -21,23 +21,23 @@ #ifndef _DCP_PORT_H_ #define _DCP_PORT_H_ -#include +#include #include "fsl_dcp.h" #ifndef NO_SHA256 -#include +#include void DCPSha256Free(wc_Sha256 *sha256); #endif #ifndef NO_SHA -#include +#include void DCPShaFree(wc_Sha *sha); #endif int wc_dcp_init(void); #ifndef NO_AES -#include +#include int DCPAesInit(Aes* aes); void DCPAesFree(Aes *aes); diff --git a/source/libwolfssl/wolfcrypt/port/nxp/ksdk_port.h b/source/libwolfssl/wolfcrypt/port/nxp/ksdk_port.h index 0c3e484a..88422802 100644 --- a/source/libwolfssl/wolfcrypt/port/nxp/ksdk_port.h +++ b/source/libwolfssl/wolfcrypt/port/nxp/ksdk_port.h @@ -22,17 +22,17 @@ #ifndef _KSDK_PORT_H_ #define _KSDK_PORT_H_ -#include +#include #ifdef USE_FAST_MATH - #include + #include #elif defined WOLFSSL_SP_MATH - #include + #include #else - #include + #include #endif -#include -#include -#include +#include +#include +#include /* API to init required hardware */ diff --git a/source/libwolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h b/source/libwolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h index b5edceeb..6644f7ce 100644 --- a/source/libwolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h +++ b/source/libwolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h @@ -27,7 +27,7 @@ extern "C" { #endif -#include +#include #ifdef WOLFSSL_MICROCHIP_PIC32MZ diff --git a/source/libwolfssl/wolfcrypt/port/st/stm32.h b/source/libwolfssl/wolfcrypt/port/st/stm32.h index 0944472f..987e0c25 100644 --- a/source/libwolfssl/wolfcrypt/port/st/stm32.h +++ b/source/libwolfssl/wolfcrypt/port/st/stm32.h @@ -25,8 +25,8 @@ /* Generic STM32 Hashing and Crypto Functions */ /* Supports CubeMX HAL or Standard Peripheral Library */ -#include -#include +#include +#include #ifdef STM32_HASH diff --git a/source/libwolfssl/wolfcrypt/port/st/stsafe.h b/source/libwolfssl/wolfcrypt/port/st/stsafe.h index 0809fcd3..98ae4c54 100644 --- a/source/libwolfssl/wolfcrypt/port/st/stsafe.h +++ b/source/libwolfssl/wolfcrypt/port/st/stsafe.h @@ -22,16 +22,16 @@ #ifndef _WOLFPORT_STSAFE_H_ #define _WOLFPORT_STSAFE_H_ -#include -#include -#include +#include +#include +#include #ifdef WOLF_CRYPTO_CB -#include +#include #endif #if !defined(WOLFCRYPT_ONLY) && defined(HAVE_PK_CALLBACKS) -#include +#include #endif #ifdef WOLFSSL_STSAFEA100 diff --git a/source/libwolfssl/wolfcrypt/port/ti/ti-ccm.h b/source/libwolfssl/wolfcrypt/port/ti/ti-ccm.h index f14add29..7bfe9adb 100644 --- a/source/libwolfssl/wolfcrypt/port/ti/ti-ccm.h +++ b/source/libwolfssl/wolfcrypt/port/ti/ti-ccm.h @@ -27,7 +27,7 @@ #include #endif -#include +#include #if defined(WOLFSSL_TI_CRYPT) || defined(WOLFSSL_TI_HASH) diff --git a/source/libwolfssl/wolfcrypt/port/ti/ti-hash.h b/source/libwolfssl/wolfcrypt/port/ti/ti-hash.h index 93210186..03445abd 100644 --- a/source/libwolfssl/wolfcrypt/port/ti/ti-hash.h +++ b/source/libwolfssl/wolfcrypt/port/ti/ti-hash.h @@ -23,7 +23,7 @@ #ifndef WOLF_CRYPT_TI_HASH_H #define WOLF_CRYPT_TI_HASH_H -#include +#include #ifndef WOLFSSL_TI_INITBUFF #define WOLFSSL_TI_INITBUFF 64 diff --git a/source/libwolfssl/wolfcrypt/pwdbased.h b/source/libwolfssl/wolfcrypt/pwdbased.h index 3705e672..d5267f3a 100644 --- a/source/libwolfssl/wolfcrypt/pwdbased.h +++ b/source/libwolfssl/wolfcrypt/pwdbased.h @@ -26,7 +26,7 @@ #ifndef WOLF_CRYPT_PWDBASED_H #define WOLF_CRYPT_PWDBASED_H -#include +#include #ifndef NO_PWDBASED diff --git a/source/libwolfssl/wolfcrypt/rabbit.h b/source/libwolfssl/wolfcrypt/rabbit.h index 757945b0..4824e282 100644 --- a/source/libwolfssl/wolfcrypt/rabbit.h +++ b/source/libwolfssl/wolfcrypt/rabbit.h @@ -27,7 +27,7 @@ #ifndef WOLF_CRYPT_RABBIT_H #define WOLF_CRYPT_RABBIT_H -#include +#include #ifndef NO_RABBIT diff --git a/source/libwolfssl/wolfcrypt/random.h b/source/libwolfssl/wolfcrypt/random.h index 4315b52b..33234013 100644 --- a/source/libwolfssl/wolfcrypt/random.h +++ b/source/libwolfssl/wolfcrypt/random.h @@ -220,7 +220,7 @@ WOLFSSL_ABI WOLFSSL_API int wc_RNG_GenerateBlock(WC_RNG*, byte*, word32 sz); WOLFSSL_API int wc_RNG_GenerateByte(WC_RNG*, byte*); WOLFSSL_API int wc_FreeRng(WC_RNG*); #else -#include +#include #define wc_InitRng(rng) NOT_COMPILED_IN #define wc_InitRng_ex(rng, h, d) NOT_COMPILED_IN #define wc_InitRngNonce(rng, n, s) NOT_COMPILED_IN diff --git a/source/libwolfssl/wolfcrypt/ripemd.h b/source/libwolfssl/wolfcrypt/ripemd.h index 170e5085..7f5e22e8 100644 --- a/source/libwolfssl/wolfcrypt/ripemd.h +++ b/source/libwolfssl/wolfcrypt/ripemd.h @@ -26,7 +26,7 @@ #ifndef WOLF_CRYPT_RIPEMD_H #define WOLF_CRYPT_RIPEMD_H -#include +#include #ifdef WOLFSSL_RIPEMD diff --git a/source/libwolfssl/wolfcrypt/rsa.h b/source/libwolfssl/wolfcrypt/rsa.h index 8dad0f26..d2214357 100644 --- a/source/libwolfssl/wolfcrypt/rsa.h +++ b/source/libwolfssl/wolfcrypt/rsa.h @@ -33,7 +33,7 @@ RSA keys can be used to encrypt, decrypt, sign and verify data. #ifndef WOLF_CRYPT_RSA_H #define WOLF_CRYPT_RSA_H -#include +#include #ifndef NO_RSA @@ -71,23 +71,23 @@ RSA keys can be used to encrypt, decrypt, sign and verify data. #define WOLFSSL_KEY_GEN #endif #else - #include - #include + #include + #include #endif /* HAVE_FIPS && HAVE_FIPS_VERION 1 */ #if defined(HAVE_FIPS) && \ defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) -#include +#include #endif /* header file needed for OAEP padding */ -#include +#include #ifdef WOLFSSL_XILINX_CRYPT #include "xsecure_rsa.h" #endif #if defined(WOLFSSL_CRYPTOCELL) - #include + #include #endif #ifdef __cplusplus @@ -107,9 +107,9 @@ RSA keys can be used to encrypt, decrypt, sign and verify data. (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)) #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #ifdef WOLFSSL_CERT_GEN - #include + #include #endif #endif diff --git a/source/libwolfssl/wolfcrypt/selftest.h b/source/libwolfssl/wolfcrypt/selftest.h index da97d0d4..8d08aadb 100644 --- a/source/libwolfssl/wolfcrypt/selftest.h +++ b/source/libwolfssl/wolfcrypt/selftest.h @@ -24,7 +24,7 @@ #ifndef WOLFCRYPT_SELF_TEST_H #define WOLFCRYPT_SELF_TEST_H -#include +#include #ifdef __cplusplus diff --git a/source/libwolfssl/wolfcrypt/settings.h b/source/libwolfssl/wolfcrypt/settings.h index b22343d7..84526c0f 100644 --- a/source/libwolfssl/wolfcrypt/settings.h +++ b/source/libwolfssl/wolfcrypt/settings.h @@ -35,7 +35,7 @@ * projects do it themselves. This should *NEVER* be defined when building * wolfSSL as it can cause hard to debug problems. */ #ifdef EXTERNAL_OPTS_OPENVPN -#include +#include #endif /* Uncomment next line if using IPHONE */ diff --git a/source/libwolfssl/wolfcrypt/sha.h b/source/libwolfssl/wolfcrypt/sha.h index 0df25749..7546ff43 100644 --- a/source/libwolfssl/wolfcrypt/sha.h +++ b/source/libwolfssl/wolfcrypt/sha.h @@ -27,13 +27,13 @@ #ifndef WOLF_CRYPT_SHA_H #define WOLF_CRYPT_SHA_H -#include +#include #ifndef NO_SHA #if defined(HAVE_FIPS) && \ defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) - #include + #include #endif /* HAVE_FIPS_VERSION >= 2 */ #if defined(HAVE_FIPS) && \ @@ -65,19 +65,19 @@ (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)) #ifdef WOLFSSL_MICROCHIP_PIC32MZ - #include + #include #endif #ifdef STM32_HASH - #include + #include #endif #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif #ifdef WOLFSSL_ESP32WROOM32_CRYPT - #include + #include #endif #if defined(WOLFSSL_SILABS_SE_ACCEL) - #include + #include #endif #if !defined(NO_OLD_SHA_NAMES) diff --git a/source/libwolfssl/wolfcrypt/sha256.h b/source/libwolfssl/wolfcrypt/sha256.h index e85480d0..a8e7cac9 100644 --- a/source/libwolfssl/wolfcrypt/sha256.h +++ b/source/libwolfssl/wolfcrypt/sha256.h @@ -99,7 +99,7 @@ #include #endif #if defined(WOLFSSL_SILABS_SE_ACCEL) - #include + #include #endif #if defined(_MSC_VER) diff --git a/source/libwolfssl/wolfcrypt/sha3.h b/source/libwolfssl/wolfcrypt/sha3.h index b75351fa..8283a9d8 100644 --- a/source/libwolfssl/wolfcrypt/sha3.h +++ b/source/libwolfssl/wolfcrypt/sha3.h @@ -23,13 +23,13 @@ #ifndef WOLF_CRYPT_SHA3_H #define WOLF_CRYPT_SHA3_H -#include +#include #ifdef WOLFSSL_SHA3 #ifdef HAVE_FIPS /* for fips @wc_fips */ - #include + #include #endif #ifdef __cplusplus @@ -37,7 +37,7 @@ #endif #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif /* in bytes */ @@ -86,7 +86,7 @@ enum { #ifdef WOLFSSL_XILINX_CRYPT #include "wolfssl/wolfcrypt/port/xilinx/xil-sha3.h" #elif defined(WOLFSSL_AFALG_XILINX_SHA3) - #include + #include #else /* Sha3 digest */ diff --git a/source/libwolfssl/wolfcrypt/sha512.h b/source/libwolfssl/wolfcrypt/sha512.h index 9547390a..27f52b14 100644 --- a/source/libwolfssl/wolfcrypt/sha512.h +++ b/source/libwolfssl/wolfcrypt/sha512.h @@ -27,14 +27,14 @@ #ifndef WOLF_CRYPT_SHA512_H #define WOLF_CRYPT_SHA512_H -#include +#include #if defined(WOLFSSL_SHA512) || defined(WOLFSSL_SHA384) #if defined(HAVE_FIPS) && \ defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2) - #include + #include #endif /* HAVE_FIPS_VERSION >= 2 */ #if defined(HAVE_FIPS) && \ @@ -71,13 +71,13 @@ (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)) #ifdef WOLFSSL_ASYNC_CRYPT - #include + #include #endif #ifdef WOLFSSL_ESP32WROOM32_CRYPT - #include + #include #endif #if defined(WOLFSSL_SILABS_SE_ACCEL) - #include + #include #endif #if defined(WOLFSSL_PSOC6_CRYPTO) #include "cy_crypto_core_sha.h" diff --git a/source/libwolfssl/wolfcrypt/signature.h b/source/libwolfssl/wolfcrypt/signature.h index 39748070..a37b6f69 100644 --- a/source/libwolfssl/wolfcrypt/signature.h +++ b/source/libwolfssl/wolfcrypt/signature.h @@ -27,9 +27,9 @@ #ifndef WOLF_CRYPT_SIGNATURE_H #define WOLF_CRYPT_SIGNATURE_H -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/wolfcrypt/sp.h b/source/libwolfssl/wolfcrypt/sp.h index 052871c5..34c1276b 100644 --- a/source/libwolfssl/wolfcrypt/sp.h +++ b/source/libwolfssl/wolfcrypt/sp.h @@ -23,7 +23,7 @@ #ifndef WOLF_CRYPT_SP_H #define WOLF_CRYPT_SP_H -#include +#include #if defined(WOLFSSL_HAVE_SP_RSA) || defined(WOLFSSL_HAVE_SP_DH) || \ defined(WOLFSSL_HAVE_SP_ECC) @@ -38,10 +38,10 @@ #include #endif -#include -#include +#include +#include -#include +#include #ifdef noinline #define SP_NOINLINE noinline diff --git a/source/libwolfssl/wolfcrypt/sp_int.h b/source/libwolfssl/wolfcrypt/sp_int.h index 92672621..34f77dc5 100644 --- a/source/libwolfssl/wolfcrypt/sp_int.h +++ b/source/libwolfssl/wolfcrypt/sp_int.h @@ -346,7 +346,7 @@ typedef struct sp_ecc_ctx { #endif #if defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH_ALL) -#include +#include #ifdef SP_INT_BITS /* Calculate number of digits to have in an sp_int based maximum size of @@ -760,7 +760,7 @@ typedef sp_int_digit mp_digit; /* Include the maths operations that are not implementation specific. */ -#include +#include /* * Function prototypes. diff --git a/source/libwolfssl/wolfcrypt/srp.h b/source/libwolfssl/wolfcrypt/srp.h index d5b9d181..ea697287 100644 --- a/source/libwolfssl/wolfcrypt/srp.h +++ b/source/libwolfssl/wolfcrypt/srp.h @@ -28,11 +28,11 @@ #ifndef WOLFCRYPT_SRP_H #define WOLFCRYPT_SRP_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/wolfcrypt/tfm.h b/source/libwolfssl/wolfcrypt/tfm.h index 1f080762..cbc2e128 100644 --- a/source/libwolfssl/wolfcrypt/tfm.h +++ b/source/libwolfssl/wolfcrypt/tfm.h @@ -39,12 +39,12 @@ #ifndef WOLF_CRYPT_TFM_H #define WOLF_CRYPT_TFM_H -#include +#include #ifndef CHAR_BIT #include #endif -#include +#include #ifdef __cplusplus extern "C" { @@ -339,7 +339,7 @@ typedef fp_int mp_int; /* wolf big int and common functions */ -#include +#include /* externally define this symbol to ignore the default settings, useful for changing the build from the make process */ diff --git a/source/libwolfssl/wolfcrypt/types.h b/source/libwolfssl/wolfcrypt/types.h index da4435d3..0ed56e7c 100644 --- a/source/libwolfssl/wolfcrypt/types.h +++ b/source/libwolfssl/wolfcrypt/types.h @@ -327,7 +327,7 @@ decouple library dependencies with standard string, memory and so on. #elif (defined(WOLFSSL_ASYNC_CRYPT) && defined(HAVE_INTEL_QA)) || \ defined(HAVE_INTEL_QA_SYNC) #ifndef HAVE_INTEL_QA_SYNC - #include + #include #undef USE_WOLFSSL_MEMORY #ifdef WOLFSSL_DEBUG_MEMORY #define XMALLOC(s, h, t) IntelQaMalloc((s), (h), (t), __func__, __LINE__) @@ -339,7 +339,7 @@ decouple library dependencies with standard string, memory and so on. #define XREALLOC(p, n, h, t) IntelQaRealloc((p), (n), (h), (t)) #endif /* WOLFSSL_DEBUG_MEMORY */ #else - #include + #include #undef USE_WOLFSSL_MEMORY #ifdef WOLFSSL_DEBUG_MEMORY #define XMALLOC(s, h, t) wc_CryptoCb_IntelQaMalloc((s), (h), (t), __func__, __LINE__) diff --git a/source/libwolfssl/wolfcrypt/wc_encrypt.h b/source/libwolfssl/wolfcrypt/wc_encrypt.h index 71487fba..6c5cda95 100644 --- a/source/libwolfssl/wolfcrypt/wc_encrypt.h +++ b/source/libwolfssl/wolfcrypt/wc_encrypt.h @@ -27,18 +27,18 @@ #ifndef WOLF_CRYPT_ENCRYPT_H #define WOLF_CRYPT_ENCRYPT_H -#include +#include #ifndef NO_AES - #include + #include #endif #ifdef HAVE_CHACHA - #include + #include #endif #ifndef NO_DES3 - #include + #include #endif #ifndef NO_RC4 - #include + #include #endif #ifdef __cplusplus diff --git a/source/libwolfssl/wolfcrypt/wc_pkcs11.h b/source/libwolfssl/wolfcrypt/wc_pkcs11.h index 65bf50a6..1824b36e 100644 --- a/source/libwolfssl/wolfcrypt/wc_pkcs11.h +++ b/source/libwolfssl/wolfcrypt/wc_pkcs11.h @@ -22,7 +22,7 @@ #ifndef _WOLFPKCS11_H_ #define _WOLFPKCS11_H_ -#include +#include #ifdef HAVE_PKCS11 @@ -30,8 +30,8 @@ #error PKCS11 support requires ./configure --enable-cryptocb or WOLF_CRYPTO_CB to be defined #endif -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/source/libwolfssl/wolfcrypt/wolfevent.h b/source/libwolfssl/wolfcrypt/wolfevent.h index 83df5cfd..c127c8ec 100644 --- a/source/libwolfssl/wolfcrypt/wolfevent.h +++ b/source/libwolfssl/wolfcrypt/wolfevent.h @@ -27,7 +27,7 @@ #endif #ifndef SINGLE_THREADED - #include + #include #endif typedef struct WOLF_EVENT WOLF_EVENT;