[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_1-stable has been updated
       via  f4bed7c7b6fe8459dbc14e28f91c6150013b9c5e (commit)
      from  f16080718e4756ac1269c90f837263c5cd8dc412 (commit)


- Log -----------------------------------------------------------------
commit f4bed7c7b6fe8459dbc14e28f91c6150013b9c5e
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 26 15:00:53 2016 +0000

    Fix FIPS SSLv2 test
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
    (cherry picked from commit 21211ade53f92629250bbea5e37d9179a31d3be2)

-----------------------------------------------------------------------

Summary of changes:
 test/testfipsssl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/testfipsssl b/test/testfipsssl
index c4836ed..b8bbb25 100644
--- a/test/testfipsssl
+++ b/test/testfipsssl
@@ -38,8 +38,12 @@ fi
 echo test ssl3 is forbidden in FIPS mode
 $ssltest -ssl3 $extra && exit 1
 
-echo test ssl2 is forbidden in FIPS mode
-$ssltest -ssl2 $extra && exit 1
+if ../util/shlib_wrap.sh ../apps/openssl ciphers SSLv2 >/dev/null 2>&1; then
+    echo test ssl2 is forbidden in FIPS mode
+    $ssltest -ssl2 $extra && exit 1
+else
+    echo ssl2 disabled: skipping test
+fi
 
 echo test tls1
 $ssltest -tls1 $extra || exit 1