Fix do_fips script.

diff --git a/ms/do_fips.bat b/ms/do_fips.bat
index b1611c47105f33ad9c778329ea8562d0436bfbea..8071fbe06d72df4d06ca8e78d67cd974ab89b4af 100644 (file)
--- a/ms/do_fips.bat
+++ b/ms/do_fips.bat
@@ -22,6 +22,8 @@ echo Processor Architecture Unrecognized: defaulting to X86
 echo Auto Configuring for X86
 
 SET TARGET=VC-WIN32
+if x%ASM% == xno-asm goto compile
+SET ASM=nasm
 
 goto compile
 
@@ -45,6 +47,9 @@ 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
+
 :compile
 
 perl Configure %TARGET% fipscanisteronly
@@ -57,11 +62,6 @@ perl util\mkfiles.pl >MINFO
 perl util\mk1mf.pl dll %ASM% %TARGET% >ms\ntdll.mak
 @if ERRORLEVEL 1 goto error
 
-perl util\mkdef.pl 32 libeay > ms\libeay32.def
-@if ERRORLEVEL 1 goto error
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
-@if ERRORLEVEL 1 goto error
-
 nmake -f ms\ntdll.mak clean
 nmake -f ms\ntdll.mak
 @if ERRORLEVEL 1 goto error