summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-06-22 12:30:18 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-06-22 12:30:18 +0000
commitce02589259c4eecf5479d6d5714d8caee7b5e326 (patch)
tree7477803fa00800e44d494f58c3f51c6aae409906 /crypto
parent93dd7d3848d750f25137cd08ebde7bc06706c13d (diff)
Now the FIPS capable OpenSSL is available simplify the various FIPS test
build options. All fispcanisterbuild builds only build fipscanister.o and include symbol renaming. Move all renamed symbols to fipssyms.h Update README.FIPS
Diffstat (limited to 'crypto')
-rw-r--r--crypto/arm_arch.h2
-rw-r--r--crypto/crypto.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index db7047cc05..82401add19 100644
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -35,7 +35,7 @@
# endif
# endif
-#ifdef OPENSSL_FIPSSYMS
+#ifdef OPENSSL_FIPSCANISTERBUILD
#include <openssl/fipssyms.h>
#endif
diff --git a/crypto/crypto.h b/crypto/crypto.h
index 8fd2fe2ea9..64fbfe02ee 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -147,7 +147,7 @@
* non-FIPS OpenSSL.
*/
-#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSSYMS)
+#if defined(OPENSSL_FIPSCANISTER)
#include <openssl/fipssyms.h>
#endif