diff options
Diffstat (limited to 'lib/ssl/src/tls_v1.erl')
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 20 | 
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index 7f24ce5192..f52ee06e71 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -204,21 +204,21 @@ suites(Minor) when Minor == 1; Minor == 2 ->        ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,        ?TLS_RSA_WITH_AES_256_CBC_SHA, -      ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, -      ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, -      ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA, -      ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA, -      ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA, -      ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, -      ?TLS_RSA_WITH_3DES_EDE_CBC_SHA, -        ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,        ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,        ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,        ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,        ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,        ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, -      ?TLS_RSA_WITH_AES_128_CBC_SHA +      ?TLS_RSA_WITH_AES_128_CBC_SHA, + +      ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, +      ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, +      ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA, +      ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA, +      ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA, +      ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, +      ?TLS_RSA_WITH_3DES_EDE_CBC_SHA      ];  suites(3) ->      [ @@ -407,7 +407,7 @@ is_pair(Hash, rsa, Hashs) ->      AtLeastMd5 = Hashs -- [md2,md4],      lists:member(Hash, AtLeastMd5). -%% list ECC curves in prefered order +%% list ECC curves in preferred order  -spec ecc_curves(1..3 | all) -> [named_curve()].  ecc_curves(all) ->      [sect571r1,sect571k1,secp521r1,brainpoolP512r1,  | 
