Merge pull request #7974 from dgarske/noasn

Support for NO_ASN when wildcard *.c is used
wolfSSL · Sep 14, 2024 · 990d38a · 990d38a
2 parents 80f3b0d + 8cea828
commit 990d38a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git 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
@@ -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 <string.h>
-#include <stdio.h>
 
 #ifdef HAVE_CONFIG_H
  #include <config.h>
 #endif
 #include <wolfssl/wolfcrypt/settings.h>
+
+#if !defined(NO_SHA) || !defined(NO_SHA256)
+#include <string.h>
+#include <stdio.h>
+
 #include <wolfssl/internal.h>
+#include <wolfssl/wolfcrypt/logging.h>
+
 #ifdef NO_INLINE
  #include <wolfssl/wolfcrypt/misc.h>
 #else
  #define WOLFSSL_MISC_INCLUDED
  #include <wolfcrypt/src/misc.c>
 #endif
-#if !defined(NO_SHA) || !defined(NO_SHA256)
-
-#include <wolfssl/wolfcrypt/logging.h>
 
 #if (defined(WOLFSSL_RENESAS_TSIP_TLS) || \
  defined(WOLFSSL_RENESAS_TSIP_CRYPTONLY))

diff --git 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 */
@@ -6201,8 +6203,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
 
 
@@ -6614,8 +6618,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
 
 #if defined(WOLFSSL_ACERT)