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

Selftest RSA and some fixes.

parent 2fe7c592

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ all: Makefile.ssl sub_all openssl.pc 


sigs:	$(SIGS)

libcrypto.sha1: libcrypto.a

	if echo "$(CFLAG)" | grep " -DFIPS" > /dev/null 2> /dev/null; then \

	if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \

		fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.sha1; \

	fi

fips/des/fingerprint.sha1

+1 −1
Original line number Diff line number Diff line 
SHA1(fips_des_enc.c)= 75389f527cc456178e6a2e35f82bf49f98fe3e90

SHA1(fips_des_selftest.c)= 4165967e54097aab14e6737525c7f34e052d7b16

SHA1(fips_des_selftest.c)= d81ee4db762d89cca749138a99100d342f195665

SHA1(fips_des_locl.h)= a4cf60ca32476a2483b3e4460ec9a19c0444fd20

fips/des/fips_des_selftest.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int FIPS_selftest_des() 
	DES_ecb_encrypt(&tests[n].plaintext,&buf,&key,1);

	if(memcmp(buf,tests[n].ciphertext,sizeof buf))

	    {

	    FIPSerr(FIPS_F_FIPS_SELFTEST_AES,FIPS_R_SELFTEST_FAILED);

	    FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);

	    return 0;

	    }

	}

fips/fingerprint.sha1

+3 −3
Original line number Diff line number Diff line 
SHA1(fips.c)= 3224544013a0115b0e1516f2b4c248b0b7f5e820

SHA1(fips.c)= 8b4edd549ed66fff15c26ef9977c2d47a67f31e8

SHA1(fips_err_wrapper.c)= ad4a2ffa18743c83827de398c811eb6124ba0b27

SHA1(fips.h)= 638e5f4d564fd503a6060bc49567c52fc21d8d10

SHA1(fips_err.h)= 8d9fd3ab3e6ca5297c5714e7f6cd9834e22b4cba
 
SHA1(fips.h)= 1a8bf37b0fb3131640b8dfbf3dcfa6d5fd5ce4a4

SHA1(fips_err.h)= 90926739cc5aa4fa4a3e4746b83783bb079ea248

fips/fips.c

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ int FIPS_selftest() 
    {

    return FIPS_selftest_sha1()

	&& FIPS_selftest_aes()

	&& FIPS_selftest_des();

	&& FIPS_selftest_des()

	&& FIPS_selftest_rsa();

    }



static int FIPS_check_exe(const char *path)