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

nghttpx: Update doc

This commit is contained in:
Tatsuhiro Tsujikawa 2016-06-25 23:37:29 +09:00
parent 3e14f0d8a5
commit 97d8bb16e6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shrpx_ssl.cc
View File

@ -1373,10 +1373,10 @@ SSL_CTX *setup_server_ssl_context(std::vector<SSL_CTX *> &all_ssl_ctx,
#if OPENSSL_VERSION_NUMBER >= 0x10002000L #if OPENSSL_VERSION_NUMBER >= 0x10002000L
auto cert = SSL_CTX_get0_certificate(ssl_ctx); auto cert = SSL_CTX_get0_certificate(ssl_ctx);
#else #else // OPENSSL_VERSION_NUMBER < 0x10002000L
auto cert = load_certificate(tlsconf.cert_file.c_str()); auto cert = load_certificate(tlsconf.cert_file.c_str());
auto cert_deleter = defer(X509_free, cert); auto cert_deleter = defer(X509_free, cert);
#endif #endif // OPENSSL_VERSION_NUMBER < 0x10002000L
if (ssl::cert_lookup_tree_add_cert_from_x509( if (ssl::cert_lookup_tree_add_cert_from_x509(
cert_tree, all_ssl_ctx.size() - 1, cert) == -1) { cert_tree, all_ssl_ctx.size() - 1, cert) == -1) {
@ -1399,10 +1399,10 @@ SSL_CTX *setup_server_ssl_context(std::vector<SSL_CTX *> &all_ssl_ctx,
#if OPENSSL_VERSION_NUMBER >= 0x10002000L #if OPENSSL_VERSION_NUMBER >= 0x10002000L
auto cert = SSL_CTX_get0_certificate(ssl_ctx); auto cert = SSL_CTX_get0_certificate(ssl_ctx);
#else #else // OPENSSL_VERSION_NUMBER < 0x10002000L
auto cert = load_certificate(cert_file.c_str()); auto cert = load_certificate(cert_file.c_str());
auto cert_deleter = defer(X509_free, cert); auto cert_deleter = defer(X509_free, cert);
#endif #endif // OPENSSL_VERSION_NUMBER < 0x10002000L
if (ssl::cert_lookup_tree_add_cert_from_x509( if (ssl::cert_lookup_tree_add_cert_from_x509(
cert_tree, all_ssl_ctx.size() - 1, cert) == -1) { cert_tree, all_ssl_ctx.size() - 1, cert) == -1) {