diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-04-30 07:45:25 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-04-30 07:45:25 +0200 |
| commit | 6e729eb3d4edf2a2f5f0d7b0a0d36f7e3d031a40 (patch) | |
| tree | fc3166e618d7844a004704e64d49e82bc2f9c8c2 /lib/ssl/test/ssl_ECC.erl | |
| parent | 52c11d5afd18405eaa293bb881eddf23f408850f (diff) | |
| parent | 973293516a0d3e5148aa567fe1da65821efe532a (diff) | |
| download | otp-6e729eb3d4edf2a2f5f0d7b0a0d36f7e3d031a40.tar.gz otp-6e729eb3d4edf2a2f5f0d7b0a0d36f7e3d031a40.tar.bz2 otp-6e729eb3d4edf2a2f5f0d7b0a0d36f7e3d031a40.zip | |
Merge branch 'ingela/ssl/do-not-hardcode-cipher-suites'
* ingela/ssl/do-not-hardcode-cipher-suites:
ssl: Fix ECDSA key decode clause
ssl: Avoid hardcoding of cipher suites and fix ECDH suite handling
ssl: Run all test case combinations
ssl: Update tests to reflect sslv3 is not supported by default
Diffstat (limited to 'lib/ssl/test/ssl_ECC.erl')
| -rw-r--r-- | lib/ssl/test/ssl_ECC.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_ECC.erl b/lib/ssl/test/ssl_ECC.erl index 489a72e50e..2096cf8166 100644 --- a/lib/ssl/test/ssl_ECC.erl +++ b/lib/ssl/test/ssl_ECC.erl @@ -89,7 +89,7 @@ client_ecdhe_ecdsa_server_ecdhe_rsa(Config) when is_list(Config) -> %% ECDH_ECDSA client_ecdh_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) -> - Ext = x509_test:extensions([{key_usage, [keyEncipherment]}]), + Ext = x509_test:extensions([{key_usage, [keyAgreement]}]), {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, [[], [], [{extensions, Ext}]]}, {client_chain, @@ -99,7 +99,7 @@ client_ecdh_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) -> ssl_test_lib:ssl_options(SOpts, Config), [{check_keyex, ecdh_ecdsa} | proplists:delete(check_keyex, Config)]). client_ecdhe_rsa_server_ecdh_ecdsa(Config) when is_list(Config) -> - Ext = x509_test:extensions([{key_usage, [keyEncipherment]}]), + Ext = x509_test:extensions([{key_usage, [keyAgreement]}]), {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, [[], [], [{extensions, Ext}]]}, {client_chain, @@ -110,7 +110,7 @@ client_ecdhe_rsa_server_ecdh_ecdsa(Config) when is_list(Config) -> [{check_keyex, ecdh_ecdsa} | proplists:delete(check_keyex, Config)]). client_ecdhe_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) -> - Ext = x509_test:extensions([{key_usage, [keyEncipherment]}]), + Ext = x509_test:extensions([{key_usage, [keyAgreement]}]), {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, [[], [], [{extensions, Ext}]]}, {client_chain, |