diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-02-09 10:52:04 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-02-09 10:52:04 +0100 |
| commit | 4408f9f30a48fca6d51ecef6ba92ef2978f59e92 (patch) | |
| tree | 2fdffd11cbe21c286996cc49fdf8400831f74cb5 /lib/ssl/test/ssl_to_openssl_SUITE.erl | |
| parent | 512367e87f76f05b43e9ddc1c4e4c0fe7bd099d1 (diff) | |
| parent | 2907d80221da3455137aaabe92aad77411113e84 (diff) | |
| download | otp-4408f9f30a48fca6d51ecef6ba92ef2978f59e92.tar.gz otp-4408f9f30a48fca6d51ecef6ba92ef2978f59e92.tar.bz2 otp-4408f9f30a48fca6d51ecef6ba92ef2978f59e92.zip | |
Merge branch 'maint'
* maint:
User defined verify_fun is now called correctly
Do not test sslv2 rejection with openssl-1.*
Diffstat (limited to 'lib/ssl/test/ssl_to_openssl_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 6 |
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. |