From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 26 Mar 2016 15:00:53 +0000 (+0000)
Subject: Fix FIPS SSLv2 test
X-Git-Tag: OpenSSL_1_0_2h~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=21211ade53f92629250bbea5e37d9179a31d3be2;p=oweals%2Fopenssl.git

Fix FIPS SSLv2 test

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/test/testfipsssl b/test/testfipsssl
index c4836edc25..b8bbb25936 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