walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'dalf-boringssl'

This commit is contained in:
Tatsuhiro Tsujikawa 2016-10-28 00:06:06 +09:00
parent 65739fe754 d448eb54f9
commit 4b45906f46
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shrpx_ssl.cc
View 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.