Update FAQ.

[openssl.git] / ms / do_fips.bat

diff --git a/ms/do_fips.bat b/ms/do_fips.bat
index b1611c47105f33ad9c778329ea8562d0436bfbea..73b0a3e8e47e6eb96a5757103a0958f5126aa997 100644 (file)
--- 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 
 
@@ -22,6 +23,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
 
@@ -29,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
 
@@ -40,14 +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=nasm
 
 :compile
 
-perl Configure %TARGET% fipscanisteronly
+if x%ASM% == xno-asm SET EXARG=no-asm
+perl Configure %TARGET% %EXARG% fipscheck
 pause
 
 echo on
@@ -57,14 +55,11 @@ 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
+nmake -f ms\ntdll.mak install
+@if ERRORLEVEL 1 goto error
 
 @echo.
 @echo.