nghttpx: Update cipher suite list
This commit is contained in:
parent
133c3d66be
commit
2bfa772472
|
@ -57,6 +57,12 @@ namespace shrpx {
|
||||||
|
|
||||||
namespace ssl {
|
namespace ssl {
|
||||||
|
|
||||||
|
// Recommended general purpose "Non-Backward Compatible" cipher by
|
||||||
|
// mozilla.
|
||||||
|
//
|
||||||
|
// https://wiki.mozilla.org/Security/Server_Side_TLS
|
||||||
|
#define DEFAULT_CIPHER_LIST "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK"
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len,
|
int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len,
|
||||||
void *arg)
|
void *arg)
|
||||||
|
@ -243,9 +249,7 @@ SSL_CTX* create_ssl_context(const char *private_key_file,
|
||||||
if(get_config()->ciphers) {
|
if(get_config()->ciphers) {
|
||||||
ciphers = get_config()->ciphers.get();
|
ciphers = get_config()->ciphers.get();
|
||||||
} else {
|
} else {
|
||||||
// Recommended general purpose cipher by mozilla.
|
ciphers = DEFAULT_CIPHER_LIST;
|
||||||
// https://wiki.mozilla.org/Security/Server_Side_TLS
|
|
||||||
ciphers = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA:AES128:AES256:RC4-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SSL_CTX_set_options(ssl_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
|
SSL_CTX_set_options(ssl_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
|
||||||
|
@ -392,7 +396,7 @@ SSL_CTX* create_ssl_client_context()
|
||||||
if(get_config()->ciphers) {
|
if(get_config()->ciphers) {
|
||||||
ciphers = get_config()->ciphers.get();
|
ciphers = get_config()->ciphers.get();
|
||||||
} else {
|
} else {
|
||||||
ciphers = "HIGH:!aNULL:!eNULL";
|
ciphers = "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK";
|
||||||
}
|
}
|
||||||
if(SSL_CTX_set_cipher_list(ssl_ctx, ciphers) == 0) {
|
if(SSL_CTX_set_cipher_list(ssl_ctx, ciphers) == 0) {
|
||||||
LOG(FATAL) << "SSL_CTX_set_cipher_list " << ciphers << " failed: "
|
LOG(FATAL) << "SSL_CTX_set_cipher_list " << ciphers << " failed: "
|
||||||
|
|
Loading…
Reference in New Issue