diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-10 11:32:11 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-07-18 17:16:26 +0200 |
| commit | abb11dec132a4667f5ebb95c79a0b7ff5cda72e1 (patch) | |
| tree | 538ad90e4a4421a524b0f04654879d55b5602654 /lib/ssl/test/ssl_cipher_suite_SUITE.erl | |
| parent | 3b6cebce2ffed10fb51fc0929dcb09e8051a864b (diff) | |
| download | otp-abb11dec132a4667f5ebb95c79a0b7ff5cda72e1.tar.gz otp-abb11dec132a4667f5ebb95c79a0b7ff5cda72e1.tar.bz2 otp-abb11dec132a4667f5ebb95c79a0b7ff5cda72e1.zip | |
ssl: Better grouping of test
Regroup testes after functionality making it easier to
test all variants (all protocols, all cert types etc).
Also extend OpenSSL interop
Diffstat (limited to 'lib/ssl/test/ssl_cipher_suite_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_cipher_suite_SUITE.erl | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_cipher_suite_SUITE.erl b/lib/ssl/test/ssl_cipher_suite_SUITE.erl index 51788c29e7..e598d662e9 100644 --- a/lib/ssl/test/ssl_cipher_suite_SUITE.erl +++ b/lib/ssl/test/ssl_cipher_suite_SUITE.erl @@ -45,7 +45,7 @@ groups() -> {'tlsv1.2', [], kex()}, {'tlsv1.1', [], kex()}, {'tlsv1', [], kex()}, - {'sslv3', [], kex()}, + {'sslv3', [], ssl3_kex()}, {'dtlsv1.2', [], kex()}, {'dtlsv1', [], kex()}, {dhe_rsa, [],[dhe_rsa_3des_ede_cbc, @@ -130,6 +130,11 @@ groups() -> kex() -> rsa() ++ ecdsa() ++ dss() ++ anonymous(). + +ssl3_kex() -> + ssl3_rsa() ++ ssl3_dss() ++ ssl3_anonymous(). + + rsa() -> [{group, dhe_rsa}, {group, ecdhe_rsa}, @@ -138,6 +143,11 @@ rsa() -> {group, rsa_psk} ]. +ssl3_rsa() -> + [{group, dhe_rsa}, + {group, rsa} + ]. + ecdsa() -> [{group, ecdhe_ecdsa}]. @@ -145,6 +155,10 @@ dss() -> [{group, dhe_dss}, {group, srp_dss}]. +ssl3_dss() -> + [{group, dhe_dss} + ]. + anonymous() -> [{group, dh_anon}, {group, ecdh_anon}, @@ -154,6 +168,10 @@ anonymous() -> {group, srp_anon} ]. +ssl3_anonymous() -> + [{group, dh_anon}]. + + init_per_suite(Config) -> catch crypto:stop(), try crypto:start() of |