aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-02-09 10:50:13 +0100
committerIngela Anderton Andin <[email protected]>2012-02-09 10:50:13 +0100
commit2907d80221da3455137aaabe92aad77411113e84 (patch)
tree6d4b6dcfa5c7108bd0fef5e6895d594de262925c
parentdc2073a096f15bfc170454518b5d4b2afc129401 (diff)
parent9574407155cb33f1c35fc94b3534617c7f7fdf25 (diff)
downloadotp-2907d80221da3455137aaabe92aad77411113e84.tar.gz
otp-2907d80221da3455137aaabe92aad77411113e84.tar.bz2
otp-2907d80221da3455137aaabe92aad77411113e84.zip
Merge branch 'ia/ssl/test-maint/reject-sslv2-test' into maint
* ia/ssl/test-maint/reject-sslv2-test: Do not test sslv2 rejection with openssl-1.*
-rw-r--r--lib/ssl/test/ssl_to_openssl_SUITE.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index f04ab9af50..01fca1f166 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -1446,8 +1446,8 @@ check_sane_openssl_renegotaite(Config) ->
check_sane_openssl_sslv2(Config) ->
case os:cmd("openssl version") of
- "OpenSSL 1.0.0e" ++ _ ->
- {skip, "Known option bug"};
+ "OpenSSL 1.0.0" ++ _ ->
+ {skip, "sslv2 by default turned of in 1.*"};
_ ->
Config
end.