diff options
| author | Marcus Arendt <[email protected]> | 2014-06-04 11:49:49 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-06-04 11:49:49 +0200 |
| commit | d0893c4c5532116d5b5cb360b5ed3861fb7b25a1 (patch) | |
| tree | 005287c41f05cb092917d9bc68b38d1b22c21cbf /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | e22e19a9dcf3e125f29ebd5ac24c3cc5c8856895 (diff) | |
| parent | f96eaf5ff2f31ea69abd3a8116463e7633ce1f95 (diff) | |
| download | otp-d0893c4c5532116d5b5cb360b5ed3861fb7b25a1.tar.gz otp-d0893c4c5532116d5b5cb360b5ed3861fb7b25a1.tar.bz2 otp-d0893c4c5532116d5b5cb360b5ed3861fb7b25a1.zip | |
Merge branch 'RoadRunnr/ssl/fix-tests' into maint
* RoadRunnr/ssl/fix-tests:
SSL: fix OpenSSL known renegotiation bug detection
SSL: in tests, filter ssl client ciphers for version compatibility
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 59756b956f..2f440f1f3c 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -3696,7 +3696,7 @@ run_suites(Ciphers, Version, Config, Type) -> Result = lists:map(fun(Cipher) -> cipher(Cipher, Version, Config, ClientOpts, ServerOpts) end, - Ciphers), + ssl_test_lib:filter_suites(Ciphers)), case lists:flatten(Result) of [] -> ok; |