diff options
| author | Sverker Eriksson <[email protected]> | 2016-02-08 18:48:42 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-02-08 18:48:42 +0100 |
| commit | 8edd580904f284123a56547efc5b43d5d35664e3 (patch) | |
| tree | d448c238c75e4b8395a3ef3c8113566b829d4083 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 6392637b184ac3172c61025889f3087e5739bb72 (diff) | |
| parent | 3c56cb7a4c3bcb8a089c0b83375aad46c010a9b7 (diff) | |
| download | otp-8edd580904f284123a56547efc5b43d5d35664e3.tar.gz otp-8edd580904f284123a56547efc5b43d5d35664e3.tar.bz2 otp-8edd580904f284123a56547efc5b43d5d35664e3.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 77c29668b5..afd21f0d2f 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -818,7 +818,17 @@ rsa_suites(CounterPart) -> (_) -> false end, - ssl:cipher_suites()). + common_ciphers(CounterPart)). + +common_ciphers(crypto) -> + ssl:cipher_suites(); +common_ciphers(openssl) -> + OpenSslSuites = + string:tokens(string:strip(os:cmd("openssl ciphers"), right, $\n), ":"), + [ssl:suite_definition(S) + || S <- ssl_cipher:suites(tls_record:highest_protocol_version([])), + lists:member(ssl_cipher:openssl_suite_name(S), OpenSslSuites) + ]. rsa_non_signed_suites() -> lists:filter(fun({rsa, _, _}) -> |