From 82796d4b4cb86502a6932a3a5488b7de0ea9896b Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Fri, 19 Apr 2019 15:15:02 -0600
Subject: [PATCH] remove pubKeyX509 from WOLFSSL_X509 structure

---
 src/ssl.c          | 83 ++++++++++++++++++++++++----------------------
 wolfssl/internal.h |  5 ---
 2 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index d522311bc..06be33f0d 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -15375,56 +15375,59 @@ WOLFSSL_X509* wolfSSL_X509_d2i(WOLFSSL_X509** x509, const byte* in, int len)
     int wolfSSL_X509_get_pubkey_buffer(WOLFSSL_X509* x509,
                                                 unsigned char* buf, int* bufSz)
     {
+    #ifdef WOLFSSL_SMALL_STACK
+        DecodedCert* cert;
+    #else
+        DecodedCert cert[1];
+    #endif
+        word32 idx;
+        const byte*  der;
+        int length = 0;
+        int    ret, derSz = 0;
+        int badDate = 0;
+        const byte* pubKeyX509;
+        int   pubKeyX509Sz;
+
         WOLFSSL_ENTER("wolfSSL_X509_get_pubkey_buffer");
-        if (x509 == NULL || bufSz == NULL)
+        if (x509 == NULL || bufSz == NULL) {
+            WOLFSSL_LEAVE("wolfSSL_X509_get_pubkey_buffer", BAD_FUNC_ARG);
             return WOLFSSL_FATAL_ERROR;
+        }
 
-        /* get pointer into DER for X.509 public key */
-        if (x509->pubKeyX509 == NULL) {
-        #ifdef WOLFSSL_SMALL_STACK
-            DecodedCert* cert;
-        #else
-            DecodedCert cert[1];
-        #endif
-            word32 idx;
-            const byte*  der;
-            int length = 0;
-            int    ret, derSz = 0;
-            int badDate = 0;
 
-        #ifdef WOLFSSL_SMALL_STACK
-            cert = (DecodedCert*)XMALLOC(sizeof(DecodedCert),
-                                           x509->heap, DYNAMIC_TYPE_TMP_BUFFER);
-            if (decoded == NULL)
-                return MEMORY_E;
-        #endif
+    #ifdef WOLFSSL_SMALL_STACK
+        cert = (DecodedCert*)XMALLOC(sizeof(DecodedCert),
+                                       x509->heap, DYNAMIC_TYPE_TMP_BUFFER);
+        if (cert == NULL) {
+            WOLFSSL_LEAVE("wolfSSL_X509_get_pubkey_buffer", MEMORY_E);
+            return WOLFSSL_FATAL_ERROR;
+        }
+    #endif
 
-            der = wolfSSL_X509_get_der(x509, &derSz);
-            InitDecodedCert(cert, der, derSz, NULL);
-            ret = wc_GetPubX509(cert, 0, &badDate);
-            if (ret >= 0) {
-                idx = cert->srcIdx;
-                x509->pubKeyX509 = cert->source + cert->srcIdx;
-                ret = GetSequence(cert->source, &cert->srcIdx, &length,
-                        cert->maxIdx);
-                x509->pubKeyX509Sz = length + (cert->srcIdx - idx);
-            }
+        der = wolfSSL_X509_get_der(x509, &derSz);
+        InitDecodedCert(cert, der, derSz, NULL);
+        ret = wc_GetPubX509(cert, 0, &badDate);
+        if (ret >= 0) {
+            idx = cert->srcIdx;
+            pubKeyX509 = cert->source + cert->srcIdx;
+            ret = GetSequence(cert->source, &cert->srcIdx, &length,
+                    cert->maxIdx);
+            pubKeyX509Sz = length + (cert->srcIdx - idx);
+        }
 
-            FreeDecodedCert(cert);
-        #ifdef WOLFSSL_SMALL_STACK
-            XFREE(cert, x509->heap, DYNAMIC_TYPE_TMP_BUFFER);
-        #endif
+        FreeDecodedCert(cert);
+    #ifdef WOLFSSL_SMALL_STACK
+        XFREE(cert, x509->heap, DYNAMIC_TYPE_TMP_BUFFER);
+    #endif
 
-            if (ret < 0) {
-                x509->pubKeyX509   = NULL;
-                x509->pubKeyX509Sz = 0;
-                return ret;
-            }
+        if (ret < 0) {
+            WOLFSSL_LEAVE("wolfSSL_X509_get_pubkey_buffer", ret);
+            return WOLFSSL_FATAL_ERROR;
         }
 
         if (buf != NULL)
-            XMEMCPY(buf, x509->pubKeyX509, x509->pubKeyX509Sz);
-        *bufSz = x509->pubKeyX509Sz;
+            XMEMCPY(buf, pubKeyX509, pubKeyX509Sz);
+        *bufSz = pubKeyX509Sz;
 
         return WOLFSSL_SUCCESS;
     }
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index 4eca1fb6a..c657f299c 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -3417,11 +3417,6 @@ struct WOLFSSL_X509 {
     DNS_entry*       altNames;                       /* alt names list */
     buffer           pubKey;
     int              pubKeyOID;
-#ifdef OPENSSL_EXTRA
-    const byte*      pubKeyX509;    /* pointer to internal X509 for where X.509
-                                     * format key starts */
-    int              pubKeyX509Sz;
-#endif
     DNS_entry*       altNamesNext;                   /* hint for retrieval */
     #if defined(HAVE_ECC) || defined(HAVE_ED25519)
         word32       pkCurveOID;