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

src: OpenSSL 1.1.0 does not require explicit initialization

This commit is contained in:
Tatsuhiro Tsujikawa 2017-03-05 19:57:06 +09:00
parent dc7c12d474
commit 62dd1f5177
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl.cc
View File

@ -152,15 +152,17 @@ bool check_http2_requirement(SSL *ssl) {
} }
void libssl_init() { void libssl_init() {
// OPENSSL_config() is not available in BoringSSL. It is also #if OPENSSL_1_1_API
// deprecated as of OpenSSL 1.1.0. // No explicit initialization is required.
#if !defined(OPENSSL_IS_BORINGSSL) && !OPENSSL_1_1_API #else // !OPENSSL_1_1_API
// OPENSSL_config() is not available in BoringSSL.
#if !defined(OPENSSL_IS_BORINGSSL)
OPENSSL_config(nullptr); OPENSSL_config(nullptr);
#endif // !defined(OPENSSL_IS_BORINGSSL) && !OPENSSL_1_1_API #endif // !defined(OPENSSL_IS_BORINGSSL)
SSL_load_error_strings(); SSL_load_error_strings();
SSL_library_init(); SSL_library_init();
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
#endif // !OPENSSL_1_1_API
} }
int ssl_ctx_set_proto_versions(SSL_CTX *ssl_ctx, int min, int max) { int ssl_ctx_set_proto_versions(SSL_CTX *ssl_ctx, int min, int max) {