diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-06-27 15:31:35 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-06-27 15:31:35 +0200 |
| commit | 798924ffd5efff77ba94ea7f54c2e69548d9d07e (patch) | |
| tree | 1cbc3c96906cf86cd2d5719ff3e848ecc61661dc /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | 693691a8e82e892cab23ee66fe3984a3f98e2aa6 (diff) | |
| parent | 67eda42fcd2f592f578ebcac3371ee9eb8941f31 (diff) | |
| download | otp-798924ffd5efff77ba94ea7f54c2e69548d9d07e.tar.gz otp-798924ffd5efff77ba94ea7f54c2e69548d9d07e.tar.bz2 otp-798924ffd5efff77ba94ea7f54c2e69548d9d07e.zip | |
Merge branch 'ingela/ssl/test-checks' into maint
* ingela/ssl/test-checks:
ssl: Skip sslv2 hello compatible tests on OpenSSL-0.9.8o
ssl: Skip sslv3 interop with newer OpenSSL
ssl: Increase timeout for testcase testing ECDH keyexchange with RSA signed certs
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 407152aa75..64f9927901 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -360,6 +360,8 @@ init_per_testcase(TestCase, Config) when TestCase == psk_cipher_suites; TestCase == psk_with_hint_cipher_suites; TestCase == ciphers_rsa_signed_certs; TestCase == ciphers_rsa_signed_certs_openssl_names; + TestCase == ciphers_ecdh_rsa_signed_certs_openssl_names; + TestCase == ciphers_ecdh_rsa_signed_certs; TestCase == ciphers_dsa_signed_certs; TestCase == ciphers_dsa_signed_certs_openssl_names; TestCase == anonymous_cipher_suites; |