From 8cea8283dbf010737ae529b563af5cc9d985ddf3 Mon Sep 17 00:00:00 2001 From: David Garske Date: Fri, 13 Sep 2024 13:52:21 -0700 Subject: [PATCH] Support for NO_ASN when wildcard *.c is used. Added `STM32H743xx` support. --- IDE/STM32Cube/default_conf.ftl | 2 +- wolfcrypt/src/port/Renesas/renesas_tsip_sha.c | 12 +++++++----- wolfssl/internal.h | 8 +++++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/IDE/STM32Cube/default_conf.ftl b/IDE/STM32Cube/default_conf.ftl index d565bb4971..3c0ebeb585 100644 --- a/IDE/STM32Cube/default_conf.ftl +++ b/IDE/STM32Cube/default_conf.ftl @@ -107,7 +107,7 @@ extern ${variable.value} ${variable.name}; #undef NO_STM32_HASH #undef NO_STM32_CRYPTO #define HAL_CONSOLE_UART huart3 -#elif defined(STM32H723xx) || defined(STM32H725xx) +#elif defined(STM32H723xx) || defined(STM32H725xx) || defined(STM32H743xx) #define WOLFSSL_STM32H7 #define HAL_CONSOLE_UART huart3 #elif defined(STM32L4A6xx) diff --git a/wolfcrypt/src/port/Renesas/renesas_tsip_sha.c b/wolfcrypt/src/port/Renesas/renesas_tsip_sha.c index a12c1ebcf8..7e67bd8bf1 100644 --- a/wolfcrypt/src/port/Renesas/renesas_tsip_sha.c +++ b/wolfcrypt/src/port/Renesas/renesas_tsip_sha.c @@ -18,23 +18,25 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ -#include -#include #ifdef HAVE_CONFIG_H #include #endif #include + +#if !defined(NO_SHA) || !defined(NO_SHA256) +#include +#include + #include +#include + #ifdef NO_INLINE #include #else #define WOLFSSL_MISC_INCLUDED #include #endif -#if !defined(NO_SHA) || !defined(NO_SHA256) - -#include #if (defined(WOLFSSL_RENESAS_TSIP_TLS) || \ defined(WOLFSSL_RENESAS_TSIP_CRYPTONLY)) diff --git a/wolfssl/internal.h b/wolfssl/internal.h index 582ab1de82..257422a9b2 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -2215,7 +2215,7 @@ WOLFSSL_LOCAL void FreeKeyExchange(WOLFSSL* ssl); WOLFSSL_LOCAL void FreeSuites(WOLFSSL* ssl); WOLFSSL_LOCAL int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, word32 totalSz); WOLFSSL_LOCAL int MatchDomainName(const char* pattern, int len, const char* str, word32 strLen); -#ifndef NO_CERTS +#if !defined(NO_CERTS) && !defined(NO_ASN) WOLFSSL_LOCAL int CheckForAltNames(DecodedCert* dCert, const char* domain, word32 domainLen, int* checkCN); WOLFSSL_LOCAL int CheckIPAddr(DecodedCert* dCert, const char* ipasc); WOLFSSL_LOCAL void CopyDecodedName(WOLFSSL_X509_NAME* name, DecodedCert* dCert, int nameType); @@ -2675,7 +2675,9 @@ typedef struct ProcPeerCertArgs { #ifdef WOLFSSL_TLS13 buffer* exts; /* extensions */ #endif +#ifndef NO_ASN DecodedCert* dCert; +#endif word32 idx; word32 begin; int totalCerts; /* number of certs in certs buffer */ @@ -6178,8 +6180,10 @@ WOLFSSL_API void SSL_ResourceFree(WOLFSSL* ssl); /* Micrium uses */ int type, WOLFSSL* ssl, int userChain, WOLFSSL_CRL* crl, int verify); + #ifndef NO_ASN WOLFSSL_LOCAL int CheckHostName(DecodedCert* dCert, const char *domainName, size_t domainNameLen); + #endif #endif @@ -6591,8 +6595,10 @@ WOLFSSL_LOCAL enum wc_HashType HashAlgoToType(int hashAlgo); WOLFSSL_LOCAL void InitX509(WOLFSSL_X509* x509, int dynamicFlag, void* heap); WOLFSSL_LOCAL void FreeX509(WOLFSSL_X509* x509); + #ifndef NO_ASN WOLFSSL_LOCAL int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert); + #endif #endif #ifndef MAX_CIPHER_NAME