Make WIN32 build work with fipscanisterbuild option. Update ordinals and

fix warning.

diff --git a/fips-1.0/rsa/fips_rsa_sign.c b/fips-1.0/rsa/fips_rsa_sign.c
index df1ca2de5d2c36737be1adff8c81c4fdf803984e..7088357dbf45c2c5d1dfe690409373036605c555 100644 (file)
--- 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 4222bef6d6c52c1ba32296401b0aea349d971257..145e601d057b1993d07751d6bd043659f3e42802 100755 (executable)
--- 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 19cb9591f98f30d0e2ec7100686dfd088f88abe2..f13842930c1ad2715e287fc6bc46c0dd2008aaf7 100755 (executable)
--- 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 6c1e53bb1466316c69be93f45fbb7b0b7656c5fc..27d999bf7b79ef79ffccdcbbd1a9ef82e9c6f300 100755 (executable)
--- 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") {