4 files changed, 59 insertions, 25 deletions

diff --git a/src/lib/libcrypto/util/extract-names.pl b/src/lib/libcrypto/util/extract-names.pl
index 9f2ad5ef16..744a8e2324 100644
--- a/src/lib/libcrypto/util/extract-names.pl
+++ b/src/lib/libcrypto/util/extract-names.pl
@@ -10,6 +10,8 @@ while(<STDIN>) {
         if (/ - /) {
             s/ - .*//;
             s/,[ \t]+/,/g;
+            s/^[ \t]+//g;
+            s/[ \t]+$//g;
             push @words, split ',';
         }
     }
diff --git a/src/lib/libcrypto/util/mk1mf.pl b/src/lib/libcrypto/util/mk1mf.pl
index c538f9dffb..b4bc0457e5 100644
--- a/src/lib/libcrypto/util/mk1mf.pl
+++ b/src/lib/libcrypto/util/mk1mf.pl
@@ -277,6 +277,8 @@ $defs= <<"EOF";
 
 EOF
 
+$defs .= $preamble if defined $preamble;
+
 if ($platform eq "VC-CE")
         {
         $defs.= <<"EOF";
diff --git a/src/lib/libcrypto/util/mkdef.pl b/src/lib/libcrypto/util/mkdef.pl
index cdd2164c4e..01a1bfda19 100644
--- a/src/lib/libcrypto/util/mkdef.pl
+++ b/src/lib/libcrypto/util/mkdef.pl
@@ -1116,27 +1116,55 @@ sub print_test_file
         }
 }
 
+sub get_version {
+   local *MF;
+   my $v = '?';
+   open MF, 'Makefile.ssl' or return $v;
+   while (<MF>) {
+     $v = $1, last if /^VERSION=(.*?)\s*$/;
+   }
+   close MF;
+   return $v;
+}
+
 sub print_def_file
 {
         (*OUT,my $name,*nums,my @symbols)=@_;
         my $n = 1; my @e; my @r; my @v; my $prev="";
         my $liboptions="";
+        my $libname = $name;
+        my $http_vendor = 'www.openssl.org/';
+        my $version = get_version();
+        my $what = "OpenSSL: implementation of Secure Socket Layer";
+        my $description = "$what $version, $name - http://$http_vendor";
 
         if ($W32)
-                { $name.="32"; }
+                { $libname.="32"; }
         elsif ($W16)
-                { $name.="16"; }
+                { $libname.="16"; }
         elsif ($OS2)
-                { $liboptions = "INITINSTANCE\nDATA NONSHARED"; }
+                { # DLL names should not clash on the whole system.
+                  # However, they should not have any particular relationship
+                  # to the name of the static library.  Chose descriptive names
+                  # (must be at most 8 chars).
+                  my %translate = (ssl => 'open_ssl', crypto => 'cryptssl');
+                  $libname = $translate{$name} || $name;
+                  $liboptions = <<EOO;
+INITINSTANCE
+DATA MULTIPLE NONSHARED
+EOO
+                  # Vendor field can't contain colon, drat; so we omit http://
+                  $description = "\@#$http_vendor:$version#\@$what; DLL for library $name.  Build for EMX -Zmtd";
+                }
 
         print OUT <<"EOF";
 ;
 ; Definition file for the DLL version of the $name library from OpenSSL
 ;
 
-LIBRARY         $name   $liboptions
+LIBRARY         $libname        $liboptions
 
-DESCRIPTION     'OpenSSL $name - http://www.openssl.org/'
+DESCRIPTION     '$description'
 
 EOF
 
diff --git a/src/lib/libcrypto/util/pl/OS2-EMX.pl b/src/lib/libcrypto/util/pl/OS2-EMX.pl
index d695dda623..ddb3524210 100644
--- a/src/lib/libcrypto/util/pl/OS2-EMX.pl
+++ b/src/lib/libcrypto/util/pl/OS2-EMX.pl
@@ -3,10 +3,12 @@
 # OS2-EMX.pl - for EMX GCC on OS/2
 #
 
-$o='\\';
-$cp='copy';
+$o='/';
+$cp='cp';
 $rm='rm -f';
 
+$preamble = "SHELL=sh\n";
+
 # C compiler stuff
 
 $cc='gcc';
@@ -48,24 +50,24 @@ $bf_enc_src="";
 
 if (!$no_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";
+        $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)