Merge branch 'ia/ssl/bottlenecks/OTP-10113' into maint

* ia/ssl/bottlenecks/OTP-10113:
  ssl: Test case fixes
  ssl: Avoid second bottleneck in supervisor
  ssl: File handling optimization
  ssl: Simpler PEM cache
  ssl: Refactored for readability
  ssl: Use md5 as file ref id instead of filenames
  ssl: Move ets:select bottleneck in server
  ssl: Renegotiate updates session id in gen_fsm state
  ssl: Use ordered_set in cache
  ssl: Move and avoid ets:select bottleneck in client
  ssl: Reuse session check optimization
  ssl: Avoid supervior bottleneck

1 files changed, 16 insertions, 2 deletions

diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 01fca1f166..f593c1c552 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -50,6 +50,7 @@ init_per_suite(Config0) ->
 	false ->
 	    {skip, "Openssl not found"};
 	_ ->
+	    catch crypto:stop(),
 	    try crypto:start() of
 		ok ->
 		    application:start(public_key),
@@ -112,6 +113,9 @@ special_init(TestCase, Config)
 special_init(ssl2_erlang_server_openssl_client, Config) ->
     check_sane_openssl_sslv2(Config);
 
+special_init(ciphers_dsa_signed_certs, Config) ->
+    check_sane_openssl_dsa(Config);
+
 special_init(_, Config) ->
     Config.
     
@@ -600,7 +604,7 @@ erlang_server_openssl_client_no_wrap_sequence_number(Config) when is_list(Config
 					{from, self()}, 
 					{mfa, {ssl_test_lib, 
 					       trigger_renegotiate, [[Data, N+2]]}},
-					{options, [{renegotiate_at, N} | ServerOpts]}]),
+					{options, [{renegotiate_at, N}, {reuse_sessions, false} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
     
     Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
@@ -1440,14 +1444,24 @@ check_sane_openssl_renegotaite(Config) ->
 	    {skip, "Known renegotiation bug in OppenSSL"};
 	"OpenSSL 0.9.7" ++ _ ->
 	    {skip, "Known renegotiation bug in OppenSSL"};
+	"OpenSSL 1.0.1c" ++ _ -> 
+	    {skip, "Known renegotiation bug in OppenSSL"};
 	_ ->
 	    Config
     end.
 
 check_sane_openssl_sslv2(Config) ->
     case os:cmd("openssl version") of
-	"OpenSSL 1.0.0" ++ _ ->
+	"OpenSSL 1." ++ _ ->
 	    {skip, "sslv2 by default turned of in 1.*"};
 	_ ->
 	    Config
     end.
+
+check_sane_openssl_dsa(Config) ->
+    case os:cmd("openssl version") of
+	"OpenSSL 1.0.1" ++ _ ->
+	    {skip, "known dsa bug in openssl"};
+	_ ->
+	    Config
+    end.