Apply the Borland Builder 5 changes that I forgot...

diff --git a/ms/do_masm.bat b/ms/do_masm.bat
index 5b64fecdb00667a9968b0c2b76076e9176d06d58..f4c958c5617e82b6f307aaa6733d49e34f22879a 100755 (executable)
--- a/ms/do_masm.bat
+++ b/ms/do_masm.bat
@@ -3,54 +3,54 @@ echo Generating x86 for MASM assember
 \r
 echo Bignum\r
 cd crypto\bn\asm\r
-perl x86.pl win32 > bn-win32.asm\r
+perl x86.pl win32 > bn_win32.asm\r
 cd ..\..\..\r
 \r
 echo DES\r
 cd crypto\des\asm\r
-perl des-586.pl win32 > d-win32.asm\r
+perl des-586.pl win32 > d_win32.asm\r
 cd ..\..\..\r
 \r
 echo "crypt(3)"\r
 \r
 cd crypto\des\asm\r
-perl crypt586.pl win32 > y-win32.asm\r
+perl crypt586.pl win32 > y_win32.asm\r
 cd ..\..\..\r
 \r
 echo Blowfish\r
 \r
 cd crypto\bf\asm\r
-perl bf-586.pl win32 > b-win32.asm\r
+perl bf-586.pl win32 > b_win32.asm\r
 cd ..\..\..\r
 \r
 echo CAST5\r
 cd crypto\cast\asm\r
-perl cast-586.pl win32 > c-win32.asm\r
+perl cast-586.pl win32 > c_win32.asm\r
 cd ..\..\..\r
 \r
 echo RC4\r
 cd crypto\rc4\asm\r
-perl rc4-586.pl win32 > r4-win32.asm\r
+perl rc4-586.pl win32 > r4_win32.asm\r
 cd ..\..\..\r
 \r
 echo MD5\r
 cd crypto\md5\asm\r
-perl md5-586.pl win32 > m5-win32.asm\r
+perl md5-586.pl win32 > m5_win32.asm\r
 cd ..\..\..\r
 \r
 echo SHA1\r
 cd crypto\sha\asm\r
-perl sha1-586.pl win32 > s1-win32.asm\r
+perl sha1-586.pl win32 > s1_win32.asm\r
 cd ..\..\..\r
 \r
 echo RIPEMD160\r
 cd crypto\ripemd\asm\r
-perl rmd-586.pl win32 > rm-win32.asm\r
+perl rmd-586.pl win32 > rm_win32.asm\r
 cd ..\..\..\r
 \r
 echo RC5\32\r
 cd crypto\rc5\asm\r
-perl rc5-586.pl win32 > r5-win32.asm\r
+perl rc5-586.pl win32 > r5_win32.asm\r
 cd ..\..\..\r
 \r
 echo on\r

diff --git a/ms/do_nasm.bat b/ms/do_nasm.bat
index 8859c154572a2a2a546ade8e2e91506ba0463bea..557f8a66d7ed5406bd4f3e48bed2e5cbd3d69892 100755 (executable)
--- a/ms/do_nasm.bat
+++ b/ms/do_nasm.bat
@@ -4,54 +4,54 @@ echo Generating x86 for NASM assember
 \r
 echo Bignum\r
 cd crypto\bn\asm\r
-perl x86.pl win32n > bn-win32.asm\r
+perl x86.pl win32n > bn_win32.asm\r
 cd ..\..\..\r
 \r
 echo DES\r
 cd crypto\des\asm\r
-perl des-586.pl win32n > d-win32.asm\r
+perl des-586.pl win32n > d_win32.asm\r
 cd ..\..\..\r
 \r
 echo "crypt(3)"\r
 \r
 cd crypto\des\asm\r
-perl crypt586.pl win32n > y-win32.asm\r
+perl crypt586.pl win32n > y_win32.asm\r
 cd ..\..\..\r
 \r
 echo Blowfish\r
 \r
 cd crypto\bf\asm\r
-perl bf-586.pl win32n > b-win32.asm\r
+perl bf-586.pl win32n > b_win32.asm\r
 cd ..\..\..\r
 \r
 echo CAST5\r
 cd crypto\cast\asm\r
-perl cast-586.pl win32n > c-win32.asm\r
+perl cast-586.pl win32n > c_win32.asm\r
 cd ..\..\..\r
 \r
 echo RC4\r
 cd crypto\rc4\asm\r
-perl rc4-586.pl win32n > r4-win32.asm\r
+perl rc4-586.pl win32n > r4_win32.asm\r
 cd ..\..\..\r
 \r
 echo MD5\r
 cd crypto\md5\asm\r
-perl md5-586.pl win32n > m5-win32.asm\r
+perl md5-586.pl win32n > m5_win32.asm\r
 cd ..\..\..\r
 \r
 echo SHA1\r
 cd crypto\sha\asm\r
-perl sha1-586.pl win32n > s1-win32.asm\r
+perl sha1-586.pl win32n > s1_win32.asm\r
 cd ..\..\..\r
 \r
 echo RIPEMD160\r
 cd crypto\ripemd\asm\r
-perl rmd-586.pl win32n > rm-win32.asm\r
+perl rmd-586.pl win32n > rm_win32.asm\r
 cd ..\..\..\r
 \r
 echo RC5\32\r
 cd crypto\rc5\asm\r
-perl rc5-586.pl win32n > r5-win32.asm\r
+perl rc5-586.pl win32n > r5_win32.asm\r
 cd ..\..\..\r
 \r
 echo on\r
@@ -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\r
 perl util\mk1mf.pl nasm VC-WIN32 >ms\nt.mak\r
 perl util\mk1mf.pl dll nasm VC-WIN32 >ms\ntdll.mak\r
+perl util\mk1mf.pl nasm BC-NT >ms\bcb.mak\r
 \r
 perl util\mkdef.pl 16 libeay > ms\libeay16.def\r
 perl util\mkdef.pl 32 libeay > ms\libeay32.def\r

diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index 20cb3a9c506bc7f375d30c7c12aeb166cedc46fc..c268c495507c76538b472aa67abd07bf9012b956 100644 (file)
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -65,24 +65,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";
        }
 

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 7c6674b971d8b9ca68aae8ac29b85f0b2841f2dc..8dea9215414f785f722c91ed75269a7b3359b285 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -67,24 +67,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";
        }