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

nghttpx: Use ImmutableString for ciphers

This commit is contained in:
Tatsuhiro Tsujikawa 2016-02-14 21:25:24 +09:00
parent 2344932b45
commit 67804cfc8c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shrpx_config.cc
View File

@ -1804,7 +1804,7 @@ int parse_config(const char *opt, const char *optarg,
return 0; return 0;
} }
case SHRPX_OPTID_CIPHERS: case SHRPX_OPTID_CIPHERS:
mod_config()->tls.ciphers = strcopy(optarg); mod_config()->tls.ciphers = optarg;
return 0; return 0;
case SHRPX_OPTID_CLIENT: case SHRPX_OPTID_CLIENT:

2
src/shrpx_config.h
View File

@ -430,7 +430,7 @@ struct TLSConfig {
ImmutableString private_key_passwd; ImmutableString private_key_passwd;
ImmutableString cert_file; ImmutableString cert_file;
ImmutableString dh_param_file; ImmutableString dh_param_file;
std::unique_ptr<char[]> ciphers; ImmutableString ciphers;
ImmutableString cacert; ImmutableString cacert;
bool insecure; bool insecure;
bool no_http2_cipher_black_list; bool no_http2_cipher_black_list;

8
src/shrpx_ssl.cc
View File

@ -493,8 +493,8 @@ SSL_CTX *create_ssl_context(const char *private_key_file, const char *cert_file
SSL_CTX_set_timeout(ssl_ctx, tlsconf.session_timeout.count()); SSL_CTX_set_timeout(ssl_ctx, tlsconf.session_timeout.count());
const char *ciphers; const char *ciphers;
if (tlsconf.ciphers) { if (!tlsconf.ciphers.empty()) {
ciphers = tlsconf.ciphers.get(); ciphers = tlsconf.ciphers.c_str();
} else { } else {
ciphers = nghttp2::ssl::DEFAULT_CIPHER_LIST; ciphers = nghttp2::ssl::DEFAULT_CIPHER_LIST;
} }
@ -683,8 +683,8 @@ SSL_CTX *create_ssl_client_context(
SSL_CTX_set_options(ssl_ctx, ssl_opts | tlsconf.tls_proto_mask); SSL_CTX_set_options(ssl_ctx, ssl_opts | tlsconf.tls_proto_mask);
const char *ciphers; const char *ciphers;
if (tlsconf.ciphers) { if (!tlsconf.ciphers.empty()) {
ciphers = tlsconf.ciphers.get(); ciphers = tlsconf.ciphers.c_str();
} else { } else {
ciphers = nghttp2::ssl::DEFAULT_CIPHER_LIST; ciphers = nghttp2::ssl::DEFAULT_CIPHER_LIST;
} }