Merge branch 'ingela/ssl/openssl-test-cuddle'

* ingela/ssl/openssl-test-cuddle:
  ssl: anon test should use dh or ecdh anon keyexchange
  ssl: Cuddle no delivery guarantee at application level
  ssl: Cuddle timeout
  ssl: Correct option handling to OpenSSL

4 files changed, 49 insertions, 20 deletions

diff --git a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
index 280fa94ecb..5a08b152a6 100644
--- a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
@@ -157,7 +157,7 @@ init_per_testcase(TestCase, Config) ->
     ct:log("Ciphers: ~p~n ", [ssl:cipher_suites(default, Version)]),
     end_per_testcase(TestCase, Config),
     ssl:start(),
-    ct:timetrap({seconds, 15}),
+    ct:timetrap({seconds, 30}),
     Config.
 
 end_per_testcase(_TestCase, Config) ->     
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index d3b13050e3..162c63850f 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -686,11 +686,16 @@ hello_client_cancel(Config) when is_list(Config) ->
                                                       {host, Hostname},
                                                       {from, self()}, 
                                                       {options, ssl_test_lib:ssl_options([{handshake, hello}], Config)},
-                                                      {continue_options, cancel}]),
-    
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "user canceled"}}).
-%%--------------------------------------------------------------------
+                                                      {continue_options, cancel}]),    
+      receive
+          {Server, {error, {tls_alert, "user canceled"}}} ->
+              ok;
+          {Server, {error, closed}} ->
+              ct:pal("Did not receive the ALERT"),
+              ok
+      end.
 
+%%--------------------------------------------------------------------
 hello_server_cancel() ->
     [{doc, "Test API function ssl:handshake_cancel/1 on the server side"}].
 hello_server_cancel(Config) when is_list(Config) -> 
@@ -2539,7 +2544,7 @@ anonymous_cipher_suites()->
     [{doc,"Test the anonymous ciphersuites"}].
 anonymous_cipher_suites(Config) when is_list(Config) ->
     NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:anonymous_suites(NVersion),
+    Ciphers = ssl_test_lib:ecdh_dh_anonymous_suites(NVersion),
     run_suites(Ciphers, Config, anonymous).
 %%-------------------------------------------------------------------
 psk_cipher_suites() ->
@@ -2635,7 +2640,7 @@ default_reject_anonymous(Config) when is_list(Config) ->
     Version = ssl_test_lib:protocol_version(Config),
     TLSVersion = ssl_test_lib:tls_version(Version),
     
-   [CipherSuite | _] = ssl_test_lib:anonymous_suites(TLSVersion),
+   [CipherSuite | _] = ssl_test_lib:ecdh_dh_anonymous_suites(TLSVersion),
     
     Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
 					      {from, self()},
@@ -5046,8 +5051,14 @@ tls_downgrade_result(Socket) ->
 
 tls_close(Socket) ->
     ok = ssl_test_lib:send_recv_result(Socket),
-    ok = ssl:close(Socket, 5000).
-    
+    case ssl:close(Socket, 5000) of
+        ok ->
+            ok;
+        {error, closed} ->
+            ok;
+        Other ->
+            ct:fail(Other)
+    end.
 
  %% First two clauses handles 1/n-1 splitting countermeasure Rizzo/Duong-Beast
 treashold(N, {3,0}) ->
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 8c27571d64..1e88ca15de 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1264,8 +1264,16 @@ string_regex_filter(Str, Search) when is_list(Str) ->
 string_regex_filter(_Str, _Search) ->
     false.
 
-anonymous_suites(Version) ->
-    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:anonymous_suites(Version)],[]).
+ecdh_dh_anonymous_suites(Version) ->
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:anonymous_suites(Version)],
+                             [{key_exchange, 
+                               fun(dh_anon) -> 
+                                       true;
+                                  (ecdh_anon) -> 
+                                       true;
+                                  (_) -> 
+                                       false 
+                               end}]).
 psk_suites(Version) ->
     ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:psk_suites(Version)], []).
 
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index a2e8ef8be0..4f02d8d15d 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -412,8 +412,16 @@ basic_erlang_server_openssl_client(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(Server),
     
     Exe = "openssl",
-    Args = ["s_client", "-connect", hostname_format(Hostname) ++
-                ":" ++ integer_to_list(Port) ++ no_low_flag() | workaround_openssl_s_clinent()],
+    Args = case no_low_flag("-no_ssl2") of
+               [] ->
+                   ["s_client", "-connect", hostname_format(Hostname) ++
+                        ":" ++ integer_to_list(Port), no_low_flag("-no_ssl3")
+                    | workaround_openssl_s_clinent()];
+               Flag ->
+                   ["s_client", "-connect", hostname_format(Hostname) ++
+                        ":" ++ integer_to_list(Port), no_low_flag("-no_ssl3"), Flag
+                    | workaround_openssl_s_clinent()]
+           end, 
     
     OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), 
     true = port_command(OpenSslPort, Data),
@@ -588,7 +596,7 @@ erlang_client_openssl_server_anon(Config) when is_list(Config) ->
     ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     ClientOpts = ssl_test_lib:ssl_options(client_anon_opts, Config),
     VersionTuple = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:anonymous_suites(VersionTuple),
+    Ciphers = ssl_test_lib:ecdh_dh_anonymous_suites(VersionTuple),
 
     {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
 
@@ -631,7 +639,7 @@ erlang_server_openssl_client_anon(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ssl_test_lib:ssl_options(server_anon_opts, Config),
     VersionTuple = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:anonymous_suites(VersionTuple),
+    Ciphers = ssl_test_lib:ecdh_dh_anonymous_suites(VersionTuple),
 
     {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
@@ -665,7 +673,7 @@ erlang_server_openssl_client_anon_with_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     VersionTuple = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:anonymous_suites(VersionTuple),
+    Ciphers = ssl_test_lib:ecdh_dh_anonymous_suites(VersionTuple),
 
     {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
@@ -1995,10 +2003,12 @@ hostname_format(Hostname) ->
             "localhost"   
     end.
 
-no_low_flag() ->
+no_low_flag("-no_ssl2" = Flag) ->
     case ssl_test_lib:supports_ssl_tls_version(sslv2) of
         true ->
-            " -no_ssl2 -no_ssl3";
+            Flag;
         false ->
-            " -no_ssl3"
-    end.
+            ""
+    end;
+no_low_flag(Flag) ->
+    Flag.