Commit d3a15e13 authored by Ben Laurie's avatar Ben Laurie
Browse files

Build when not FIPS.

parent 47954f11

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ LIBKRB5= 
# we might set SHLIB_MARK to '$(SHARED_LIBS)'.

SHLIB_MARK=



DIRS=   fips crypto ssl $(SHLIB_MARK) apps test tools

DIRS=   crypto fips ssl $(SHLIB_MARK) apps test tools

SHLIBDIRS= fips crypto ssl



# dirs in crypto to build

fips/aes/fips_aesavs.c

+2 −0
Original line number Diff line number Diff line
@@ -836,7 +836,9 @@ int main(int argc, char **argv) 
  exit(0);

  */



#ifdef FIPS

  FIPS_mode_set(1);

#endif

  ERR_load_crypto_strings();

  if (argc > 1)

    {

fips/dsa/fips_dsa_ossl.c

+8 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
#endif

#include <openssl/fips.h>



#ifdef 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,
@@ -364,3 +366,9 @@ static int dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p, 
{

	return BN_mod_exp_mont(r, a, p, m, ctx, m_ctx);

}



#else /* ndef FIPS */



static void *dummy=&dummy;



#endif /* ndef FIPS */

fips/dsa/fips_dsatest.c

+2 −1
Original line number Diff line number Diff line
@@ -143,8 +143,9 @@ int main(int argc, char **argv) 
	unsigned char sig[256];

	unsigned int siglen;



#ifdef FIPS

	FIPS_mode_set(1);



#endif

	if (bio_err == NULL)

		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);

fips/fips_check_sha1

+2 −1
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ 
FP=$1

shift



$TOP/fips/sha1/fips_standalone_sha1 $@ | diff -u $FP -

egrep '^CFLAG=.*-DFIPS ' $TOP/Makefile || exit 0



$TOP/fips/sha1/fips_standalone_sha1 $@ | diff -u $FP -