diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-08-09 16:12:03 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-08-09 16:12:03 +0200 |
| commit | 74d0077a820ee09d41dd96e7f2a95e9906be448d (patch) | |
| tree | 0f245072dbb46b04e0bed6f72defe2e50d4c363c | |
| parent | bd1f73ed57d42a01f823709e4cd0127db3e19b50 (diff) | |
| parent | eedb6e5d739d65fb4814e85c24acc0dc66b3cc58 (diff) | |
| download | otp-74d0077a820ee09d41dd96e7f2a95e9906be448d.tar.gz otp-74d0077a820ee09d41dd96e7f2a95e9906be448d.tar.bz2 otp-74d0077a820ee09d41dd96e7f2a95e9906be448d.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 81ef491c40..07ec823829 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -2781,6 +2781,8 @@ ecdsa_signed_suites(Ciphers, Version) -> rsa_keyed(dhe_rsa) -> true; +rsa_keyed(ecdhe_rsa) -> + true; rsa_keyed(rsa) -> true; rsa_keyed(rsa_psk) -> @@ -2844,6 +2846,8 @@ ec_keyed(ecdh_ecdsa) -> true; ec_keyed(ecdh_rsa) -> true; +ec_keyed(ecdhe_ecdsa) -> + true; ec_keyed(_) -> false. diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 91a9c774a6..7202e3662c 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1524,11 +1524,6 @@ v_1_2_check(ecdh_ecdsa, ecdh_rsa) -> true; v_1_2_check(ecdh_rsa, ecdh_ecdsa) -> true; -v_1_2_check(ecdhe_ecdsa, ecdhe_rsa) -> - true; -v_1_2_check(ecdhe_rsa, ecdhe_ecdsa) -> - true; - v_1_2_check(_, _) -> false. |