Commit fa57af81 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make WIN32 build work with fipscanisterbuild option. Update ordinals and 

fix warning.
parent 5ae2774b

fips-1.0/rsa/fips_rsa_sign.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ int FIPS_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len, 
	/* Compare, DigestInfo length, DigestInfo header and finally

	 * digest value itself

	 */

	if ((i != (dlen + m_len)) || memcmp(der, s, dlen)

	if ((i != (int)(dlen + m_len)) || memcmp(der, s, dlen)

		|| memcmp(s + dlen, m, m_len))

		{

		RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);

util/libeay.num

+2 −0
Original line number Diff line number Diff line
@@ -2905,3 +2905,5 @@ SHA384_Init 3737 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA 
SHA384_Final                            3740	EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512

SHA384                                  3745	EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512

SHA256_Update                           3765	EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256

FIPS_rsa_sign                           3766	EXIST:OPENSSL_FIPS:FUNCTION:RSA

FIPS_rsa_verify                         3767	EXIST:OPENSSL_FIPS:FUNCTION:RSA

util/mk1mf.pl

+2 −1
Original line number Diff line number Diff line
@@ -1184,8 +1184,9 @@ sub read_options 
				}

			}

		}

	elsif (/^--fipscanisterbuild$/)

	elsif (/^fipscanisterbuild$/)

		{

		$fips=1;

		$fipscanisterbuild=1;

		}

	elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }

util/mkdef.pl

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ foreach (@ARGV, split(/ /, $options)) 
	$VMS=1 if $_ eq "VMS";

	$OS2=1 if $_ eq "OS2";

	$fips=1 if $_ eq "fips";

	$fips=1 if $_ eq "fipscanisterbuild";



	$do_ssl=1 if $_ eq "ssleay";

	if ($_ eq "ssl") {