merge openssl-0.9.7-beta3, tested on vax by miod@

3 files changed, 89 insertions, 68 deletions

diff --git a/src/lib/libcrypto/util/pl/BC-32.pl b/src/lib/libcrypto/util/pl/BC-32.pl
index 78d60616a6..bd7a9d9301 100644
--- a/src/lib/libcrypto/util/pl/BC-32.pl
+++ b/src/lib/libcrypto/util/pl/BC-32.pl
@@ -18,7 +18,7 @@ $out_def="out32";
 $tmp_def="tmp32";
 $inc_def="inc32";
 #enable max error messages, disable most common warnings
-$cflags="-DWIN32_LEAN_AND_MEAN -q -w-aus -w-par -w-inl  -c -tWC -tWM -DOPENSSL_SYSNAME_WIN32 -DL_ENDIAN -DDSO_WIN32 ";
+$cflags="-DWIN32_LEAN_AND_MEAN -q -w-aus -w-par -w-inl  -c -tWC -tWM -DOPENSSL_SYSNAME_WIN32 -DL_ENDIAN -DDSO_WIN32 -D_stricmp=stricmp ";
 if ($debug)
 {
     $cflags.="-Od -y -v -vi- -D_DEBUG";
@@ -51,9 +51,9 @@ $lfile='';
 $shlib_ex_obj="";
 $app_ex_obj="c0x32.obj"; 
 
-$asm='n_o_T_a_s_m';
+$asm='nasmw';
 $asm.=" /Zi" if $debug;
-$afile='/Fo';
+$afile='-f obj -o';
 
 $bn_mulw_obj='';
 $bn_mulw_src='';
@@ -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";
         }
 
diff --git a/src/lib/libcrypto/util/pl/OS2-EMX.pl b/src/lib/libcrypto/util/pl/OS2-EMX.pl
index 57180556ca..d695dda623 100644
--- a/src/lib/libcrypto/util/pl/OS2-EMX.pl
+++ b/src/lib/libcrypto/util/pl/OS2-EMX.pl
@@ -10,18 +10,20 @@ $rm='rm -f';
 # C compiler stuff
 
 $cc='gcc';
-$cflags="-DL_ENDIAN -O3 -fomit-frame-pointer -m486 -Zmt -Wall ";
+$cflags="-DL_ENDIAN -O3 -fomit-frame-pointer -m486 -Zmtd -Wall ";
+$cflags.="-Zomf " if $shlib;
+$shl_cflag="-Zdll";
 
 if ($debug) { 
         $cflags.="-g "; 
 }
 
-$obj='.o';
+$obj=$shlib ? '.obj' : '.o';
 $ofile='-o ';
 
 # EXE linking stuff
 $link='${CC}';
-$lflags='${CFLAGS} -Zbsd-signals';
+$lflags='${CFLAGS} -Zbsd-signals -s';
 $efile='-o ';
 $exep='.exe';
 $ex_libs="-lsocket";
@@ -30,12 +32,12 @@ $ex_libs="-lsocket";
 $mklib='ar r';
 $mlflags='';
 $ranlib="ar s";
-$plib='lib';
-$libp=".a";
-$shlibp=".a";
+$plib='';
+$libp=$shlib ? ".lib" : ".a";
+$shlibp=$shlib ? ".dll" : ".a";
 $lfile='';
 
-$asm='as';
+$asm=$shlib ? 'as -Zomf' : 'as';
 $afile='-o ';
 $bn_asm_obj="";
 $bn_asm_src="";
@@ -46,24 +48,32 @@ $bf_enc_src="";
 
 if (!$no_asm)
         {
-        $bn_asm_obj='crypto\bn\asm\bn-os2.o crypto\bn\asm\co-os2.o';
-        $bn_asm_src='crypto\bn\asm\bn-os2.asm crypto\bn\asm\co-os2.asm';
-        $des_enc_obj='crypto\des\asm\d-os2.o crypto\des\asm\y-os2.o';
-        $des_enc_src='crypto\des\asm\d-os2.asm crypto\des\asm\y-os2.asm';
-        $bf_enc_obj='crypto\bf\asm\b-os2.o';
-        $bf_enc_src='crypto\bf\asm\b-os2.asm';
-        $cast_enc_obj='crypto\cast\asm\c-os2.o';
-        $cast_enc_src='crypto\cast\asm\c-os2.asm';
-        $rc4_enc_obj='crypto\rc4\asm\r4-os2.o';
-        $rc4_enc_src='crypto\rc4\asm\r4-os2.asm';
-        $rc5_enc_obj='crypto\rc5\asm\r5-os2.o';
-        $rc5_enc_src='crypto\rc5\asm\r5-os2.asm';
-        $md5_asm_obj='crypto\md5\asm\m5-os2.o';
-        $md5_asm_src='crypto\md5\asm\m5-os2.asm';
-        $sha1_asm_obj='crypto\sha\asm\s1-os2.o';
-        $sha1_asm_src='crypto\sha\asm\s1-os2.asm';
-        $rmd160_asm_obj='crypto\ripemd\asm\rm-os2.o';
-        $rmd160_asm_src='crypto\ripemd\asm\rm-os2.asm';
+        $bn_asm_obj="crypto\\bn\\asm\\bn-os2$obj crypto\\bn\\asm\\co-os2$obj";
+        $bn_asm_src="crypto\\bn\\asm\\bn-os2.asm crypto\\bn\\asm\\co-os2.asm";
+        $des_enc_obj="crypto\\des\\asm\\d-os2$obj crypto\\des\\asm\\y-os2$obj";
+        $des_enc_src="crypto\\des\\asm\\d-os2.asm crypto\\des\\asm\\y-os2.asm";
+        $bf_enc_obj="crypto\\bf\\asm\\b-os2$obj";
+        $bf_enc_src="crypto\\bf\\asm\\b-os2.asm";
+        $cast_enc_obj="crypto\\cast\\asm\\c-os2$obj";
+        $cast_enc_src="crypto\\cast\\asm\\c-os2.asm";
+        $rc4_enc_obj="crypto\\rc4\\asm\\r4-os2$obj";
+        $rc4_enc_src="crypto\\rc4\\asm\\r4-os2.asm";
+        $rc5_enc_obj="crypto\\rc5\\asm\\r5-os2$obj";
+        $rc5_enc_src="crypto\\rc5\\asm\\r5-os2.asm";
+        $md5_asm_obj="crypto\\md5\\asm\\m5-os2$obj";
+        $md5_asm_src="crypto\\md5\\asm\\m5-os2.asm";
+        $sha1_asm_obj="crypto\\sha\\asm\\s1-os2$obj";
+        $sha1_asm_src="crypto\\sha\\asm\\s1-os2.asm";
+        $rmd160_asm_obj="crypto\\ripemd\\asm\\rm-os2$obj";
+        $rmd160_asm_src="crypto\\ripemd\\asm\\rm-os2.asm";
+        }
+
+if ($shlib)
+        {
+        $mlflags.=" $lflags -Zdll";
+        $lib_cflag=" -D_DLL";
+        $out_def="out_dll";
+        $tmp_def="tmp_dll";
         }
 
 sub do_lib_rule
@@ -76,9 +86,20 @@ sub do_lib_rule
         ($Name=$name) =~ tr/a-z/A-Z/;
 
         $ret.="$target: \$(${Name}OBJ)\n";
-        $ret.="\t\$(RM) $target\n";
-        $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
-        $ret.="\t\$(RANLIB) $target\n\n";
+        if (!$shlib) 
+                {
+                $ret.="\t\$(RM) $target\n";
+                $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
+                $ret.="\t\$(RANLIB) $target\n\n";
+                }
+        else
+                {
+                local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
+                $ex.=' -lsocket';
+                $ret.="\t\$(LINK) \$(SHLIB_CFLAGS) \$(MLFLAGS) $efile$target \$(SHLIB_EX_OBJ) \$(${Name}OBJ) $ex os2/${Name}.def\n";
+                $ret.="\temximp -o $out_def/$name.a os2/${Name}.def\n";
+                $ret.="\temximp -o $out_def/$name.lib os2/${Name}.def\n\n";
+                }
         }
 
 sub do_link_rule
@@ -89,7 +110,7 @@ sub do_link_rule
         $file =~ s/\//$o/g if $o ne '/';
         $n=&bname($target);
         $ret.="$target: $files $dep_libs\n";
-        $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
+        $ret.="\t\$(LINK) ${efile}$target \$(CFLAG) \$(LFLAGS) $files $libs\n\n";
         return($ret);
         }
 
diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl
index 50bfb34385..d6e3a11530 100644
--- a/src/lib/libcrypto/util/pl/VC-32.pl
+++ b/src/lib/libcrypto/util/pl/VC-32.pl
@@ -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";
         }