diff options
author | Richard Levitte <levitte@openssl.org> | 2003-09-25 16:24:52 +0400 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2003-09-25 16:24:52 +0400 |
commit | 3b84ce3b6f2c6b83f84ebc2d7fee7373f9c702c4 (patch) | |
tree | 684c34b30b6516106a04acfccac19961c0128d12 /crypto | |
parent | 2667b068a1b5f0324476efda838c83c3f2ad2336 (diff) |
Use OPENSSL_FIPS instead of FIPS.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/aes/aes_core.c | 4 | ||||
-rw-r--r-- | crypto/cryptlib.c | 4 | ||||
-rw-r--r-- | crypto/des/des_enc.c | 4 | ||||
-rw-r--r-- | crypto/dsa/dsa_gen.c | 4 | ||||
-rw-r--r-- | crypto/dsa/dsa_ossl.c | 2 | ||||
-rw-r--r-- | crypto/dsa/dsa_sign.c | 4 | ||||
-rw-r--r-- | crypto/dsa/dsa_vrf.c | 2 | ||||
-rw-r--r-- | crypto/err/err_all.c | 2 | ||||
-rw-r--r-- | crypto/md32_common.h | 2 | ||||
-rw-r--r-- | crypto/rand/md_rand.c | 2 | ||||
-rw-r--r-- | crypto/rand/rand_lib.c | 2 | ||||
-rw-r--r-- | crypto/sha/sha1dgst.c | 6 |
12 files changed, 19 insertions, 19 deletions
diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c index 0b925a8566..ed566a8123 100644 --- a/crypto/aes/aes_core.c +++ b/crypto/aes/aes_core.c @@ -40,7 +40,7 @@ #include <openssl/fips.h> #include "aes_locl.h" -#ifndef FIPS +#ifndef OPENSSL_FIPS /* Te0[x] = S [x].[02, 01, 01, 03]; @@ -1258,4 +1258,4 @@ void AES_decrypt(const unsigned char *in, unsigned char *out, PUTU32(out + 12, s3); } -#endif /* ndef FIPS */ +#endif /* ndef OPENSSL_FIPS */ diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 8fe063ff5e..84c1e6853f 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -66,10 +66,10 @@ static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */ #endif -#ifdef FIPS +#ifdef OPENSSL_FIPS int FIPS_mode; void *FIPS_rand_check; -#endif /* def FIPS */ +#endif /* def OPENSSL_FIPS */ DECLARE_STACK_OF(CRYPTO_dynlock) IMPLEMENT_STACK_OF(CRYPTO_dynlock) diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c index 3ad3c9bc75..21854270c7 100644 --- a/crypto/des/des_enc.c +++ b/crypto/des/des_enc.c @@ -58,7 +58,7 @@ #include "des_locl.h" -#ifndef FIPS +#ifndef OPENSSL_FIPS void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) { @@ -289,7 +289,7 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1, data[1]=r; } -#endif /* ndef FIPS */ +#endif /* ndef OPENSSL_FIPS */ #ifndef DES_DEFAULT_OPTIONS diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c index 0cff5c066d..e307beb3da 100644 --- a/crypto/dsa/dsa_gen.c +++ b/crypto/dsa/dsa_gen.c @@ -80,7 +80,7 @@ #include <openssl/rand.h> #include <openssl/sha.h> -#ifndef FIPS +#ifndef OPENSSL_FIPS DSA *DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len, int *counter_ret, unsigned long *h_ret, @@ -294,6 +294,6 @@ err: if (mont != NULL) BN_MONT_CTX_free(mont); return(ok?ret:NULL); } -#endif /* ndef FIPS */ +#endif /* ndef OPENSSL_FIPS */ #endif /* ndef OPENSSL_NO_SHA */ diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c index f95ffa9fe1..f1a85afcde 100644 --- a/crypto/dsa/dsa_ossl.c +++ b/crypto/dsa/dsa_ossl.c @@ -65,7 +65,7 @@ #include <openssl/rand.h> #include <openssl/asn1.h> -#ifndef FIPS +#ifndef OPENSSL_FIPS static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa); static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp); static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c index 03846e539b..1821adf3d6 100644 --- a/crypto/dsa/dsa_sign.c +++ b/crypto/dsa/dsa_sign.c @@ -71,7 +71,7 @@ DSA_SIG * DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) { -#ifdef FIPS +#ifdef OPENSSL_FIPS if(FIPS_mode && !FIPS_dsa_check(dsa)) return NULL; #endif @@ -95,7 +95,7 @@ int DSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig, int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp) { -#ifdef FIPS +#ifdef OPENSSL_FIPS if(FIPS_mode && !FIPS_dsa_check(dsa)) return 0; #endif diff --git a/crypto/dsa/dsa_vrf.c b/crypto/dsa/dsa_vrf.c index d8728a0ebc..493bdd07cd 100644 --- a/crypto/dsa/dsa_vrf.c +++ b/crypto/dsa/dsa_vrf.c @@ -73,7 +73,7 @@ int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa) { -#ifdef FIPS +#ifdef OPENSSL_FIPS if(FIPS_mode && !FIPS_dsa_check(dsa)) return -1; #endif diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index c8e2dafd93..4dc9300892 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -131,7 +131,7 @@ void ERR_load_crypto_strings(void) ERR_load_OCSP_strings(); ERR_load_UI_strings(); #endif -#ifdef FIPS +#ifdef OPENSSL_FIPS ERR_load_FIPS_strings(); #endif } diff --git a/crypto/md32_common.h b/crypto/md32_common.h index 46603a019d..6fc4467a67 100644 --- a/crypto/md32_common.h +++ b/crypto/md32_common.h @@ -559,7 +559,7 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c) static const unsigned char end[4]={0x80,0x00,0x00,0x00}; const unsigned char *cp=end; -#ifdef FIPS +#ifdef OPENSSL_FIPS if(FIPS_mode && !FIPS_md5_allowed) { FIPSerr(FIPS_F_HASH_FINAL,FIPS_R_NON_FIPS_METHOD); diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index 4fdb7005d3..24e590ab64 100644 --- a/crypto/rand/md_rand.c +++ b/crypto/rand/md_rand.c @@ -333,7 +333,7 @@ static int ssleay_rand_bytes(unsigned char *buf, int num) #endif int do_stir_pool = 0; -#ifdef FIPS +#ifdef OPENSSL_FIPS if(FIPS_mode) { FIPSerr(FIPS_F_SSLEAY_RAND_BYTES,FIPS_R_NON_FIPS_METHOD); diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index 9b6943e07e..869d11cab6 100644 --- a/crypto/rand/rand_lib.c +++ b/crypto/rand/rand_lib.c @@ -87,7 +87,7 @@ int RAND_set_rand_method(const RAND_METHOD *meth) const RAND_METHOD *RAND_get_rand_method(void) { -#ifdef FIPS +#ifdef OPENSSL_FIPS if(FIPS_mode && default_RAND_meth != FIPS_rand_check) { RANDerr(RAND_F_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_METHOD); diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c index 3e5d1e9e7b..de645fc107 100644 --- a/crypto/sha/sha1dgst.c +++ b/crypto/sha/sha1dgst.c @@ -63,18 +63,18 @@ #include <openssl/opensslv.h> -#ifndef FIPS +#ifndef OPENSSL_FIPS const char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT; /* The implementation is in ../md32_common.h */ #include "sha_locl.h" -#else /* ndef FIPS */ +#else /* ndef OPENSSL_FIPS */ static void *dummy=&dummy; -#endif /* ndef FIPS */ +#endif /* ndef OPENSSL_FIPS */ #endif |