Import of old SSLeay release: SSLeay 0.9.1b (unreleased)

8 files changed, 91 insertions, 30 deletions

diff --git a/util/pl/BC-16.pl b/util/pl/BC-16.pl
index 99128809c0..6c6df4fe0b 100644
--- a/util/pl/BC-16.pl
+++ b/util/pl/BC-16.pl
@@ -66,18 +66,18 @@ $asm='bcc -c -B -Tml';
 $afile='/o';
 if ($no_asm)
 	{
-	$bn_mulw_obj='';
-	$bn_mulw_src='';
+	$bn_asm_obj='';
+	$bn_asm_src='';
 	}
 elsif ($asmbits == 32)
 	{
-	$bn_mulw_obj='crypto\bn\asm\x86w32.obj';
-	$bn_mulw_src='crypto\bn\asm\x86w32.asm';
+	$bn_asm_obj='crypto\bn\asm\x86w32.obj';
+	$bn_asm_src='crypto\bn\asm\x86w32.asm';
 	}
 else
 	{
-	$bn_mulw_obj='crypto\bn\asm\x86w16.obj';
-	$bn_mulw_src='crypto\bn\asm\x86w16.asm';
+	$bn_asm_obj='crypto\bn\asm\x86w16.obj';
+	$bn_asm_src='crypto\bn\asm\x86w16.asm';
 	}
 
 sub do_lib_rule
diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index 988512175a..d1dcadd94e 100644
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -55,13 +55,13 @@ $asm='ml /Cp /c /Cx';
 $afile='/Fo';
 if ($noasm)
 	{
-	$bn_mulw_obj='';
-	$bn_mulw_src='';
+	$bn_asm_obj='';
+	$bn_asm_src='';
 	}
 else
 	{
-	$bn_mulw_obj='crypto\bn\asm\x86b32.obj';
-	$bn_mulw_src='crypto\bn\asm\x86m32.asm';
+	$bn_asm_obj='crypto\bn\asm\x86b32.obj';
+	$bn_asm_src='crypto\bn\asm\x86m32.asm';
 	}
 
 sub do_lib_rule
diff --git a/util/pl/VC-16.pl b/util/pl/VC-16.pl
index 8119f50c2c..a5079d4ca7 100644
--- a/util/pl/VC-16.pl
+++ b/util/pl/VC-16.pl
@@ -84,8 +84,8 @@ $lfile='';
 $asm='ml /Cp /c /Cx';
 $afile='/Fo';
 
-$bn_mulw_obj='';
-$bn_mulw_src='';
+$bn_asm_obj='';
+$bn_asm_src='';
 $des_enc_obj='';
 $des_enc_src='';
 $bf_enc_obj='';
@@ -95,13 +95,13 @@ if (!$no_asm)
 	{
 	if ($asmbits == 32)
 		{
-		$bn_mulw_obj='crypto\bn\asm\x86w32.obj';
-		$bn_mulw_src='crypto\bn\asm\x86w32.asm';
+		$bn_asm_obj='crypto\bn\asm\x86w32.obj';
+		$bn_asm_src='crypto\bn\asm\x86w32.asm';
 		}
 	else
 		{
-		$bn_mulw_obj='crypto\bn\asm\x86w16.obj';
-		$bn_mulw_src='crypto\bn\asm\x86w16.asm';
+		$bn_asm_obj='crypto\bn\asm\x86w16.obj';
+		$bn_asm_src='crypto\bn\asm\x86w16.asm';
 		}
 	}
 
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 4e369f6f1d..9167abfce5 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -7,7 +7,7 @@ $crypto="libeay32";
 $RSAref="RSAref32";
 
 $o='\\';
-$cp='copy';
+$cp='"copy /b nul+ "';	# Timestamps get stuffed otherwise
 $rm='del';
 
 # C compiler stuff
@@ -22,7 +22,7 @@ $inc_def="inc32";
 
 if ($debug)
 	{
-	$cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWINDOWS -DWIN32 -D_DEBUG -DL_ENDIAN";
+	$cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWINDOWS -DWIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG";
 	$lflags.=" /debug";
 	$mlflags.=' /debug';
 	}
@@ -53,8 +53,8 @@ $asm='ml /Cp /coff /c /Cx';
 $asm.=" /Zi" if $debug;
 $afile='/Fo';
 
-$bn_mulw_obj='';
-$bn_mulw_src='';
+$bn_asm_obj='';
+$bn_asm_src='';
 $des_enc_obj='';
 $des_enc_src='';
 $bf_enc_obj='';
@@ -62,8 +62,8 @@ $bf_enc_src='';
 
 if (!$no_asm)
 	{
-	$bn_mulw_obj='crypto\bn\asm\bn-win32.obj';
-	$bn_mulw_src='crypto\bn\asm\bn-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';
@@ -92,6 +92,8 @@ if ($shlib)
 	$tmp_def="tmp32dll";
 	}
 
+$cflags.=" /Fd$out_def";
+
 sub do_lib_rule
 	{
 	local($objs,$target,$name,$shlib)=@_;
diff --git a/util/pl/f b/util/pl/f
new file mode 100644
index 0000000000..a280b70550
--- /dev/null
+++ b/util/pl/f
@@ -0,0 +1,17 @@
+# do a rule for each file that says 'copy' to new direcory on change
+sub do_copy_rule
+	{
+	local($to,$files,$p)=@_;
+	local($ret,$_,$n,$pp);
+	
+	$files =~ s/\//$o/g if $o ne '/';
+	foreach (split(/\s+/,$files))
+		{
+		$n=&bname($_);
+		if ($n =~ /bss_file/)
+			{ $pp=".c"; }
+		else	{ $pp=$p; }
+		$ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \$(SRC_D)$o$_$pp $to${o}$n$pp\n\n";
+		}
+	return($ret);
+	}
diff --git a/util/pl/linux.pl b/util/pl/linux.pl
index d87a6634d1..a8cfdc578a 100644
--- a/util/pl/linux.pl
+++ b/util/pl/linux.pl
@@ -17,8 +17,8 @@ else
 
 if (!$no_asm)
 	{
-	$bn_mulw_obj='$(OBJ_D)/bn86-elf.o';
-	$bn_mulw_src='crypto/bn/asm/bn86unix.cpp';
+	$bn_asm_obj='$(OBJ_D)/bn86-elf.o';
+	$bn_asm_src='crypto/bn/asm/bn86unix.cpp';
 	$des_enc_obj='$(OBJ_D)/dx86-elf.o $(OBJ_D)/yx86-elf.o';
 	$des_enc_src='crypto/des/asm/dx86unix.cpp crypto/des/asm/yx86unix.cpp';
 	$bf_enc_obj='$(OBJ_D)/bx86-elf.o';
@@ -27,8 +27,12 @@ if (!$no_asm)
 	$cast_enc_src='crypto/cast/asm/cx86unix.cpp';
 	$rc4_enc_obj='$(OBJ_D)/rx86-elf.o';
 	$rc4_enc_src='crypto/rc4/asm/rx86unix.cpp';
+	$rc5_enc_obj='$(OBJ_D)/r586-elf.o';
+	$rc5_enc_src='crypto/rc5/asm/r586unix.cpp';
 	$md5_asm_obj='$(OBJ_D)/mx86-elf.o';
 	$md5_asm_src='crypto/md5/asm/mx86unix.cpp';
+	$rmd160_asm_obj='$(OBJ_D)/rm86-elf.o';
+	$rmd160_asm_src='crypto/ripemd/asm/rm86unix.cpp';
 	$sha1_asm_obj='$(OBJ_D)/sx86-elf.o';
 	$sha1_asm_src='crypto/sha/asm/sx86unix.cpp';
 	$cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM";
@@ -51,9 +55,9 @@ sub do_shlib_rule
 	$target =~ s/\//$o/g if $o ne '/';
 	($Name=$name) =~ tr/a-z/A-Z/;
 
-	$ret.="\$(LIB_D)$o$target: \$(${Name}OBJ)\n";
-	$ret.="\t\$(RM) \$(LIB_D)$o$target\n";
-	$ret.="\tgcc \${CFLAGS} -shared -Wl,-soname,$target -o \$(LIB_D)$o$target \$(${Name}OBJ)\n";
+	$ret.="$target: \$(${Name}OBJ)\n";
+	$ret.="\t\$(RM) target\n";
+	$ret.="\tgcc \${CFLAGS} -shared -Wl,-soname,$target -o $target \$(${Name}OBJ)\n";
 	($t=$target) =~ s/(^.*)\/[^\/]*$/$1/;
 	if ($so_name ne "")
 		{
diff --git a/util/pl/ultrix.pl b/util/pl/ultrix.pl
new file mode 100644
index 0000000000..9302de95df
--- /dev/null
+++ b/util/pl/ultrix.pl
@@ -0,0 +1,38 @@
+#!/usr/local/bin/perl
+#
+# linux.pl - the standard unix makefile stuff.
+#
+
+$o='/';
+$cp='/bin/cp';
+$rm='/bin/rm -f';
+
+# C compiler stuff
+
+$cc='cc';
+if ($debug)
+	{ $cflags="-g -DREF_CHECK -DCRYPTO_MDEBUG"; }
+else
+	{ $cflags="-O2"; }
+
+$cflags.=" -DNOPROTO -DNOCONST -DL_ENDIAN";
+
+if (!$no_asm)
+	{
+	$bn_asm_obj='$(OBJ_D)/mips1.o';
+	$bn_asm_src='crypto/bn/asm/mips1.s';
+	}
+
+sub do_link_rule
+	{
+	local($target,$files,$dep_libs,$libs)=@_;
+	local($ret,$_);
+	
+	$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";
+	return($ret);
+	}
+
+1;
diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 36311711c6..aa2d7d1f37 100644
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -46,8 +46,8 @@ $lfile='';
 
 $asm='as';
 $afile='-o ';
-$bn_mulw_obj="";
-$bn_mulw_src="";
+$bn_asm_obj="";
+$bn_asm_src="";
 $des_enc_obj="";
 $des_enc_src="";
 $bf_enc_obj="";
@@ -59,7 +59,7 @@ sub do_lib_rule
 	local($ret,$_,$Name);
 
 	$target =~ s/\//$o/g if $o ne '/';
-	$target="\$(LIB_D)$o$target";
+	$target="$target";
 	($Name=$name) =~ tr/a-z/A-Z/;
 
 	$ret.="$target: \$(${Name}OBJ)\n";