1 files changed, 35 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 02fdc4330f..310c883fc2 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1051,6 +1051,10 @@ state([{data,[{"StateData", State}]} | _]) -> %% gen_fsm
 state([_ | Rest]) ->
     state(Rest).
 
+is_tls_version('dtlsv1.2') ->
+    true;
+is_tls_version('dtlsv1') ->
+    true;
 is_tls_version('tlsv1.2') ->
     true;
 is_tls_version('tlsv1.1') ->
@@ -1062,13 +1066,23 @@ is_tls_version('sslv3') ->
 is_tls_version(_) ->
     false.
 
-init_tls_version(Version) ->
+init_tls_version(Version, Config)
+  when Version == 'dtlsv1.2'; Version == 'dtlsv1' ->
+    ssl:stop(),
+    application:load(ssl),
+    application:set_env(ssl, dtls_protocol_version, Version),
+    ssl:start(),
+    [{protocol, dtls}, {protocol_opts, [{protocol, dtls}]}|Config];
+
+init_tls_version(Version, Config) ->
     ssl:stop(),
     application:load(ssl),
     application:set_env(ssl, protocol_version, Version),
-    ssl:start().
+    ssl:start(),
+    [{protocol, tls}|Config].
 
-sufficient_crypto_support('tlsv1.2') ->
+sufficient_crypto_support(Version)
+  when Version == 'tlsv1.2'; Version == 'dtlsv1.2' ->
     CryptoSupport = crypto:supports(),
     proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport));
 sufficient_crypto_support(Group) when Group == ciphers_ec;     %% From ssl_basic_SUITE
@@ -1294,3 +1308,21 @@ do_supports_ssl_tls_version(Port) ->
     after 500 ->
 	    true
     end.
+
+ssl_options(Option, Config) ->
+    ProtocolOpts = proplists:get_value(protocol_opts, Config, []),
+    Opts = ?config(Option, Config),
+    Opts ++ ProtocolOpts.
+
+protocol_version(Config) ->
+    case proplists:get_value(protocol, Config) of
+	dtls ->
+	    dtls_record:protocol_version(dtls_record:highest_protocol_version([]));
+	_ ->
+	    tls_record:protocol_version(tls_record:highest_protocol_version([]))
+   end.
+
+protocol_options(Config, Options) ->
+    Protocol = proplists:get_value(protocol, Config, tls),
+    {Protocol, Opts} = lists:keyfind(Protocol, 1, Options),
+    Opts.