Merge pull request #3512 from dgarske/openssl_pem

Fix for missing `wolfSSL_PEM_write_bio_PrivateKey` with WebRTC
This commit is contained in:
toddouska
2020-11-18 16:17:46 -08:00
committed by GitHub

View File

@@ -31889,10 +31889,8 @@ static int wolfSSL_RSA_To_Der(WOLFSSL_RSA* rsa, byte** outBuf, int publicKey)
} }
#endif #endif
#if defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN)
#ifndef NO_BIO #ifndef NO_BIO
#if (defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL)) && !defined(NO_RSA) #if (defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL)) && !defined(NO_RSA)
/* Takes a WOLFSSL_RSA key and writes it out to a WOLFSSL_BIO /* Takes a WOLFSSL_RSA key and writes it out to a WOLFSSL_BIO
* *
* bio the WOLFSSL_BIO to write to * bio the WOLFSSL_BIO to write to
@@ -32176,7 +32174,6 @@ int wolfSSL_PEM_write_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key,
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* !NO_BIO */ #endif /* !NO_BIO */
#endif /* defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) */
#if (defined(WOLFSSL_KEY_GEN) && !defined(NO_RSA) && !defined(HAVE_USER_RSA)) && \ #if (defined(WOLFSSL_KEY_GEN) && !defined(NO_RSA) && !defined(HAVE_USER_RSA)) && \
(defined(WOLFSSL_PEM_TO_DER) || defined(WOLFSSL_DER_TO_PEM)) (defined(WOLFSSL_PEM_TO_DER) || defined(WOLFSSL_DER_TO_PEM))