diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-04-23 20:29:06 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-05-03 11:43:34 +0200 |
| commit | 61102eeb8ea13f48d7f068e272ba957e767a603c (patch) | |
| tree | 5e5a006d1f57f58bdc5a7738f82973fcb5b14d90 | |
| parent | ac6084fd83240355f72e94adbf303e57832d1fab (diff) | |
| download | otp-61102eeb8ea13f48d7f068e272ba957e767a603c.tar.gz otp-61102eeb8ea13f48d7f068e272ba957e767a603c.tar.bz2 otp-61102eeb8ea13f48d7f068e272ba957e767a603c.zip | |
ssl: Use diffrent digest for some TLS/DTLS versions
| -rw-r--r-- | lib/ssl/test/ssl_cipher_suite_SUITE.erl | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/lib/ssl/test/ssl_cipher_suite_SUITE.erl b/lib/ssl/test/ssl_cipher_suite_SUITE.erl index 8805df7b52..7b0e4d1cbf 100644 --- a/lib/ssl/test/ssl_cipher_suite_SUITE.erl +++ b/lib/ssl/test/ssl_cipher_suite_SUITE.erl @@ -317,7 +317,7 @@ end_per_testcase(_TestCase, Config) -> Config. init_certs(srp_rsa, Config) -> - DefConf = ssl_test_lib:default_cert_chain_conf(), + DefConf = default_cert_chain_conf(), CertChainConf = ssl_test_lib:gen_conf(rsa, rsa, DefConf, DefConf), #{server_config := ServerOpts, client_config := ClientOpts} @@ -348,7 +348,7 @@ init_certs(rsa, Config) -> client_config => ClientOpts}} | proplists:delete(tls_config, Config)]; init_certs(dhe_dss, Config) -> - DefConf = ssl_test_lib:default_cert_chain_conf(), + DefConf = default_cert_chain_conf(), CertChainConf = ssl_test_lib:gen_conf(dsa, dsa, DefConf, DefConf), #{server_config := ServerOpts, client_config := ClientOpts} @@ -357,7 +357,7 @@ init_certs(dhe_dss, Config) -> client_config => ClientOpts}} | proplists:delete(tls_config, Config)]; init_certs(srp_dss, Config) -> - DefConf = ssl_test_lib:default_cert_chain_conf(), + DefConf = default_cert_chain_conf(), CertChainConf = ssl_test_lib:gen_conf(dsa, dsa, DefConf, DefConf), #{server_config := ServerOpts, client_config := ClientOpts} @@ -367,7 +367,7 @@ init_certs(srp_dss, Config) -> proplists:delete(tls_config, Config)]; init_certs(GroupName, Config) when GroupName == dhe_rsa; GroupName == ecdhe_rsa -> - DefConf = ssl_test_lib:default_cert_chain_conf(), + DefConf = default_cert_chain_conf(), CertChainConf = ssl_test_lib:gen_conf(rsa, rsa, DefConf, DefConf), #{server_config := ServerOpts, client_config := ClientOpts} @@ -377,7 +377,7 @@ init_certs(GroupName, Config) when GroupName == dhe_rsa; proplists:delete(tls_config, Config)]; init_certs(GroupName, Config) when GroupName == dhe_ecdsa; GroupName == ecdhe_ecdsa -> - DefConf = ssl_test_lib:default_cert_chain_conf(), + DefConf = default_cert_chain_conf(), CertChainConf = ssl_test_lib:gen_conf(ecdsa, ecdsa, DefConf, DefConf), #{server_config := ServerOpts, client_config := ClientOpts} @@ -402,6 +402,21 @@ init_certs(_GroupName, Config) -> [{tls_config, #{server_config => [], client_config => []}} | proplists:delete(tls_config, Config)]. + +default_cert_chain_conf() -> + Digest = digest(), + [[Digest], [Digest], [Digest]]. + + +digest() -> + case application:get_env(ssl, protocol_version, application:get_env(ssl, dtls_protocol_version)) of + Ver when Ver == 'tlsv1.2'; + Ver == 'dtlsv1.2' -> + {digest, sha256}; + _ -> + {digest, sha1} + end. + %%-------------------------------------------------------------------- %% Test Cases -------------------------------------------------------- %%-------------------------------------------------------------------- |