diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-06-14 08:46:24 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-06-14 08:46:24 +0200 |
| commit | 6d24188417dd1eb1dd663c472e64a222be59f8a9 (patch) | |
| tree | da5ed44917388a9969acaf6a3d5ee15143fd6921 | |
| parent | e80ce8436cbc754221c40c04702c317e9779fd79 (diff) | |
| parent | 7a5071b59e04dfd4710ccd2f37e0d51deaa03e25 (diff) | |
| download | otp-6d24188417dd1eb1dd663c472e64a222be59f8a9.tar.gz otp-6d24188417dd1eb1dd663c472e64a222be59f8a9.tar.bz2 otp-6d24188417dd1eb1dd663c472e64a222be59f8a9.zip | |
Merge branch 'ingela/ssl/test-ecdh-check'
* ingela/ssl/test-ecdh-check:
ssl: Update interop conditions
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 1e88ca15de..97cfc4bb71 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1170,13 +1170,13 @@ rsa_suites(CounterPart) -> lists:member(cipher_atom(Cipher), Ciphers); ({ecdhe_rsa, Cipher, _}) when ECC == true -> lists:member(cipher_atom(Cipher), Ciphers); + ({ecdhe_rsa, Cipher, _,_}) when ECC == true -> + lists:member(cipher_atom(Cipher), Ciphers); ({rsa, Cipher, _, _}) -> lists:member(cipher_atom(Cipher), Ciphers); ({dhe_rsa, Cipher, _,_}) -> lists:member(cipher_atom(Cipher), Ciphers); - ({ecdhe_rsa, Cipher, _,_}) when ECC == true -> - lists:member(cipher_atom(Cipher), Ciphers); - (_) -> + (_) -> false end, common_ciphers(CounterPart)). @@ -1530,7 +1530,7 @@ is_sane_ecc(crypto) -> true end; is_sane_ecc(_) -> - true. + sufficient_crypto_support(cipher_ec). is_fips(openssl) -> VersionStr = os:cmd("openssl version"), @@ -1601,11 +1601,7 @@ openssl_sane_dtls() -> false; "OpenSSL 1.0.2k-freebsd" ++ _ -> false; - "OpenSSL 1.0.2d" ++ _ -> - false; - "OpenSSL 1.0.2n" ++ _ -> - false; - "OpenSSL 1.0.2m" ++ _ -> + "OpenSSL 1.0.2" ++ _ -> false; "OpenSSL 1.0.0" ++ _ -> false; |