diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-02-22 10:50:16 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-02-22 10:50:16 +0100 |
| commit | 2c370def9ddbc34efb16f5dbe8064350c140183a (patch) | |
| tree | 1da495d78ab240ad11f8427cdad3f1153406ac22 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 942aa912cd1f17a7a98fd98f9d39a1374bbac44d (diff) | |
| parent | 89d7e21cf4ae988c57c8ef047bfe85127875c70c (diff) | |
| download | otp-2c370def9ddbc34efb16f5dbe8064350c140183a.tar.gz otp-2c370def9ddbc34efb16f5dbe8064350c140183a.tar.bz2 otp-2c370def9ddbc34efb16f5dbe8064350c140183a.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 2686dfc1a1..b0495cb5ac 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -825,7 +825,7 @@ common_ciphers(crypto) -> common_ciphers(openssl) -> OpenSslSuites = string:tokens(string:strip(os:cmd("openssl ciphers"), right, $\n), ":"), - [ssl:suite_definition(S) + [ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:suites(tls_record:highest_protocol_version([])), lists:member(ssl_cipher:openssl_suite_name(S), OpenSslSuites) ]. @@ -1228,7 +1228,7 @@ filter_suites(Ciphers0) -> ++ ssl_cipher:srp_suites() ++ ssl_cipher:rc4_suites(Version), Supported1 = ssl_cipher:filter_suites(Supported0), - Supported2 = [ssl:suite_definition(S) || S <- Supported1], + Supported2 = [ssl_cipher:erl_suite_definition(S) || S <- Supported1], [Cipher || Cipher <- Ciphers0, lists:member(Cipher, Supported2)]. -define(OPENSSL_QUIT, "Q\n"). |