aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-07-26 20:49:24 -0700
committerSteven Fackler <[email protected]>2017-07-26 20:49:24 -0700
commit8fa9b58743bb73dacd5ccff6920042ab148475aa (patch)
treeb16d1f153a1e73e3aa485164d7dd2b629cdef31b /openssl/src
parentInitialize OpenSSL in DSA constructor (diff)
downloadrust-openssl-8fa9b58743bb73dacd5ccff6920042ab148475aa.tar.xz
rust-openssl-8fa9b58743bb73dacd5ccff6920042ab148475aa.zip
Tweak formatting on cipher list
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/ssl/connector.rs31
1 files changed, 13 insertions, 18 deletions
diff --git a/openssl/src/ssl/connector.rs b/openssl/src/ssl/connector.rs
index 969ad396..6469c59e 100644
--- a/openssl/src/ssl/connector.rs
+++ b/openssl/src/ssl/connector.rs
@@ -222,20 +222,16 @@ impl SslAcceptorBuilder {
try!(setup_curves(&mut ctx));
try!(ctx.set_cipher_list(
"ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:\
- ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:\
- ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:\
- DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:\
- ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:\
- ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:\
- ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:\
- ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:\
- DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:\
- DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:\
- ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:\
- EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:\
- AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:\
- DES-CBC3-SHA:!DSS",
- ));
+ ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:\
+ ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:\
+ DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:\
+ ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:\
+ ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:\
+ ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:\
+ DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:\
+ EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:\
+ AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS",
+ ));
Ok(SslAcceptorBuilder(ctx))
}
@@ -245,10 +241,9 @@ impl SslAcceptorBuilder {
try!(setup_curves(&mut ctx));
try!(ctx.set_cipher_list(
"ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:\
- ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:\
- ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:\
- ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:\
- ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256",
+ ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:\
+ ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:\
+ ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256",
));
Ok(SslAcceptorBuilder(ctx))
}