Make reservations for FIPS code in HEAD branch, so that the moment FIPS
comes in we have required macros in place.
This commit is contained in:
parent
d6dda126b7
commit
1ab61a9179
@ -26,7 +26,11 @@
|
|||||||
* major minor fix final patch/beta)
|
* major minor fix final patch/beta)
|
||||||
*/
|
*/
|
||||||
#define OPENSSL_VERSION_NUMBER 0x00908000L
|
#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"
|
#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8-dev XX xxx XXXX"
|
||||||
|
#endif
|
||||||
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
||||||
|
|
||||||
|
|
||||||
|
@ -71,6 +71,10 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(OPENSSL_FIPS)
|
||||||
|
#define FIPS_RAND_SIZE_T size_t
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Already defined in ossl_typ.h */
|
/* Already defined in ossl_typ.h */
|
||||||
/* typedef struct rand_meth_st RAND_METHOD; */
|
/* typedef struct rand_meth_st RAND_METHOD; */
|
||||||
|
|
||||||
|
@ -69,6 +69,10 @@ extern "C" {
|
|||||||
#error SHA is disabled.
|
#error SHA is disabled.
|
||||||
#endif
|
#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 !
|
* ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
|
||||||
|
Loading…
x
Reference in New Issue
Block a user