WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for building `WOLFSSL_CERT_EXT` without `WOLFSSL_CERT_GEN` due to missing `CTC_MAX_EKU_OID_SZ`. Change to allow --enable-certext without certgen.

pull/1758/head
David Garske 2018-08-14 13:01:04 -06:00
parent 64f553d944
commit d1e13a973c
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1207,10 +1207,6 @@ AC_ARG_ENABLE([certext],
if test "$ENABLED_CERTEXT" = "yes" if test "$ENABLED_CERTEXT" = "yes"
then then
if test "$ENABLED_CERTGEN" = "no"
then
AC_MSG_ERROR([cannot enable certext without enabling certgen.])
fi
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_EXT" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_EXT"
fi fi

4
tests/api.c
View File

@ -10076,7 +10076,7 @@ static int test_RsaDecryptBoundsCheck(void)
static int test_wc_SetKeyUsage (void) static int test_wc_SetKeyUsage (void)
{ {
int ret = 0; int ret = 0;
#if !defined(NO_RSA) && defined(WOLFSSL_CERT_EXT) && !defined(HAVE_FIPS) #if !defined(NO_RSA) && defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_CERT_GEN) && !defined(HAVE_FIPS)
Cert myCert; Cert myCert;
ret = wc_InitCert(&myCert); ret = wc_InitCert(&myCert);
@ -18217,7 +18217,7 @@ static void test_wolfSSL_d2i_PrivateKeys_bio(void)
EVP_PKEY* pkey = NULL; EVP_PKEY* pkey = NULL;
RSA* rsa = NULL; RSA* rsa = NULL;
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
#if defined(WOLFSSL_KEY_GEN) #if defined(WOLFSSL_KEY_GEN)
unsigned char buffer[4096]; unsigned char buffer[4096];
unsigned char* bufPtr; unsigned char* bufPtr;

2
wolfcrypt/test/test.c
View File

@ -8510,7 +8510,7 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#ifndef NO_RSA #ifndef NO_RSA
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #ifdef WOLFSSL_CERT_GEN
static const char* otherCertDerFile = CERT_PREFIX "othercert.der"; static const char* otherCertDerFile = CERT_PREFIX "othercert.der";
static const char* certDerFile = CERT_PREFIX "cert.der"; static const char* certDerFile = CERT_PREFIX "cert.der";
#endif #endif

5
wolfssl/wolfcrypt/asn_public.h
View File

@ -158,8 +158,7 @@ typedef struct EncryptedInfo {
} EncryptedInfo; } EncryptedInfo;
#ifdef WOLFSSL_CERT_GEN #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
#ifdef WOLFSSL_EKU_OID #ifdef WOLFSSL_EKU_OID
#ifndef CTC_MAX_EKU_NB #ifndef CTC_MAX_EKU_NB
#define CTC_MAX_EKU_NB 1 #define CTC_MAX_EKU_NB 1
@ -171,7 +170,9 @@ typedef struct EncryptedInfo {
#undef CTC_MAX_EKU_OID_SZ #undef CTC_MAX_EKU_OID_SZ
#define CTC_MAX_EKU_OID_SZ 0 #define CTC_MAX_EKU_OID_SZ 0
#endif #endif
#endif /* WOLFSSL_CERT_GEN || WOLFSSL_CERT_EXT */
#ifdef WOLFSSL_CERT_GEN
#ifdef WOLFSSL_MULTI_ATTRIB #ifdef WOLFSSL_MULTI_ATTRIB
#ifndef CTC_MAX_ATTRIB #ifndef CTC_MAX_ATTRIB