diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-05-23 08:32:41 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-05-23 08:32:41 +0200 |
| commit | e30436394466007826456fa8dfc802c16bcfbdbb (patch) | |
| tree | a793448753ac2bcdf598af4dd726f4cc8cb3b065 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 9c8fd09de0f7132faa06375f5fd35431c5027866 (diff) | |
| parent | 8aa37e9a7a086076368b26ca9517dfe6bb86732b (diff) | |
| download | otp-e30436394466007826456fa8dfc802c16bcfbdbb.tar.gz otp-e30436394466007826456fa8dfc802c16bcfbdbb.tar.bz2 otp-e30436394466007826456fa8dfc802c16bcfbdbb.zip | |
Merge branch 'ingela/ssl/openssl-test-cuddle'
* ingela/ssl/openssl-test-cuddle:
ssl: anon test should use dh or ecdh anon keyexchange
ssl: Cuddle no delivery guarantee at application level
ssl: Cuddle timeout
ssl: Correct option handling to OpenSSL
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 8c27571d64..1e88ca15de 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1264,8 +1264,16 @@ string_regex_filter(Str, Search) when is_list(Str) -> string_regex_filter(_Str, _Search) -> false. -anonymous_suites(Version) -> - ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:anonymous_suites(Version)],[]). +ecdh_dh_anonymous_suites(Version) -> + ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:anonymous_suites(Version)], + [{key_exchange, + fun(dh_anon) -> + true; + (ecdh_anon) -> + true; + (_) -> + false + end}]). psk_suites(Version) -> ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:psk_suites(Version)], []). |