Skip to content

N
nghttp2
Commit 4b45906f authored by Tatsuhiro Tsujikawa's avatar Tatsuhiro Tsujikawa
Browse files
Options

Merge branch 'dalf-boringssl'

parents 65739fe7 d448eb54
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/shrpx_ssl.cc
View file @ 4b45906f
...@@ -608,11 +608,11 @@ SSL_CTX *create_ssl_context(const char *private_key_file, const char *cert_file, ...@@ -608,11 +608,11 @@ SSL_CTX *create_ssl_context(const char *private_key_file, const char *cert_file,
<< " failed"; << " failed";
DIE(); DIE();
} }
#if !OPENSSL_1_1_API #if !defined(OPENSSL_IS_BORINGSSL) && !OPENSSL_1_1_API
// It looks like we need this function call for OpenSSL 1.0.2. This // It looks like we need this function call for OpenSSL 1.0.2. This
// function was deprecated in OpenSSL 1.1.0. // function was deprecated in OpenSSL 1.1.0 and BoringSSL.
SSL_CTX_set_ecdh_auto(ssl_ctx, 1); SSL_CTX_set_ecdh_auto(ssl_ctx, 1);
#endif // !OPENSSL_1_1_API #endif // !defined(OPENSSL_IS_BORINGSSL) && !OPENSSL_1_1_API
#else // LIBRESSL_IN_USE || OPENSSL_VERSION_NUBMER < 0x10002000L #else // LIBRESSL_IN_USE || OPENSSL_VERSION_NUBMER < 0x10002000L
// Use P-256, which is sufficiently secure at the time of this // Use P-256, which is sufficiently secure at the time of this
// writing. // writing.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment