Make reservations for FIPS code in HEAD branch, so that the moment FIPS
authorAndy Polyakov <appro@openssl.org>
Mon, 17 May 2004 15:49:13 +0000 (15:49 +0000)
committerAndy Polyakov <appro@openssl.org>
Mon, 17 May 2004 15:49:13 +0000 (15:49 +0000)
comes in we have required macros in place.

crypto/opensslv.h
crypto/rand/rand.h
crypto/sha/sha.h

index e63b275..1dd3280 100644 (file)
  *  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
 
 
index 6f54499..ac6c021 100644 (file)
 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; */
 
index aa4c9dd..35c8937 100644 (file)
@@ -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 !