Commit 3b84ce3b authored by Richard Levitte's avatar Richard Levitte
Browse files

Use OPENSSL_FIPS instead of FIPS.

parent 2667b068

Configure

+0 −1
Original line number Diff line number Diff line
@@ -1151,7 +1151,6 @@ $bn_obj = $bn_asm unless $bn_obj ne ""; 
if ($fips)

	{

	$des_obj=$sha1_obj="";

	$cflags.=" -DFIPS";

	}

$des_obj=$des_enc	unless (!$fips && $des_obj =~ /\.o$/);

$bf_obj=$bf_enc		unless ($bf_obj =~ /\.o$/);

crypto/aes/aes_core.c

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

crypto/cryptlib.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

crypto/des/des_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -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

crypto/dsa/dsa_gen.c

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