wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7598 from JacobBarthelmeh/x509

Browse Source 
fix typo with NO_CERTS macro
This commit is contained in:
David Garske
2024-05-30 09:59:37 -07:00
committed by GitHub
parent 3e9f656ac3 34ca03770f
commit 61fea768b3
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/configs/user_settings_wolfboot_keytools.h
View File

@ -86,7 +86,7 @@
#define NO_RABBIT #define NO_RABBIT
#define NO_MD5 #define NO_MD5
#define NO_SIG_WRAPPER #define NO_SIG_WRAPPER
#define NO_CERT #define NO_CERTS
#define NO_SESSION_CACHE #define NO_SESSION_CACHE
#define NO_HC128 #define NO_HC128
#define NO_DES3 #define NO_DES3

2
src/ssl.c
View File

@ -23273,7 +23273,7 @@ wolfSSL_CTX_keylog_cb_func wolfSSL_CTX_get_keylog_callback(
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
#ifndef NO_CERT #ifndef NO_CERTS
#define WOLFSSL_X509_INCLUDED #define WOLFSSL_X509_INCLUDED
#include "src/x509.c" #include "src/x509.c"
#endif #endif

2
src/x509.c
View File

@ -14583,7 +14583,7 @@ void wolfSSL_X509_ATTRIBUTE_free(WOLFSSL_X509_ATTRIBUTE* attr)
} }
#endif #endif
#endif /* !NO_CERT */ #endif /* !NO_CERTS */
#endif /* !WOLFCRYPT_ONLY */ #endif /* !WOLFCRYPT_ONLY */

4
wolfcrypt/src/asn.c
View File

@ -3534,7 +3534,7 @@ int CheckBitString(const byte* input, word32* inOutIdx, int* len,
((defined(HAVE_ED25519) || defined(HAVE_ED448)) && \ ((defined(HAVE_ED25519) || defined(HAVE_ED448)) && \
(defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN) || \ (defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN) || \
defined(OPENSSL_EXTRA))) || \ defined(OPENSSL_EXTRA))) || \
(defined(WC_ENABLE_ASYM_KEY_EXPORT) && !defined(NO_CERT)) || \ (defined(WC_ENABLE_ASYM_KEY_EXPORT) && !defined(NO_CERTS)) || \
(!defined(NO_DSA) && !defined(HAVE_SELFTEST) && defined(WOLFSSL_KEY_GEN)) || \ (!defined(NO_DSA) && !defined(HAVE_SELFTEST) && defined(WOLFSSL_KEY_GEN)) || \
(!defined(NO_DH) && defined(WOLFSSL_DH_EXTRA)) (!defined(NO_DH) && defined(WOLFSSL_DH_EXTRA))
@ -26112,6 +26112,7 @@ int wc_RsaKeyToPublicDer_ex(RsaKey* key, byte* output, word32 inLen,
#endif /* !NO_RSA && (WOLFSSL_CERT_GEN || WOLFSSL_KCAPI_RSA || #endif /* !NO_RSA && (WOLFSSL_CERT_GEN || WOLFSSL_KCAPI_RSA ||
((OPENSSL_EXTRA || WOLFSSL_KEY_GEN))) */ ((OPENSSL_EXTRA || WOLFSSL_KEY_GEN))) */
#endif /* NO_CERTS */
#if (defined(WOLFSSL_KEY_GEN) || defined(OPENSSL_EXTRA) || \ #if (defined(WOLFSSL_KEY_GEN) || defined(OPENSSL_EXTRA) || \
defined(WOLFSSL_KCAPI_RSA) || defined(WOLFSSL_SE050)) && \ defined(WOLFSSL_KCAPI_RSA) || defined(WOLFSSL_SE050)) && \
@ -26282,6 +26283,7 @@ int wc_RsaKeyToDer(RsaKey* key, byte* output, word32 inLen)
#endif /* (WOLFSSL_KEY_GEN || OPENSSL_EXTRA) && !NO_RSA */ #endif /* (WOLFSSL_KEY_GEN || OPENSSL_EXTRA) && !NO_RSA */
#ifndef NO_CERTS
#ifdef WOLFSSL_CERT_GEN #ifdef WOLFSSL_CERT_GEN