aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-04-24 10:55:46 +0200
committerIngela Anderton Andin <[email protected]>2013-05-08 10:39:20 +0200
commit94cafd5217f6c295cc53c4354a40ca672d3acc0b (patch)
tree8b1b11702aaf476bce80fa60c07410b9ad81fd6d
parentabfa5825923caad09691313f39e843b70aee8f19 (diff)
downloadotp-94cafd5217f6c295cc53c4354a40ca672d3acc0b.tar.gz
otp-94cafd5217f6c295cc53c4354a40ca672d3acc0b.tar.bz2
otp-94cafd5217f6c295cc53c4354a40ca672d3acc0b.zip
ssl: test case fix
-rw-r--r--lib/ssl/test/ssl_test_lib.erl12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 6069a9da95..6b082b4eec 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -983,14 +983,16 @@ is_sane_ecc(openssl) ->
is_sane_ecc(_) ->
true.
-cipher_restriction(Config) ->
+cipher_restriction(Config0) ->
case is_sane_ecc(openssl) of
false ->
- Opts = proplists:get_value(server_opts, Config),
- NewConfig = proplists:delete(server_opts, Config),
+ Opts = proplists:get_value(server_opts, Config0),
+ Config1 = proplists:delete(server_opts, Config0),
+ VerOpts = proplists:get_value(server_verification_opts, Config1),
+ Config = proplists:delete(server_verification_opts, Config1),
Restricted0 = ssl:cipher_suites() -- ecdsa_suites(),
Restricted = Restricted0 -- ecdh_rsa_suites(),
- [{server_opts, [{ciphers, Restricted} | Opts]} | NewConfig];
+ [{server_opts, [{ciphers, Restricted} | Opts]}, {server_verification_opts, [{ciphers, Restricted} | VerOpts] } | Config];
true ->
- Config
+ Config0
end.