diff options
Diffstat (limited to 'lib/ssl/test/openssl_cipher_suite_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/openssl_cipher_suite_SUITE.erl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/ssl/test/openssl_cipher_suite_SUITE.erl b/lib/ssl/test/openssl_cipher_suite_SUITE.erl index 8724595724..fce70645d3 100644 --- a/lib/ssl/test/openssl_cipher_suite_SUITE.erl +++ b/lib/ssl/test/openssl_cipher_suite_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2019-2022. All Rights Reserved. +%% Copyright Ericsson AB 2019-2023. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -527,21 +527,25 @@ init_certs(rsa_psk, Config) -> {user_lookup_fun, {fun ssl_test_lib:user_lookup/3, PskSharedSecret}} | ClientOpts]}} | proplists:delete(tls_config, Config)]; init_certs(rsa, Config) -> + Version = ssl_test_lib:n_version(proplists:get_value(version, Config)), + SigAlgs = ssl_test_lib:sig_algs(rsa, Version), Ext = x509_test:extensions([{key_usage, [digitalSignature, keyEncipherment]}]), {ClientOpts, ServerOpts} = ssl_test_lib:make_rsa_cert_chains([{server_chain, [[ssl_test_lib:digest()],[ssl_test_lib:digest()], [ssl_test_lib:digest(), {extensions, Ext}]]} ], Config, "_peer_keyEncipherment"), - [{tls_config, #{server_config => ServerOpts, - client_config => ClientOpts}} | + [{tls_config, #{server_config => SigAlgs ++ ServerOpts, + client_config => SigAlgs ++ ClientOpts}} | proplists:delete(tls_config, Config)]; init_certs(dhe_dss, Config) -> - {ClientOpts, ServerOpts} = ssl_test_lib:make_dsa_cert_chains([{server_chain, ssl_test_lib:default_cert_chain_conf()}, + Version = ssl_test_lib:n_version(proplists:get_value(version, Config)), + SigAlgs = ssl_test_lib:sig_algs(dsa, Version), + {ClientOpts, ServerOpts} = ssl_test_lib:make_dsa_cert_chains([{server_chain, ssl_test_lib:default_cert_chain_conf()}, {client_chain, ssl_test_lib:default_cert_chain_conf()}], - Config, ""), - [{tls_config, #{server_config => ServerOpts, - client_config => ClientOpts}} | + Config, ""), + [{tls_config, #{server_config => SigAlgs ++ ServerOpts, + client_config => SigAlgs ++ClientOpts}} | proplists:delete(tls_config, Config)]; init_certs(srp_dss, Config) -> {ClientOpts, ServerOpts} = ssl_test_lib:make_dsa_cert_chains([{server_chain, ssl_test_lib:default_cert_chain_conf()}, @@ -954,10 +958,6 @@ test_ciphers(Kex, Cipher, Version) -> end, Ciphers). -openssl_suitestr_to_map(OpenSSLSuiteStrs) -> - [ssl_cipher_format:suite_openssl_str_to_map(SuiteStr) || SuiteStr <- OpenSSLSuiteStrs]. - - supported_cipher(Cipher, CipherStr) -> SupCrypto = proplists:get_value(ciphers, crypto:supports()), SupOpenssl = [OCipher || OCipher <- ssl_test_lib:openssl_ciphers(), string:find(OCipher, CipherStr) =/= nomatch], |