Skip to content

Commit 990d38a

Browse files
authored
Merge pull request #7974 from dgarske/noasn
Support for NO_ASN when wildcard *.c is used
2 parents 80f3b0d + 8cea828 commit 990d38a

3 files changed

Lines changed: 15 additions & 7 deletions

File tree

IDE/STM32Cube/default_conf.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ extern ${variable.value} ${variable.name};
107107
#undef NO_STM32_HASH
108108
#undef NO_STM32_CRYPTO
109109
#define HAL_CONSOLE_UART huart3
110-
#elif defined(STM32H723xx) || defined(STM32H725xx)
110+
#elif defined(STM32H723xx) || defined(STM32H725xx) || defined(STM32H743xx)
111111
#define WOLFSSL_STM32H7
112112
#define HAL_CONSOLE_UART huart3
113113
#elif defined(STM32L4A6xx)

wolfcrypt/src/port/Renesas/renesas_tsip_sha.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,25 @@
1818
* along with this program; if not, write to the Free Software
1919
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
2020
*/
21-
#include <string.h>
22-
#include <stdio.h>
2321

2422
#ifdef HAVE_CONFIG_H
2523
#include <config.h>
2624
#endif
2725
#include <wolfssl/wolfcrypt/settings.h>
26+
27+
#if !defined(NO_SHA) || !defined(NO_SHA256)
28+
#include <string.h>
29+
#include <stdio.h>
30+
2831
#include <wolfssl/internal.h>
32+
#include <wolfssl/wolfcrypt/logging.h>
33+
2934
#ifdef NO_INLINE
3035
#include <wolfssl/wolfcrypt/misc.h>
3136
#else
3237
#define WOLFSSL_MISC_INCLUDED
3338
#include <wolfcrypt/src/misc.c>
3439
#endif
35-
#if !defined(NO_SHA) || !defined(NO_SHA256)
36-
37-
#include <wolfssl/wolfcrypt/logging.h>
3840

3941
#if (defined(WOLFSSL_RENESAS_TSIP_TLS) || \
4042
defined(WOLFSSL_RENESAS_TSIP_CRYPTONLY))

wolfssl/internal.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2215,7 +2215,7 @@ WOLFSSL_LOCAL void FreeKeyExchange(WOLFSSL* ssl);
22152215
WOLFSSL_LOCAL void FreeSuites(WOLFSSL* ssl);
22162216
WOLFSSL_LOCAL int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, word32 totalSz);
22172217
WOLFSSL_LOCAL int MatchDomainName(const char* pattern, int len, const char* str, word32 strLen);
2218-
#ifndef NO_CERTS
2218+
#if !defined(NO_CERTS) && !defined(NO_ASN)
22192219
WOLFSSL_LOCAL int CheckForAltNames(DecodedCert* dCert, const char* domain, word32 domainLen, int* checkCN);
22202220
WOLFSSL_LOCAL int CheckIPAddr(DecodedCert* dCert, const char* ipasc);
22212221
WOLFSSL_LOCAL void CopyDecodedName(WOLFSSL_X509_NAME* name, DecodedCert* dCert, int nameType);
@@ -2675,7 +2675,9 @@ typedef struct ProcPeerCertArgs {
26752675
#ifdef WOLFSSL_TLS13
26762676
buffer* exts; /* extensions */
26772677
#endif
2678+
#ifndef NO_ASN
26782679
DecodedCert* dCert;
2680+
#endif
26792681
word32 idx;
26802682
word32 begin;
26812683
int totalCerts; /* number of certs in certs buffer */
@@ -6201,8 +6203,10 @@ WOLFSSL_API void SSL_ResourceFree(WOLFSSL* ssl); /* Micrium uses */
62016203
int type, WOLFSSL* ssl, int userChain,
62026204
WOLFSSL_CRL* crl, int verify);
62036205

6206+
#ifndef NO_ASN
62046207
WOLFSSL_LOCAL int CheckHostName(DecodedCert* dCert, const char *domainName,
62056208
size_t domainNameLen);
6209+
#endif
62066210
#endif
62076211

62086212

@@ -6614,8 +6618,10 @@ WOLFSSL_LOCAL enum wc_HashType HashAlgoToType(int hashAlgo);
66146618
WOLFSSL_LOCAL void InitX509(WOLFSSL_X509* x509, int dynamicFlag,
66156619
void* heap);
66166620
WOLFSSL_LOCAL void FreeX509(WOLFSSL_X509* x509);
6621+
#ifndef NO_ASN
66176622
WOLFSSL_LOCAL int CopyDecodedToX509(WOLFSSL_X509* x509,
66186623
DecodedCert* dCert);
6624+
#endif
66196625
#endif
66206626

66216627
#if defined(WOLFSSL_ACERT)

0 commit comments

Comments
 (0)