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

Use underscores instead of dashes in temporary file names. 

This is due to weird Borland compilers.
Part of PR 123
parent fb96d9d9

ms/do_masm.bat

+10 −10
Original line number Diff line number Diff line
@@ -3,54 +3,54 @@ echo Generating x86 for MASM assember 


echo Bignum

cd crypto\bn\asm

perl x86.pl win32 > bn-win32.asm

perl x86.pl win32 > bn_win32.asm

cd ..\..\..



echo DES

cd crypto\des\asm

perl des-586.pl win32 > d-win32.asm

perl des-586.pl win32 > d_win32.asm

cd ..\..\..



echo "crypt(3)"



cd crypto\des\asm

perl crypt586.pl win32 > y-win32.asm

perl crypt586.pl win32 > y_win32.asm

cd ..\..\..



echo Blowfish



cd crypto\bf\asm

perl bf-586.pl win32 > b-win32.asm

perl bf-586.pl win32 > b_win32.asm

cd ..\..\..



echo CAST5

cd crypto\cast\asm

perl cast-586.pl win32 > c-win32.asm

perl cast-586.pl win32 > c_win32.asm

cd ..\..\..



echo RC4

cd crypto\rc4\asm

perl rc4-586.pl win32 > r4-win32.asm

perl rc4-586.pl win32 > r4_win32.asm

cd ..\..\..



echo MD5

cd crypto\md5\asm

perl md5-586.pl win32 > m5-win32.asm

perl md5-586.pl win32 > m5_win32.asm

cd ..\..\..



echo SHA1

cd crypto\sha\asm

perl sha1-586.pl win32 > s1-win32.asm

perl sha1-586.pl win32 > s1_win32.asm

cd ..\..\..



echo RIPEMD160

cd crypto\ripemd\asm

perl rmd-586.pl win32 > rm-win32.asm

perl rmd-586.pl win32 > rm_win32.asm

cd ..\..\..



echo RC5\32

cd crypto\rc5\asm

perl rc5-586.pl win32 > r5-win32.asm

perl rc5-586.pl win32 > r5_win32.asm

cd ..\..\..



echo on

ms/do_nasm.bat

+11 −10
Original line number Diff line number Diff line
@@ -4,54 +4,54 @@ echo Generating x86 for NASM assember 


echo Bignum

cd crypto\bn\asm

perl x86.pl win32n > bn-win32.asm

perl x86.pl win32n > bn_win32.asm

cd ..\..\..



echo DES

cd crypto\des\asm

perl des-586.pl win32n > d-win32.asm

perl des-586.pl win32n > d_win32.asm

cd ..\..\..



echo "crypt(3)"



cd crypto\des\asm

perl crypt586.pl win32n > y-win32.asm

perl crypt586.pl win32n > y_win32.asm

cd ..\..\..



echo Blowfish



cd crypto\bf\asm

perl bf-586.pl win32n > b-win32.asm

perl bf-586.pl win32n > b_win32.asm

cd ..\..\..



echo CAST5

cd crypto\cast\asm

perl cast-586.pl win32n > c-win32.asm

perl cast-586.pl win32n > c_win32.asm

cd ..\..\..



echo RC4

cd crypto\rc4\asm

perl rc4-586.pl win32n > r4-win32.asm

perl rc4-586.pl win32n > r4_win32.asm

cd ..\..\..



echo MD5

cd crypto\md5\asm

perl md5-586.pl win32n > m5-win32.asm

perl md5-586.pl win32n > m5_win32.asm

cd ..\..\..



echo SHA1

cd crypto\sha\asm

perl sha1-586.pl win32n > s1-win32.asm

perl sha1-586.pl win32n > s1_win32.asm

cd ..\..\..



echo RIPEMD160

cd crypto\ripemd\asm

perl rmd-586.pl win32n > rm-win32.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

perl rc5-586.pl win32n > r5_win32.asm

cd ..\..\..



echo on
@@ -62,6 +62,7 @@ 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



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

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

util/pl/BC-32.pl

+18 −18
Original line number Diff line number Diff line
@@ -64,24 +64,24 @@ $bf_enc_src=''; 


if (!$no_asm)

	{

	$bn_mulw_obj='crypto\bn\asm\bn-win32.obj';

	$bn_mulw_src='crypto\bn\asm\bn-win32.asm';

	$des_enc_obj='crypto\des\asm\d-win32.obj crypto\des\asm\y-win32.obj';

	$des_enc_src='crypto\des\asm\d-win32.asm crypto\des\asm\y-win32.asm';

	$bf_enc_obj='crypto\bf\asm\b-win32.obj';

	$bf_enc_src='crypto\bf\asm\b-win32.asm';

	$cast_enc_obj='crypto\cast\asm\c-win32.obj';

	$cast_enc_src='crypto\cast\asm\c-win32.asm';

	$rc4_enc_obj='crypto\rc4\asm\r4-win32.obj';

	$rc4_enc_src='crypto\rc4\asm\r4-win32.asm';

	$rc5_enc_obj='crypto\rc5\asm\r5-win32.obj';

	$rc5_enc_src='crypto\rc5\asm\r5-win32.asm';

	$md5_asm_obj='crypto\md5\asm\m5-win32.obj';

	$md5_asm_src='crypto\md5\asm\m5-win32.asm';

	$sha1_asm_obj='crypto\sha\asm\s1-win32.obj';

	$sha1_asm_src='crypto\sha\asm\s1-win32.asm';

	$rmd160_asm_obj='crypto\ripemd\asm\rm-win32.obj';

	$rmd160_asm_src='crypto\ripemd\asm\rm-win32.asm';

	$bn_mulw_obj='crypto\bn\asm\bn_win32.obj';

	$bn_mulw_src='crypto\bn\asm\bn_win32.asm';

	$des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj';

	$des_enc_src='crypto\des\asm\d_win32.asm crypto\des\asm\y_win32.asm';

	$bf_enc_obj='crypto\bf\asm\b_win32.obj';

	$bf_enc_src='crypto\bf\asm\b_win32.asm';

	$cast_enc_obj='crypto\cast\asm\c_win32.obj';

	$cast_enc_src='crypto\cast\asm\c_win32.asm';

	$rc4_enc_obj='crypto\rc4\asm\r4_win32.obj';

	$rc4_enc_src='crypto\rc4\asm\r4_win32.asm';

	$rc5_enc_obj='crypto\rc5\asm\r5_win32.obj';

	$rc5_enc_src='crypto\rc5\asm\r5_win32.asm';

	$md5_asm_obj='crypto\md5\asm\m5_win32.obj';

	$md5_asm_src='crypto\md5\asm\m5_win32.asm';

	$sha1_asm_obj='crypto\sha\asm\s1_win32.obj';

	$sha1_asm_src='crypto\sha\asm\s1_win32.asm';

	$rmd160_asm_obj='crypto\ripemd\asm\rm_win32.obj';

	$rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm';

	$cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";

	}

util/pl/VC-32.pl

+18 −18
Original line number Diff line number Diff line
@@ -66,24 +66,24 @@ $bf_enc_src=''; 


if (!$no_asm)

	{

	$bn_asm_obj='crypto\bn\asm\bn-win32.obj';

	$bn_asm_src='crypto\bn\asm\bn-win32.asm';

	$des_enc_obj='crypto\des\asm\d-win32.obj crypto\des\asm\y-win32.obj';

	$des_enc_src='crypto\des\asm\d-win32.asm crypto\des\asm\y-win32.asm';

	$bf_enc_obj='crypto\bf\asm\b-win32.obj';

	$bf_enc_src='crypto\bf\asm\b-win32.asm';

	$cast_enc_obj='crypto\cast\asm\c-win32.obj';

	$cast_enc_src='crypto\cast\asm\c-win32.asm';

	$rc4_enc_obj='crypto\rc4\asm\r4-win32.obj';

	$rc4_enc_src='crypto\rc4\asm\r4-win32.asm';

	$rc5_enc_obj='crypto\rc5\asm\r5-win32.obj';

	$rc5_enc_src='crypto\rc5\asm\r5-win32.asm';

	$md5_asm_obj='crypto\md5\asm\m5-win32.obj';

	$md5_asm_src='crypto\md5\asm\m5-win32.asm';

	$sha1_asm_obj='crypto\sha\asm\s1-win32.obj';

	$sha1_asm_src='crypto\sha\asm\s1-win32.asm';

	$rmd160_asm_obj='crypto\ripemd\asm\rm-win32.obj';

	$rmd160_asm_src='crypto\ripemd\asm\rm-win32.asm';

	$bn_asm_obj='crypto\bn\asm\bn_win32.obj';

	$bn_asm_src='crypto\bn\asm\bn_win32.asm';

	$des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj';

	$des_enc_src='crypto\des\asm\d_win32.asm crypto\des\asm\y_win32.asm';

	$bf_enc_obj='crypto\bf\asm\b_win32.obj';

	$bf_enc_src='crypto\bf\asm\b_win32.asm';

	$cast_enc_obj='crypto\cast\asm\c_win32.obj';

	$cast_enc_src='crypto\cast\asm\c_win32.asm';

	$rc4_enc_obj='crypto\rc4\asm\r4_win32.obj';

	$rc4_enc_src='crypto\rc4\asm\r4_win32.asm';

	$rc5_enc_obj='crypto\rc5\asm\r5_win32.obj';

	$rc5_enc_src='crypto\rc5\asm\r5_win32.asm';

	$md5_asm_obj='crypto\md5\asm\m5_win32.obj';

	$md5_asm_src='crypto\md5\asm\m5_win32.asm';

	$sha1_asm_obj='crypto\sha\asm\s1_win32.obj';

	$sha1_asm_src='crypto\sha\asm\s1_win32.asm';

	$rmd160_asm_obj='crypto\ripemd\asm\rm_win32.obj';

	$rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm';

	$cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";

	}