Make reservations for FIPS code in HEAD branch, so that the moment FIPS

comes in we have required macros in place.

diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index e63b275e46f495338ab69d68f6b9a1d15c74d70c..1dd3280798a891f81480c7405c0494f6178a30ec 100644 (file)
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -26,7 +26,11 @@
  *  major minor fix final patch/beta)
  */
 #define OPENSSL_VERSION_NUMBER 0x00908000L
+#ifdef OPENSSL_FIPS
+#define OPENSSL_VERSION_TEXT   "OpenSSL 0.9.8-fips-dev XX xxx XXXX"
+#else
 #define OPENSSL_VERSION_TEXT   "OpenSSL 0.9.8-dev XX xxx XXXX"
+#endif
 #define OPENSSL_VERSION_PTEXT  " part of " OPENSSL_VERSION_TEXT
 
 

diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 6f544994ce2ed3a31cac921a2ff5632daad28248..ac6c0217636f14d0af801360ae7b0b7ac46fb571 100644 (file)
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -71,6 +71,10 @@
 extern "C" {
 #endif
 
+#if defined(OPENSSL_FIPS)
+#define FIPS_RAND_SIZE_T size_t
+#endif
+
 /* Already defined in ossl_typ.h */
 /* typedef struct rand_meth_st RAND_METHOD; */
 

diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h
index aa4c9dd5d708afa39763a59255882fec4481b427..35c89375a2538e21a4248b7570507b78b56906f9 100644 (file)
--- a/crypto/sha/sha.h
+++ b/crypto/sha/sha.h
@@ -69,6 +69,10 @@ extern "C" {
 #error SHA is disabled.
 #endif
 
+#if defined(OPENSSL_FIPS)
+#define FIPS_SHA_SIZE_T size_t
+#endif
+
 /*
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !