feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

allow cert_ext to work w/o openssl extra

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

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

2
wolfcrypt/src/asn.c
View File

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

10
wolfssl/wolfcrypt/settings.h
View File

@ -952,6 +952,16 @@ static char *fgets(char *buff, int sz, FILE *fp)
#endif #endif
#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 */ /* Place any other flags or defines here */