From a275022dbef3883d2b7ca243d06d854bb5b51ef9 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Mon, 19 Feb 2018 15:41:07 -0700
Subject: [PATCH] account for pwdbased being enabled with x509small

---
 src/ssl.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index fb1dfe657..53f905de0 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -4897,8 +4897,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
         return 0;
     }
 
-#if (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) || \
-        defined(HAVE_WEBSERVER)) && !defined(NO_PWDBASED)
+#if (defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)) && !defined(NO_PWDBASED)
     if (encrypted_key || header == BEGIN_ENC_PRIV_KEY) {
         int   passwordSz;
     #ifdef WOLFSSL_SMALL_STACK
@@ -4942,8 +4941,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
             }
         }
     }
-#endif  /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL || HAVE_WEBSERVER ||
-           NO_PWDBASED */
+#endif  /* OPENSSL_EXTRA || HAVE_WEBSERVER || NO_PWDBASED */
 
     return 0;
 }