diff options
| author | Andy Polyakov <appro@openssl.org> | 2004-05-17 15:49:13 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2004-05-17 15:49:13 +0000 |
| commit | 1ab61a91791e8ddbf95891b44f4cdd50503bc534 (patch) | |
| tree | f1cf09c60c6f1b9d728f05f801fdf21c9de439eb | |
| parent | d6dda126b7921c1067cdc49845e4656c53a5c96b (diff) | |
| download | openssl-1ab61a91791e8ddbf95891b44f4cdd50503bc534.tar.gz | |
Make reservations for FIPS code in HEAD branch, so that the moment FIPS
comes in we have required macros in place.
| -rw-r--r-- | crypto/opensslv.h | 4 | ||||
| -rw-r--r-- | crypto/rand/rand.h | 4 | ||||
| -rw-r--r-- | crypto/sha/sha.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/crypto/opensslv.h b/crypto/opensslv.h index e63b275e46..1dd3280798 100644 --- 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 6f544994ce..ac6c021763 100644 --- 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 aa4c9dd5d7..35c89375a2 100644 --- 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 ! |