OpenSSL: Fix build with LibreSSL and BoringSSL

The new certificate chain debug dumps used functions that are not
available with LibreSSL or BoringSSL.

Fixes: 857edf4bf4 ("OpenSSL: More debug prints of configured ciphers and certificates")
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-07-13 22:40:50 +03:00
parent 7456cf57d3
commit b8491ae5ac

View file

@ -5137,6 +5137,8 @@ static void openssl_debug_dump_cipher_list(SSL_CTX *ssl_ctx)
} }
#if !defined(LIBRESSL_VERSION_NUMBER) && !defined(BORINGSSL_API_VERSION)
static const char * openssl_pkey_type_str(const EVP_PKEY *pkey) static const char * openssl_pkey_type_str(const EVP_PKEY *pkey)
{ {
if (!pkey) if (!pkey)
@ -5194,9 +5196,12 @@ static void openssl_debug_dump_certificates(SSL_CTX *ssl_ctx)
openssl_debug_dump_certificate(0, SSL_CTX_get0_certificate(ssl_ctx)); openssl_debug_dump_certificate(0, SSL_CTX_get0_certificate(ssl_ctx));
} }
#endif
static void openssl_debug_dump_certificate_chains(SSL_CTX *ssl_ctx) static void openssl_debug_dump_certificate_chains(SSL_CTX *ssl_ctx)
{ {
#if !defined(LIBRESSL_VERSION_NUMBER) && !defined(BORINGSSL_API_VERSION)
int res; int res;
for (res = SSL_CTX_set_current_cert(ssl_ctx, SSL_CERT_SET_FIRST); for (res = SSL_CTX_set_current_cert(ssl_ctx, SSL_CERT_SET_FIRST);
@ -5205,6 +5210,7 @@ static void openssl_debug_dump_certificate_chains(SSL_CTX *ssl_ctx)
openssl_debug_dump_certificates(ssl_ctx); openssl_debug_dump_certificates(ssl_ctx);
SSL_CTX_set_current_cert(ssl_ctx, SSL_CERT_SET_FIRST); SSL_CTX_set_current_cert(ssl_ctx, SSL_CERT_SET_FIRST);
#endif
} }