diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-11-05 10:23:17 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-11-05 10:23:17 +0100 |
| commit | 8f4eb75f5a8d3f76d4e5e1c7d56024c727358ac7 (patch) | |
| tree | 466acf91ebefcbc5a96ff601f36d01d7423c38fe /lib/ssl/test/ssl_ECC_SUITE.erl | |
| parent | 1fe2896eb4671563452c46789984559a0bb01384 (diff) | |
| parent | e520555c54966e36d94004dd2c842a2be98fe2bc (diff) | |
| download | otp-8f4eb75f5a8d3f76d4e5e1c7d56024c727358ac7.tar.gz otp-8f4eb75f5a8d3f76d4e5e1c7d56024c727358ac7.tar.bz2 otp-8f4eb75f5a8d3f76d4e5e1c7d56024c727358ac7.zip | |
Merge branch 'ingela/ssl/signature-check/ERL-763/OTP-15415' into maint
* ingela/ssl/signature-check/ERL-763/OTP-15415:
ssl: Correct filter function
Diffstat (limited to 'lib/ssl/test/ssl_ECC_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index c93f066825..a5309e866b 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -395,10 +395,25 @@ client_ecdhe_rsa_server_ecdhe_ecdsa_client_custom(Config) -> end. mix_sign(Config) -> - {COpts0, SOpts0} = ssl_test_lib:make_mix_cert(Config), + mix_sign_rsa_peer(Config), + mix_sign_ecdsa_peer(Config). + +mix_sign_ecdsa_peer(Config) -> + {COpts0, SOpts0} = ssl_test_lib:make_mix_cert([{mix, peer_ecc} |Config]), COpts = ssl_test_lib:ssl_options(COpts0, Config), SOpts = ssl_test_lib:ssl_options(SOpts0, Config), ECDHE_ECDSA = ssl:filter_cipher_suites(ssl:cipher_suites(default, 'tlsv1.2'), [{key_exchange, fun(ecdhe_ecdsa) -> true; (_) -> false end}]), ssl_test_lib:basic_test(COpts, [{ciphers, ECDHE_ECDSA} | SOpts], Config). + + +mix_sign_rsa_peer(Config) -> + {COpts0, SOpts0} = ssl_test_lib:make_mix_cert([{mix, peer_rsa} |Config]), + COpts = ssl_test_lib:ssl_options(COpts0, Config), + SOpts = ssl_test_lib:ssl_options(SOpts0, Config), + ECDHE_RSA = + ssl:filter_cipher_suites(ssl:cipher_suites(default, 'tlsv1.2'), + [{key_exchange, fun(ecdhe_rsa) -> true; (_) -> false end}]), + ssl_test_lib:basic_test(COpts, [{ciphers, ECDHE_RSA} | SOpts], Config). + |