From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 22 Jul 2011 14:20:50 +0000 (+0000)
Subject: Make sure OPENSSL_FIPSCANISTER is visible to ARM assembly language files.
X-Git-Tag: OpenSSL-fips-2_0-rc1~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d5121552d9bbe8c03f4550ba8bbac72202cee7a;p=thirdparty%2Fopenssl.git

Make sure OPENSSL_FIPSCANISTER is visible to ARM assembly language files.
---

diff --git a/Configure b/Configure
index 885970b898e..8b5efd6b1be 100755
--- a/Configure
+++ b/Configure
@@ -1518,6 +1518,7 @@ if ($fips)
 	if ($fipscanisterinternal eq "y")
 		{
 		$openssl_other_defines.="#define OPENSSL_FIPSCANISTER\n";
+		$cflags = "-DOPENSSL_FIPSCANISTER $cflags";
 		}
 	}
 
diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index 15027ed3de3..861e3def9e4 100644
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -35,7 +35,7 @@
 #  endif
 # endif
 
-#ifdef OPENSSL_FIPSCANISTERBUILD
+#ifdef OPENSSL_FIPSCANISTER
 #include <openssl/fipssyms.h>
 #endif