X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=ms%2Fdo_fips.bat;h=a78fc2515dfc24651fad32a422512983faa8c2d4;hp=8071fbe06d72df4d06ca8e78d67cd974ab89b4af;hb=1f77a27c16558b9e619b471d19da8094c9140eb5;hpb=2e2a962aaddd84667c43007dca67acb6a46dc929

diff --git a/ms/do_fips.bat b/ms/do_fips.bat
index 8071fbe06d..a78fc2515d 100644
--- a/ms/do_fips.bat
+++ b/ms/do_fips.bat
@@ -1,6 +1,7 @@
 @echo off
 
 SET ASM=%1
+SET EXARG=
 
 if NOT X%PROCESSOR_ARCHITECTURE% == X goto defined 
 
@@ -31,10 +32,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,17 +39,13 @@ 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
 
-perl Configure %TARGET% fipscanisteronly
+if x%ASM% == xno-asm SET EXARG=no-asm
+perl Configure %TARGET% %EXARG% fipscheck
 pause
 
 echo on
@@ -64,6 +57,7 @@ perl util\mk1mf.pl dll %ASM% %TARGET% >ms\ntdll.mak
 
 nmake -f ms\ntdll.mak clean
 nmake -f ms\ntdll.mak
+nmake -f ms\ntdll.mak install
 @if ERRORLEVEL 1 goto error
 
 @echo.