Commit c1b971d5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make the Windows/DOS build system understand "fips".

parent 640d212a

INSTALL.W32

+9 −4
Original line number Diff line number Diff line
@@ -46,12 +46,13 @@ 
 http://www.kernel.org/pub/software/devel/nasm/binaries/win32/

 The NASM binary nasmw.exe needs to be installed anywhere on your PATH.



 Firstly you should run Configure:

 Firstly you should run Configure (to build a FIPS-certified variant of

 OpenSSL, add the option "fips"):



 > perl Configure VC-WIN32



 Next you need to build the Makefiles and optionally the assembly language

 files:

 files (to build a FIPS-certified variant of OpenSSL, add the argument "fips"):



 - If you are using MASM then run:
@@ -100,10 +101,12 @@ 
 Borland C++ builder 5

 ---------------------



 * Configure for building with Borland Builder:

 * Configure for building with Borland Builder (to build a FIPS-certified

   variant of OpenSSL, add the option "fips"):

   > perl Configure BC-32



 * Create the appropriate makefile

 * Create the appropriate makefile (to build a FIPS-certified variant of

   OpenSSL, add the argument "fips")

   > ms\do_nasm



 * Build
@@ -194,6 +197,8 @@ 
   occur, try

   > ms\mingw32 no-asm

   instead.

   If you want to build a FIPS-certified variant of OpenSSL, add the argument

   "fips"



   libcrypto.a and libssl.a are the static libraries. To use the DLLs,

   link with libeay32.a and libssl32.a instead.

ms/do_masm.bat

+7 −5
Original line number Diff line number Diff line 
rem use "fips" as the first argument to make a proper FIPS build.



@echo off

echo Generating x86 for MASM assember
@@ -56,11 +58,11 @@ cd ..\..\.. 
echo on



perl util\mkfiles.pl >MINFO

rem perl util\mk1mf.pl VC-MSDOS no-sock >ms\msdos.mak

rem perl util\mk1mf.pl VC-W31-32 >ms\w31.mak

perl util\mk1mf.pl dll VC-W31-32 >ms\w31dll.mak

perl util\mk1mf.pl VC-WIN32 >ms\nt.mak

perl util\mk1mf.pl dll VC-WIN32 >ms\ntdll.mak

rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak

rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak

perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak

perl util\mk1mf.pl %1 VC-WIN32 >ms\nt.mak

perl util\mk1mf.pl dll %1 VC-WIN32 >ms\ntdll.mak



perl util\mkdef.pl 16 libeay > ms\libeay16.def

perl util\mkdef.pl 32 libeay > ms\libeay32.def

ms/do_ms.bat

+7 −7
Original line number Diff line number Diff line 


perl util\mkfiles.pl >MINFO

rem perl util\mk1mf.pl VC-MSDOS no-sock >ms\msdos.mak

rem perl util\mk1mf.pl VC-W31-32 >ms\w31.mak

perl util\mk1mf.pl dll VC-W31-32 >ms\w31dll.mak

perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak

perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak

perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak

perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak

rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak

rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak

perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak

perl util\mk1mf.pl no-asm %1 VC-WIN32 >ms\nt.mak

perl util\mk1mf.pl dll no-asm %1 VC-WIN32 >ms\ntdll.mak

perl util\mk1mf.pl no-asm %1 VC-CE >ms\ce.mak

perl util\mk1mf.pl dll no-asm %1 VC-CE >ms\cedll.mak



perl util\mkdef.pl 16 libeay > ms\libeay16.def

perl util\mkdef.pl 32 libeay > ms\libeay32.def

ms/do_nasm.bat

+7 −6
Original line number Diff line number Diff line 
rem use "fips" as the first argument to make a proper FIPS build.



@echo off

echo Generating x86 for NASM assember
@@ -57,12 +58,12 @@ cd ..\..\.. 
echo on



perl util\mkfiles.pl >MINFO

rem perl util\mk1mf.pl VC-MSDOS no-sock >ms\msdos.mak

rem perl util\mk1mf.pl VC-W31-32 >ms\w31.mak

perl util\mk1mf.pl dll VC-W31-32 >ms\w31dll.mak

perl util\mk1mf.pl nasm VC-WIN32 >ms\nt.mak

perl util\mk1mf.pl dll nasm VC-WIN32 >ms\ntdll.mak

perl util\mk1mf.pl nasm BC-NT >ms\bcb.mak

rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak

rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak

perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak

perl util\mk1mf.pl nasm %1 VC-WIN32 >ms\nt.mak

perl util\mk1mf.pl dll nasm %1 VC-WIN32 >ms\ntdll.mak

perl util\mk1mf.pl nasm %1 BC-NT >ms\bcb.mak



perl util\mkdef.pl 16 libeay > ms\libeay16.def

perl util\mkdef.pl 32 libeay > ms\libeay32.def

ms/do_nt.bat

+2 −2
Original line number Diff line number Diff line 


perl util\mkfiles.pl >MINFO

perl util\mk1mf.pl no-asm VC-NT >ms\nt.mak

perl util\mk1mf.pl dll no-asm VC-NT >ms\ntdll.mak

perl util\mk1mf.pl no-asm %1 VC-NT >ms\nt.mak

perl util\mk1mf.pl dll no-asm %1 VC-NT >ms\ntdll.mak



perl util\mkdef.pl libeay NT > ms\libeay32.def

perl util\mkdef.pl ssleay NT > ms\ssleay32.def