diff options
| author | Erlang/OTP <[email protected]> | 2018-08-23 14:47:10 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-08-23 14:47:10 +0200 |
| commit | 69373026d4440afa0d877e4296a027d781771dfc (patch) | |
| tree | aa6fcf6a97f746410839202f98125a966f3b8130 | |
| parent | e37eec271ad08a6689e358071eeb800674cde938 (diff) | |
| parent | b42b08abffa0290f240673909032abbb9b57f97c (diff) | |
| download | otp-69373026d4440afa0d877e4296a027d781771dfc.tar.gz otp-69373026d4440afa0d877e4296a027d781771dfc.tar.bz2 otp-69373026d4440afa0d877e4296a027d781771dfc.zip | |
Merge branch 'ingela/ssl/maint-21/ECC/ERIERL-210/OTP-15203' into maint-21
* ingela/ssl/maint-21/ECC/ERIERL-210/OTP-15203:
ssl: Prepare for release
ssl: Make sure that a correct cipher suite is selected
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 4 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index bfdd0c205b..ae4d60b6ed 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,6 +1,7 @@ %% -*- erlang -*- {"%VSN%", - [ +[ + {<<"9\\..*">>, [{restart_application, ssl}]}, {<<"8\\..*">>, [{restart_application, ssl}]}, {<<"7\\..*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, @@ -9,6 +10,7 @@ {<<"3\\..*">>, [{restart_application, ssl}]} ], [ + {<<"9\\..*">>, [{restart_application, ssl}]}, {<<"8\\..*">>, [{restart_application, ssl}]}, {<<"7\\..*">>, [{restart_application, ssl}]}, {<<"6\\..*">>, [{restart_application, ssl}]}, diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 754fc46404..ebdc624ec7 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -2775,6 +2775,8 @@ ecdsa_signed_suites(Ciphers, Version) -> rsa_keyed(dhe_rsa) -> true; +rsa_keyed(ecdhe_rsa) -> + true; rsa_keyed(rsa) -> true; rsa_keyed(rsa_psk) -> @@ -2838,6 +2840,8 @@ ec_keyed(ecdh_ecdsa) -> true; ec_keyed(ecdh_rsa) -> true; +ec_keyed(ecdhe_ecdsa) -> + true; ec_keyed(_) -> false. diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 10be907b4f..5be527306d 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 9.0 +SSL_VSN = 9.0.1 |