aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_to_openssl_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-06-11 15:59:32 +0200
committerIngela Anderton Andin <[email protected]>2012-06-12 11:41:57 +0200
commitf88ec275329908b017ae731f8e4ca11d862a9243 (patch)
tree7a41dea812aa54c3da770641d99ca81d9cc06fee /lib/ssl/test/ssl_to_openssl_SUITE.erl
parent06260ce858582aa0319a4ad9768291bd51f63505 (diff)
downloadotp-f88ec275329908b017ae731f8e4ca11d862a9243.tar.gz
otp-f88ec275329908b017ae731f8e4ca11d862a9243.tar.bz2
otp-f88ec275329908b017ae731f8e4ca11d862a9243.zip
ssl: Test case fixes
Diffstat (limited to 'lib/ssl/test/ssl_to_openssl_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_to_openssl_SUITE.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 8197e14b64..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),
@@ -603,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) ++
@@ -1443,7 +1444,7 @@ 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" ++ _ ->
+ "OpenSSL 1.0.1c" ++ _ ->
{skip, "Known renegotiation bug in OppenSSL"};
_ ->
Config