From fa57af81a18e3156edd0f49371ad1a29455cd8be Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Fri, 26 Jan 2007 14:25:30 +0000
Subject: [PATCH] Make WIN32 build work with fipscanisterbuild option. Update
 ordinals and fix warning.

---
 fips-1.0/rsa/fips_rsa_sign.c | 2 +-
 util/libeay.num              | 2 ++
 util/mk1mf.pl                | 3 ++-
 util/mkdef.pl                | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fips-1.0/rsa/fips_rsa_sign.c b/fips-1.0/rsa/fips_rsa_sign.c
index df1ca2de5d..7088357dbf 100644
--- a/fips-1.0/rsa/fips_rsa_sign.c
+++ b/fips-1.0/rsa/fips_rsa_sign.c
@@ -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);
diff --git a/util/libeay.num b/util/libeay.num
index 4222bef6d6..145e601d05 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -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
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 19cb9591f9..f13842930c 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1184,8 +1184,9 @@ sub read_options
 				}
 			}
 		}
-	elsif (/^--fipscanisterbuild$/)
+	elsif (/^fipscanisterbuild$/)
 		{
+		$fips=1;
 		$fipscanisterbuild=1;
 		}
 	elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 6c1e53bb14..27d999bf7b 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -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") {
-- 
2.25.1