1 files changed, 79 insertions, 71 deletions

diff --git a/src/lib/libssl/src/ms/do_nasm.bat b/src/lib/libssl/src/ms/do_nasm.bat
index 270dab0058..7a2fa45663 100644
--- a/src/lib/libssl/src/ms/do_nasm.bat
+++ b/src/lib/libssl/src/ms/do_nasm.bat
@@ -1,71 +1,79 @@
-rem use "fips" as the first argument to make a proper FIPS build.

-

-@echo off

-echo Generating x86 for NASM assember

-

-echo Bignum

-cd crypto\bn\asm

-perl x86.pl win32n > bn_win32.asm

-cd ..\..\..

-

-echo DES

-cd crypto\des\asm

-perl des-586.pl win32n > d_win32.asm

-cd ..\..\..

-

-echo "crypt(3)"

-

-cd crypto\des\asm

-perl crypt586.pl win32n > y_win32.asm

-cd ..\..\..

-

-echo Blowfish

-

-cd crypto\bf\asm

-perl bf-586.pl win32n > b_win32.asm

-cd ..\..\..

-

-echo CAST5

-cd crypto\cast\asm

-perl cast-586.pl win32n > c_win32.asm

-cd ..\..\..

-

-echo RC4

-cd crypto\rc4\asm

-perl rc4-586.pl win32n > r4_win32.asm

-cd ..\..\..

-

-echo MD5

-cd crypto\md5\asm

-perl md5-586.pl win32n > m5_win32.asm

-cd ..\..\..

-

-echo SHA1

-cd crypto\sha\asm

-perl sha1-586.pl win32n > s1_win32.asm

-cd ..\..\..

-

-echo RIPEMD160

-cd crypto\ripemd\asm

-perl rmd-586.pl win32n > rm_win32.asm

-cd ..\..\..

-

-echo RC5\32

-cd crypto\rc5\asm

-perl rc5-586.pl win32n > r5_win32.asm

-cd ..\..\..

-

-echo on

-

-perl util\mkfiles.pl >MINFO

-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 %1 > ms\libeay16.def

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

-perl util\mkdef.pl 16 ssleay %1 > ms\ssleay16.def

-perl util\mkdef.pl 32 ssleay %1 > ms\ssleay32.def

+
+@echo off
+
+SET ASMOPTS=-DOPENSSL_IA32_SSE2
+echo Generating x86 for NASM assember
+
+echo Bignum
+cd crypto\bn\asm
+perl bn-586.pl win32n %ASMOPTS% > bn_win32.asm
+perl co-586.pl win32n %ASMOPTS% > co_win32.asm
+cd ..\..\..
+
+echo AES
+cd crypto\aes\asm
+perl aes-586.pl win32n %ASMOPTS% > a_win32.asm
+cd ..\..\..
+
+echo DES
+cd crypto\des\asm
+perl des-586.pl win32n %ASMOPTS% > d_win32.asm
+cd ..\..\..
+
+echo "crypt(3)"
+
+cd crypto\des\asm
+perl crypt586.pl win32n %ASMOPTS% > y_win32.asm
+cd ..\..\..
+
+echo Blowfish
+
+cd crypto\bf\asm
+perl bf-586.pl win32n %ASMOPTS% > b_win32.asm
+cd ..\..\..
+
+echo CAST5
+cd crypto\cast\asm
+perl cast-586.pl win32n %ASMOPTS% > c_win32.asm
+cd ..\..\..
+
+echo RC4
+cd crypto\rc4\asm
+perl rc4-586.pl win32n %ASMOPTS% > r4_win32.asm
+cd ..\..\..
+
+echo MD5
+cd crypto\md5\asm
+perl md5-586.pl win32n %ASMOPTS% > m5_win32.asm
+cd ..\..\..
+
+echo SHA1
+cd crypto\sha\asm
+perl sha1-586.pl win32n %ASMOPTS% > s1_win32.asm
+perl sha512-sse2.pl win32n %ASMOPTS% > sha512-sse2.asm
+cd ..\..\..
+
+echo RIPEMD160
+cd crypto\ripemd\asm
+perl rmd-586.pl win32n %ASMOPTS% > rm_win32.asm
+cd ..\..\..
+
+echo RC5\32
+cd crypto\rc5\asm
+perl rc5-586.pl win32n %ASMOPTS% > r5_win32.asm
+cd ..\..\..
+
+echo CPU-ID
+cd crypto
+perl x86cpuid.pl win32n %ASMOPTS% > cpu_win32.asm
+cd ..
+
+echo on
+
+perl util\mkfiles.pl >MINFO
+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
+
+perl util\mkdef.pl 32 libeay > ms\libeay32.def
+perl util\mkdef.pl 32 ssleay > ms\ssleay32.def