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

account for pwdbased being enabled with x509small

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-02-19 15:41:07 -07:00
parent 33b699f81a
commit a275022dbe
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ssl.c
View File

@ -4897,8 +4897,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
return 0; return 0;
} }
#if (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) || \ #if (defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)) && !defined(NO_PWDBASED)
defined(HAVE_WEBSERVER)) && !defined(NO_PWDBASED)
if (encrypted_key || header == BEGIN_ENC_PRIV_KEY) { if (encrypted_key || header == BEGIN_ENC_PRIV_KEY) {
int passwordSz; int passwordSz;
#ifdef WOLFSSL_SMALL_STACK #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 || #endif /* OPENSSL_EXTRA || HAVE_WEBSERVER || NO_PWDBASED */
NO_PWDBASED */
return 0; return 0;
} }