diff options
| author | Erlang/OTP <[email protected]> | 2018-08-09 17:28:30 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-08-09 17:28:30 +0200 |
| commit | dc4853b3073115c922d22d2a436c1f67840bd2f0 (patch) | |
| tree | d0e1dade3d70cb3685a0887900f2957112e5a23b /lib/ssl/test | |
| parent | 9d915e1b21f55d7efdd0e2b14b642ad3f4aadf90 (diff) | |
| parent | 1e82b6329a8b53467453aba1ec52309094ab489d (diff) | |
| download | otp-dc4853b3073115c922d22d2a436c1f67840bd2f0.tar.gz otp-dc4853b3073115c922d22d2a436c1f67840bd2f0.tar.bz2 otp-dc4853b3073115c922d22d2a436c1f67840bd2f0.zip | |
Merge branch 'ingela/ssl/ECC/ERIERL-210/OTP-15203' into maint-20
* ingela/ssl/ECC/ERIERL-210/OTP-15203:
ssl: Make sure that a correct cipher suite is selected
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index ed02b795ab..3e6c5e8b8a 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1417,11 +1417,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. |