Commit 1ab61a91 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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

comes in we have required macros in place.
parent d6dda126
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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


+4 −0
Original line number Diff line number Diff line
@@ -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; */

+4 −0
Original line number Diff line number Diff line
@@ -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 !