From 108679970a2611875bce4895921e7ddf330cf51c Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Tue, 8 Sep 2015 16:44:13 -0700
Subject: [PATCH] allow cert_ext to work w/o openssl extra

---
 configure.ac                 |  2 +-
 wolfcrypt/src/asn.c          |  2 +-
 wolfssl/wolfcrypt/settings.h | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d094b0fa2..7bf8e1922 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index fabd3849e..d24b9bcda 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -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) {
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 488627ede..1421b73fc 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -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 */