Merge branch 'maint'

1 files changed, 160 insertions, 70 deletions

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 49d2b5c1b8..7a644968f2 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -401,27 +401,22 @@ cert_options(Config) ->
 				{ssl_imp, new}]},
      {server_opts, [{ssl_imp, new},{reuseaddr, true}, {cacertfile, ServerCaCertFile}, 
 		    {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]},
-     %%{server_anon, [{ssl_imp, new},{reuseaddr, true}, {ciphers, anonymous_suites()}]},
-     {client_psk, [{ssl_imp, new},{reuseaddr, true},
+     {client_psk, [{ssl_imp, new},
 		   {psk_identity, "Test-User"},
 		   {user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]},
      {server_psk, [{ssl_imp, new},{reuseaddr, true},
 		   {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
-		   {user_lookup_fun, {fun user_lookup/3, PskSharedSecret}},
-		   {ciphers, psk_suites()}]},
+		   {user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]},
      {server_psk_hint, [{ssl_imp, new},{reuseaddr, true},
 			{certfile, ServerCertFile}, {keyfile, ServerKeyFile},
 			{psk_identity, "HINT"},
-			{user_lookup_fun, {fun user_lookup/3, PskSharedSecret}},
-			{ciphers, psk_suites()}]},
+			{user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]},
      {server_psk_anon, [{ssl_imp, new},{reuseaddr, true},
-			{user_lookup_fun, {fun user_lookup/3, PskSharedSecret}},
-			{ciphers, psk_anon_suites()}]},
+			{user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]},
      {server_psk_anon_hint, [{ssl_imp, new},{reuseaddr, true},
 			     {psk_identity, "HINT"},
-			     {user_lookup_fun, {fun user_lookup/3, PskSharedSecret}},
-			     {ciphers, psk_anon_suites()}]},
-     {client_srp, [{ssl_imp, new},{reuseaddr, true},
+			     {user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]},
+     {client_srp, [{ssl_imp, new},
 		   {srp_identity, {"Test-User", "secret"}}]},
      {server_srp, [{ssl_imp, new},{reuseaddr, true},
 		   {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
@@ -476,7 +471,7 @@ make_dsa_cert(Config) ->
 			       {cacertfile, ClientCaCertFile},
 			       {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
 			       {verify, verify_peer}]},
-     {client_dsa_opts, [{ssl_imp, new},{reuseaddr, true}, 
+     {client_dsa_opts, [{ssl_imp, new},
 			{cacertfile, ClientCaCertFile},
 			{certfile, ClientCertFile}, {keyfile, ClientKeyFile}]},
      {server_srp_dsa, [{ssl_imp, new},{reuseaddr, true}, 
@@ -484,7 +479,7 @@ make_dsa_cert(Config) ->
 		       {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
 		       {user_lookup_fun, {fun user_lookup/3, undefined}},
 		       {ciphers, srp_dss_suites()}]},
-     {client_srp_dsa, [{ssl_imp, new},{reuseaddr, true}, 
+     {client_srp_dsa, [{ssl_imp, new},
 		       {srp_identity, {"Test-User", "secret"}},
 		       {cacertfile, ClientCaCertFile},
 		       {certfile, ClientCertFile}, {keyfile, ClientKeyFile}]}
@@ -505,7 +500,7 @@ make_ecdsa_cert(Config) ->
 					 {cacertfile, ClientCaCertFile},
 					 {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
 					 {verify, verify_peer}]},
-	     {client_ecdsa_opts, [{ssl_imp, new},{reuseaddr, true},
+	     {client_ecdsa_opts, [{ssl_imp, new},
 				  {cacertfile, ClientCaCertFile},
 				  {certfile, ClientCertFile}, {keyfile, ClientKeyFile}]}
 	     | Config];
@@ -540,7 +535,7 @@ make_ecdh_rsa_cert(Config) ->
 					    {cacertfile, ClientCaCertFile},
 					    {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
 					    {verify, verify_peer}]},
-	     {client_ecdh_rsa_opts, [{ssl_imp, new},{reuseaddr, true},
+	     {client_ecdh_rsa_opts, [{ssl_imp, new},
 				     {cacertfile, ClientCaCertFile},
 				     {certfile, ClientCertFile}, {keyfile, ClientKeyFile}]}
 	     | Config];
@@ -560,7 +555,7 @@ make_mix_cert(Config) ->
 			       {cacertfile, ClientCaCertFile},
 			       {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
 			       {verify, verify_peer}]},
-     {client_mix_opts, [{ssl_imp, new},{reuseaddr, true},
+     {client_mix_opts, [{ssl_imp, new},
 			{cacertfile, ClientCaCertFile},
 			{certfile, ClientCertFile}, {keyfile, ClientKeyFile}]}
      | Config].
@@ -830,17 +825,17 @@ rsa_suites(CounterPart) ->
 		    ({dhe_rsa, des_cbc, sha}) when FIPS == true ->
 			 false;
 		    ({rsa, Cipher, _}) ->
-			 lists:member(Cipher, Ciphers);
+			 lists:member(cipher_atom(Cipher), Ciphers);
 		    ({dhe_rsa, Cipher, _}) ->
-			 lists:member(Cipher, Ciphers);
+			 lists:member(cipher_atom(Cipher), Ciphers);
 		    ({ecdhe_rsa, Cipher, _}) when ECC == true ->
-			 lists:member(Cipher, Ciphers);
+			 lists:member(cipher_atom(Cipher), Ciphers);
 		    ({rsa, Cipher, _, _}) ->
-			 lists:member(Cipher, Ciphers);
+			 lists:member(cipher_atom(Cipher), Ciphers);
 		    ({dhe_rsa, Cipher, _,_}) ->
-			 lists:member(Cipher, Ciphers);
+			 lists:member(cipher_atom(Cipher), Ciphers);
 		    ({ecdhe_rsa, Cipher, _,_}) when ECC == true ->
-			 lists:member(Cipher, Ciphers);
+			 lists:member(cipher_atom(Cipher), Ciphers);
 		    (_) ->
 			 false
 		 end,
@@ -933,44 +928,12 @@ anonymous_suites(Version) ->
     Suites = ssl_cipher:anonymous_suites(Version),
     ssl_cipher:filter_suites(Suites).
 
-psk_suites() ->
-    Suites =
-	[{psk, rc4_128, sha},
-	 {psk, '3des_ede_cbc', sha},
-	 {psk, aes_128_cbc, sha},
-	 {psk, aes_256_cbc, sha},
-	 {psk, aes_128_cbc, sha256},
-	 {psk, aes_256_cbc, sha384},
-	 {dhe_psk, rc4_128, sha},
-	 {dhe_psk, '3des_ede_cbc', sha},
-	 {dhe_psk, aes_128_cbc, sha},
-	 {dhe_psk, aes_256_cbc, sha},
-	 {dhe_psk, aes_128_cbc, sha256},
-	 {dhe_psk, aes_256_cbc, sha384},
-	 {rsa_psk, rc4_128, sha},
-	 {rsa_psk, '3des_ede_cbc', sha},
-	 {rsa_psk, aes_128_cbc, sha},
-	 {rsa_psk, aes_256_cbc, sha},
-	 {rsa_psk, aes_128_cbc, sha256},
-	 {rsa_psk, aes_256_cbc, sha384},
-	 {psk, aes_128_gcm, null, sha256},
-	 {psk, aes_256_gcm, null, sha384},
-	 {dhe_psk, aes_128_gcm, null, sha256},
-	 {dhe_psk, aes_256_gcm, null, sha384},
-	 {rsa_psk, aes_128_gcm, null, sha256},
-	 {rsa_psk, aes_256_gcm, null, sha384}],
+psk_suites(Version) ->
+    Suites = ssl_cipher:psk_suites(Version),
     ssl_cipher:filter_suites(Suites).
 
-psk_anon_suites() ->
-    Suites =
-	[{psk, rc4_128, sha},
-	 {psk, '3des_ede_cbc', sha},
-	 {psk, aes_128_cbc, sha},
-	 {psk, aes_256_cbc, sha},
-	 {dhe_psk, rc4_128, sha},
-	 {dhe_psk, '3des_ede_cbc', sha},
-	 {dhe_psk, aes_128_cbc, sha},
-	 {dhe_psk, aes_256_cbc, sha}],
+psk_anon_suites(Version) ->
+    Suites = [Suite || Suite <- psk_suites(Version), is_psk_anon_suite(Suite)],
     ssl_cipher:filter_suites(Suites).
 
 srp_suites() ->
@@ -1092,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' ->
@@ -1234,19 +1199,37 @@ check_sane_openssl_version(Version) ->
 enough_openssl_crl_support("OpenSSL 0." ++ _) -> false;
 enough_openssl_crl_support(_) -> true.
 
-wait_for_openssl_server(Port) ->
-    wait_for_openssl_server(Port, 10).
-wait_for_openssl_server(_, 0) ->
+wait_for_openssl_server(Port, tls) ->
+    do_wait_for_openssl_tls_server(Port, 10);
+wait_for_openssl_server(Port, dtls) ->
+    do_wait_for_openssl_dtls_server(Port, 10).
+
+do_wait_for_openssl_tls_server(_, 0) ->
     exit(failed_to_connect_to_openssl);
-wait_for_openssl_server(Port, N) ->
+do_wait_for_openssl_tls_server(Port, N) ->
     case gen_tcp:connect("localhost", Port, []) of
 	{ok, S} ->
 	    gen_tcp:close(S);
 	_  ->
 	    ct:sleep(?SLEEP),
-	    wait_for_openssl_server(Port, N-1)
+	    do_wait_for_openssl_tls_server(Port, N-1)
     end.
 
+do_wait_for_openssl_dtls_server(_, 0) ->
+    %%exit(failed_to_connect_to_openssl);
+    ok;
+do_wait_for_openssl_dtls_server(Port, N) ->
+    %% case gen_udp:open(0) of
+    %%     {ok, S} ->
+    %%         gen_udp:connect(S, "localhost", Port),
+    %%         gen_udp:close(S);
+    %%     _  ->
+    %%         ct:sleep(?SLEEP),
+    %%         do_wait_for_openssl_dtls_server(Port, N-1)
+    %% end.
+    ct:sleep(500),
+    do_wait_for_openssl_dtls_server(Port, N-1).
+
 version_flag(tlsv1) ->
     "-tls1";
 version_flag('tlsv1.1') ->
@@ -1256,10 +1239,14 @@ version_flag('tlsv1.2') ->
 version_flag(sslv3) ->
     "-ssl3";
 version_flag(sslv2) ->
-    "-ssl2".
-
-filter_suites(Ciphers0) ->
-    Version = tls_record:highest_protocol_version([]),
+    "-ssl2";
+version_flag('dtlsv1.2') ->
+    "-dtls1_2";
+version_flag('dtlsv1') ->
+    "-dtls1".
+
+filter_suites(Ciphers0, AtomVersion) ->
+    Version = tls_version(AtomVersion),
     Supported0 = ssl_cipher:suites(Version)
 	++ ssl_cipher:anonymous_suites(Version)
 	++ ssl_cipher:psk_suites(Version)
@@ -1341,7 +1328,7 @@ protocol_version(Config) ->
 protocol_version(Config, tuple) ->
     case proplists:get_value(protocol, Config) of
 	dtls ->
-	    dtls_record:protocol_version(dtls_record:highest_protocol_version([]));
+	    dtls_record:highest_protocol_version(dtls_record:supported_protocol_versions());
 	_ ->
 	    tls_record:highest_protocol_version(tls_record:supported_protocol_versions())
    end;
@@ -1375,6 +1362,7 @@ clean_env() ->
     application:unset_env(ssl, session_cache_client_max),
     application:unset_env(ssl, session_cache_server_max),
     application:unset_env(ssl, ssl_pem_cache_clean),
+    application:unset_env(ssl, bypass_pem_cache),
     application:unset_env(ssl, alert_timeout).
 
 clean_start() ->
@@ -1382,3 +1370,105 @@ clean_start() ->
     application:load(ssl),
     clean_env(),
     ssl:start().
+
+is_psk_anon_suite({psk, _,_}) ->
+    true;
+is_psk_anon_suite({dhe_psk,_,_}) ->
+    true;
+is_psk_anon_suite({psk, _,_,_}) ->
+    true;
+is_psk_anon_suite({dhe_psk, _,_,_}) ->
+    true;
+is_psk_anon_suite(_) ->
+    false.
+
+cipher_atom(aes_256_cbc) ->
+    aes_cbc256;
+cipher_atom(aes_128_cbc) ->
+    aes_cbc128;
+cipher_atom('3des_ede_cbc') ->
+    des_ede3;
+cipher_atom(Atom) ->
+    Atom.
+tls_version('dtlsv1' = Atom) ->
+    dtls_v1:corresponding_tls_version(dtls_record:protocol_version(Atom));
+tls_version('dtlsv1.2' = Atom) ->
+    dtls_v1:corresponding_tls_version(dtls_record:protocol_version(Atom));
+tls_version(Atom) ->
+    tls_record:protocol_version(Atom).
+
+dtls_hello() ->
+    [1,
+     <<0,1,4>>,
+     <<0,0>>,
+     <<0,0,0>>,
+     <<0,1,4>>,
+     <<254,253,88,
+       156,129,61,
+       131,216,15,
+       131,194,242,
+       46,154,190,
+       20,228,234,
+       234,150,44,
+       62,96,96,103,
+       127,95,103,
+       23,24,42,138,
+       13,142,32,57,
+       230,177,32,
+       210,154,152,
+       188,121,134,
+       136,53,105,
+       118,96,106,
+       103,231,223,
+       133,10,165,
+       50,32,211,
+       227,193,14,
+       181,143,48,
+       66,0,0,100,0,
+       255,192,44,
+       192,48,192,
+       36,192,40,
+       192,46,192,
+       50,192,38,
+       192,42,0,159,
+       0,163,0,107,
+       0,106,0,157,
+       0,61,192,43,
+       192,47,192,
+       35,192,39,
+       192,45,192,
+       49,192,37,
+       192,41,0,158,
+       0,162,0,103,
+       0,64,0,156,0,
+       60,192,10,
+       192,20,0,57,
+       0,56,192,5,
+       192,15,0,53,
+       192,8,192,18,
+       0,22,0,19,
+       192,3,192,13,
+       0,10,192,9,
+       192,19,0,51,
+       0,50,192,4,
+       192,14,0,47,
+       1,0,0,86,0,0,
+       0,14,0,12,0,
+       0,9,108,111,
+       99,97,108,
+       104,111,115,
+       116,0,10,0,
+       58,0,56,0,14,
+       0,13,0,25,0,
+       28,0,11,0,12,
+       0,27,0,24,0,
+       9,0,10,0,26,
+       0,22,0,23,0,
+       8,0,6,0,7,0,
+       20,0,21,0,4,
+       0,5,0,18,0,
+       19,0,1,0,2,0,
+       3,0,15,0,16,
+       0,17,0,11,0,
+       2,1,0>>].
+