summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-07-22 14:20:50 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-07-22 14:20:50 +0000
commit1d5121552d9bbe8c03f4550ba8bbac72202cee7a (patch)
tree0fceea0fe0a5d2a632cd2d621c97cddebb49639f
parent057037e7197521722432260d42e96fc5bd4ec9c0 (diff)
Make sure OPENSSL_FIPSCANISTER is visible to ARM assembly language files.
-rwxr-xr-xConfigure1
-rw-r--r--crypto/arm_arch.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/Configure b/Configure
index 885970b898..8b5efd6b1b 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 15027ed3de..861e3def9e 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