summaryrefslogtreecommitdiffstats
path: root/crypto/crypto.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-01-27 20:10:56 +0100
committerDr. Stephen Henson <steve@openssl.org>2011-01-27 20:10:56 +0100
commit7edfe6745670d2f4d53d96f268f2dba11326a51c (patch)
tree781e222d8af65fec366d3af0d132022a62c95435 /crypto/crypto.h
parentadd .cvsignore (diff)
downloadopenssl-7edfe6745670d2f4d53d96f268f2dba11326a51c.tar.xz
openssl-7edfe6745670d2f4d53d96f268f2dba11326a51c.zip
Move all FIPSAPI renames into fips.h header file, include early in
crypto.h if needed. Modify source tree to handle change.
Diffstat (limited to 'crypto/crypto.h')
-rw-r--r--crypto/crypto.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/crypto.h b/crypto/crypto.h
index 5089c65882..938c2bc144 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -125,6 +125,11 @@
#include <stdio.h>
#endif
+/* Get FIPS renames if needed */
+#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSAPI)
+#include <openssl/fips.h>
+#endif
+
#include <openssl/stack.h>
#include <openssl/safestack.h>
#include <openssl/opensslv.h>