From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 6 May 2011 23:47:23 +0000 (+0000)
Subject: Fixes for WIN64 FIPS build.
X-Git-Tag: OpenSSL-fips-2_0-rc1~462
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=4fa3c4c3e9d417f04e2e26f41c45b8cdeab132f4

Fixes for WIN64 FIPS build.
---

diff --git a/ms/do_fips.bat b/ms/do_fips.bat
index 8071fbe06d..4df263c27b 100644
--- a/ms/do_fips.bat
+++ b/ms/do_fips.bat
@@ -31,10 +31,6 @@ goto compile
 
 echo Auto Configuring for IA64
 SET TARGET=VC-WIN64I
-perl ms\uplink.pl win64i > ms\uptable.asm
-if ERRORLEVEL 1 goto error
-ias -o ms\uptable.obj ms\uptable.asm
-if ERRORLEVEL 1 goto error
 
 goto compile
 
@@ -42,13 +38,8 @@ goto compile
 
 echo Auto Configuring for AMD64
 SET TARGET=VC-WIN64A
-perl ms\uplink.pl win64a > ms\uptable.asm
-if ERRORLEVEL 1 goto error
-ml64 -c -Foms\uptable.obj ms\uptable.asm
-if ERRORLEVEL 1 goto error
-
 if x%ASM% == xno-asm goto compile
-SET ASM=ml64
+SET ASM=nasm
 
 :compile