aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-03-07 11:55:13 +0100
committerIngela Anderton Andin <[email protected]>2017-03-07 11:55:13 +0100
commitb0759a45ffa561b82d97c4704112fcabc8a846d2 (patch)
treeddefcb5394b7d6fc2373c956485ab30e62e16b29 /lib/ssl/test
parent51d486c31096287d994cf9a02f1335336eda5e93 (diff)
downloadotp-b0759a45ffa561b82d97c4704112fcabc8a846d2.tar.gz
otp-b0759a45ffa561b82d97c4704112fcabc8a846d2.tar.bz2
otp-b0759a45ffa561b82d97c4704112fcabc8a846d2.zip
dtls: Avoid mixup of protocol to test
Diffstat (limited to 'lib/ssl/test')
-rw-r--r--lib/ssl/test/ssl_certificate_verify_SUITE.erl6
-rw-r--r--lib/ssl/test/ssl_test_lib.erl6
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_certificate_verify_SUITE.erl b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
index 64c097018a..4552a4f57d 100644
--- a/lib/ssl/test/ssl_certificate_verify_SUITE.erl
+++ b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
@@ -115,7 +115,8 @@ init_per_group(tls, Config) ->
application:set_env(ssl, protocol_version, Version),
application:set_env(ssl, bypass_pem_cache, Version),
ssl:start(),
- [{protocol, tls}, {version, tls_record:protocol_version(Version)} | Config];
+ NewConfig = proplists:delete(protocol, Config),
+ [{protocol, tls}, {version, tls_record:protocol_version(Version)} | NewConfig];
init_per_group(dtls, Config) ->
Version = dtls_record:protocol_version(dtls_record:highest_protocol_version([])),
@@ -124,7 +125,8 @@ init_per_group(dtls, Config) ->
application:set_env(ssl, protocol_version, Version),
application:set_env(ssl, bypass_pem_cache, Version),
ssl:start(),
- [{protocol, dtls}, {protocol_opts, [{protocol, dtls}]}, {version, dtls_record:protocol_version(Version)} | Config];
+ NewConfig = proplists:delete(protocol_opts, proplists:delete(protocol, Config)),
+ [{protocol, dtls}, {protocol_opts, [{protocol, dtls}]}, {version, dtls_record:protocol_version(Version)} | NewConfig];
init_per_group(active, Config) ->
[{active, true}, {receive_function, send_recv_result_active} | Config];
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index ef5de382a4..7a644968f2 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1055,14 +1055,16 @@ init_tls_version(Version, Config)
application:load(ssl),
application:set_env(ssl, dtls_protocol_version, Version),
ssl:start(),
- [{protocol, dtls}, {protocol_opts, [{protocol, dtls}]}|Config];
+ NewConfig = proplists:delete(protocol_opts, proplists:delete(protocol, Config)),
+ [{protocol, dtls}, {protocol_opts, [{protocol, dtls}]} | NewConfig];
init_tls_version(Version, Config) ->
ssl:stop(),
application:load(ssl),
application:set_env(ssl, protocol_version, Version),
ssl:start(),
- [{protocol, tls}|Config].
+ NewConfig = proplists:delete(protocol_opts, proplists:delete(protocol, Config)),
+ [{protocol, tls} | NewConfig].
sufficient_crypto_support(Version)
when Version == 'tlsv1.2'; Version == 'dtlsv1.2' ->