Make sure OPENSSL_FIPSCANISTER is visible to ARM assembly language files.

diff --git a/Configure b/Configure
index 885970b898e1d96b647cc63c49aaf92b687870be..8b5efd6b1be154e1c84e4d7aa3a8f9313eed9e30 100755 (executable)
--- 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 15027ed3de3c0ae5d1c40c31bb311445934d9d5a..861e3def9e48ebfa2dfaef870199d0ae918b162b 100644 (file)
--- 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