allow cert_ext to work w/o openssl extra

This commit is contained in:
toddouska
2015-09-08 16:44:13 -07:00
parent 2f70f27adc
commit 108679970a
3 changed files with 12 additions and 2 deletions

View File

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

View File

@ -7987,7 +7987,7 @@ int wc_EccPublicKeyDecode(const byte* input, word32* inOutIdx,
if (GetSequence(input, inOutIdx, &length, inSz) < 0)
return ASN_PARSE_E;
#if defined(OPENSSL_EXTRA)
#if defined(OPENSSL_EXTRA) || defined(ECC_DECODE_EXTRA)
{
byte b = input[*inOutIdx];
if (b != ASN_INTEGER) {

View File

@ -952,6 +952,16 @@ static char *fgets(char *buff, int sz, FILE *fp)
#endif
#endif
/* Certificate Request Extensions needs decode extras */
#ifdef WOLFSSL_CERT_EXT
#ifndef RSA_DECODE_EXTRA
#define RSA_DECODE_EXTRA
#endif
#ifndef ECC_DECODE_EXTRA
#define ECC_DECODE_EXTRA
#endif
#endif
/* Place any other flags or defines here */