Netware support.

Submitted by: Guenter Knauf <eflash@gmx.net>

3 files changed, 298 insertions, 99 deletions

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 3bbad51509..3acdecd05f 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -44,6 +44,7 @@ $infile="MINFO";
 	"FreeBSD","FreeBSD distribution",
 	"OS2-EMX", "EMX GCC OS/2",
 	"netware-clib", "CodeWarrior for NetWare - CLib - with WinSock Sockets",
+	"netware-clib-bsdsock", "CodeWarrior for NetWare - CLib - with BSD Sockets",
 	"netware-libc", "CodeWarrior for NetWare - LibC - with WinSock Sockets",
 	"netware-libc-bsdsock", "CodeWarrior for NetWare - LibC - with BSD Sockets",
 	"default","cc under unix",
@@ -78,7 +79,7 @@ and [options] can be one of
 	no-hw					- No hw
 	nasm 					- Use NASM for x86 asm
 	nw-nasm					- Use NASM x86 asm for NetWare
-	nw-mwasm					- Use Metrowerks x86 asm for NetWare
+	nw-mwasm				- Use Metrowerks x86 asm for NetWare
 	gaswin					- Use GNU as with Mingw32
 	no-socks				- No socket code
 	no-err					- No error strings
@@ -175,10 +176,10 @@ elsif ($platform eq "OS2-EMX")
 	require 'OS2-EMX.pl';
 	}
 elsif (($platform eq "netware-clib") || ($platform eq "netware-libc") ||
-       ($platform eq "netware-libc-bsdsock"))
+       ($platform eq "netware-clib-bsdsock") || ($platform eq "netware-libc-bsdsock"))
 	{
 	$LIBC=1 if $platform eq "netware-libc" || $platform eq "netware-libc-bsdsock";
-	$BSDSOCK=1 if $platform eq "netware-libc-bsdsock";
+	$BSDSOCK=1 if ($platform eq "netware-libc-bsdsock") || ($platform eq "netware-clib-bsdsock");
 	require 'netware.pl';
 	}
 else
@@ -401,6 +402,8 @@ LINK=$link
 LFLAGS=$lflags
 RSC=$rsc
 
+AES_ASM_OBJ=$aes_asm_obj
+AES_ASM_SRC=$aes_asm_src
 BN_ASM_OBJ=$bn_asm_obj
 BN_ASM_SRC=$bn_asm_src
 BNCO_ASM_OBJ=$bnco_asm_obj
@@ -527,7 +530,7 @@ install: all
 	\$(MKDIR) \"\$(INSTALLTOP)${o}include\"
 	\$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
 	\$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
-	\$(CP) \"\$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl\"
+	\$(CP) \"\$(INCO_D)${o}*.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
 	\$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"
 	\$(MKDIR) \"\$(OPENSSLDIR)\"
 	\$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\"
@@ -618,6 +621,12 @@ foreach (values %lib_nam)
 		next;
 		}
 
+	if (($aes_asm_obj ne "") && ($_ eq "CRYPTO"))
+		{
+		$lib_obj =~ s/\s(\S*\/aes_core\S*)/ \$(AES_ASM_OBJ)/;
+		$lib_obj =~ s/\s\S*\/aes_cbc\S*//;
+		$rules.=&do_asm_rule($aes_asm_obj,$aes_asm_src);
+		}
 	if (($bn_asm_obj ne "") && ($_ eq "CRYPTO"))
 		{
 		$lib_obj =~ s/\s\S*\/bn_asm\S*/ \$(BN_ASM_OBJ)/;
diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 584c3912e6..55a313cdb0 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -62,6 +62,7 @@ my @dirs = (
 "ssl",
 "apps",
 "engines",
+"engines/ccgost",
 "test",
 "tools"
 );
diff --git a/util/pl/netware.pl b/util/pl/netware.pl
index c05789b22f..57f8091e3c 100644
--- a/util/pl/netware.pl
+++ b/util/pl/netware.pl
@@ -1,26 +1,74 @@
-# Metrowerks Codewarrior for NetWare
+# Metrowerks Codewarrior or gcc / nlmconv for NetWare
 #
 
+$version_header = "crypto/opensslv.h";
+open(IN, "$version_header") or die "Couldn't open $version_header: $!";
+while (<IN>) {
+  if (/^#define[\s\t]+OPENSSL_VERSION_NUMBER[\s\t]+0x(\d)(\d{2})(\d{2})(\d{2})/)
+  {
+    # die "OpenSSL version detected: $1.$2.$3.$4\n";
+    #$nlmvernum = "$1,$2,$3";
+    $nlmvernum = "$1,".($2*10+$3).",".($4*1);
+    #$nlmverstr = "$1.".($2*1).".".($3*1).($4?(chr(96+$4)):"");
+    break;
+  }
+}
+close(IN) or die "Couldn't close $version_header: $!";
+
+$readme_file = "README";
+open(IN, $readme_file) or die "Couldn't open $readme_file: $!";
+while (<IN>) {
+  if (/^[\s\t]+OpenSSL[\s\t]+(\d)\.(\d{1,2})\.(\d{1,2})([a-z])(.*)/)
+  {
+    #$nlmvernum = "$1,$2,$3";
+    #$nlmvernum = "$1,".($2*10+$3).",".($4*1);
+    $nlmverstr = "$1.$2.$3$4$5";
+  }
+  elsif (/^[\s\t]+(Copyright \(c\) \d{4}\-\d{4} The OpenSSL Project)$/)
+  {
+    $nlmcpystr = $1;
+  }
+  break if ($nlmvernum && $nlmcpystr);
+}
+close(IN) or die "Couldn't close $readme_file: $!";
+
+# Define stacksize here
+$nlmstack = "32768";
+
+# some default settings here in case we failed to find them in README
+$nlmvernum = "1,0,0" if (!$nlmvernum);
+$nlmverstr = "OpenSSL" if (!$nlmverstr);
+$nlmcpystr = "Copyright (c) 1998-now The OpenSSL Project" if (!$nlmcpystr);
+
+# die "OpenSSL copyright: $nlmcpystr\nOpenSSL verstring: $nlmverstr\nOpenSSL vernumber: $nlmvernum\n";
+
 # The import files and other misc imports needed to link
-@misc_imports = ("GetProcessSwitchCount", "RunningProcess",  
+@misc_imports = ("GetProcessSwitchCount", "RunningProcess",
                  "GetSuperHighResolutionTimer");
 if ($LIBC)
 {
    @import_files = ("libc.imp");
    @module_files = ("libc");
+   $libarch = "LIBC";
 }
 else
 {
    # clib build
    @import_files = ("clib.imp");
+   push(@import_files, "socklib.imp") if ($BSDSOCK);
    @module_files = ("clib");
-   push(@misc_imports, "_rt_modu64%16", "_rt_divu64%16");
+   # push(@misc_imports, "_rt_modu64%16", "_rt_divu64%16");
+   $libarch = "CLIB";
 }
-if (!$BSDSOCK)
+if ($BSDSOCK)
+{
+   $libarch .= "-BSD";
+}
+else
 {
+   $libarch .= "-WS2";
    push(@import_files, "ws2nlm.imp");
 }
-		 
 
 # The "IMPORTS" environment variable must be set and point to the location
 # where import files (*.imp) can be found.
@@ -33,30 +81,68 @@ $import_path = $ENV{"IMPORTS"} || die ("IMPORTS environment variable not set\n")
 # Example: set PRELUDE=c:\codewar\novell support\metrowerks support\libraries\runtime\nwpre.obj
 $prelude = $ENV{"PRELUDE"} || die ("PRELUDE environment variable not set\n");
 
-#$ssl=   "ssleay32";
-#$crypto="libeay32";
-
-$o='\\\\';
-$cp='copy >nul:';
-$rm='del';
+# The "INCLUDES" environment variable must be set and point to the location
+# where import files (*.imp) can be found.
+$include_path = $ENV{"INCLUDE"} || die ("INCLUDES environment variable not set\n");
+$include_path =~ s/\\/\//g;
+$include_path = join(" -I", split(/;/, $include_path));
 
-# C compiler
-$cc="mwccnlm";
+# check for gcc compiler
+$gnuc = $ENV{"GNUC"};
 
-# Linker
-$link="mwldnlm";
+#$ssl=   "ssleay32";
+#$crypto="libeay32";
 
-# librarian
-$mklib="mwldnlm";
+if ($gnuc)
+{
+   # C compiler
+   $cc='gcc';
+   # Linker
+   $link='nlmconv';
+   # librarian
+   $mklib='ar';
+   $o='/';
+   # cp command
+   $cp='cp -af';
+   # rm command
+   $rm='rm -f';
+   # mv command
+   $mv='mv -f';
+   # mkdir command
+   $mkdir='gmkdir';
+   #$ranlib='ranlib';
+}
+else
+{
+   # C compiler
+   $cc='mwccnlm';
+   # Linker
+   $link='mwldnlm';
+   # librarian
+   $mklib='mwldnlm';
+   # Path separator
+   $o='\\';
+   # cp command
+   $cp='copy >nul:';
+   # rm command
+   $rm='del /f /q';
+}
 
-# assembler 
-if ($nw_nasm) 
+# assembler
+if ($nw_nasm)
 {
-   $asm="nasmw -s -f coff";
+   if ($gnuc)
+   {
+      $asm="nasmw -s -f elf";
+   }
+   else
+   {
+      $asm="nasmw -s -f coff -d __coff__";
+   }
    $afile="-o ";
    $asm.=" -g" if $debug;
 }
-elsif ($nw_mwasm) 
+elsif ($nw_mwasm)
 {
    $asm="mwasmnlm -maxerrors 20";
    $afile="-o ";
@@ -64,14 +150,14 @@ elsif ($nw_mwasm)
 }
 elsif ($nw_masm)
 {
-# masm assembly settings - it should be possible to use masm but haven't 
+# masm assembly settings - it should be possible to use masm but haven't
 # got it working.
 # $asm='ml /Cp /coff /c /Cx';
 # $asm.=" /Zi" if $debug;
 # $afile='/Fo';
    die("Support for masm assembler not yet functional\n");
 }
-else 
+else
 {
    $asm="";
    $afile="";
@@ -79,59 +165,89 @@ else
 
 
 
-# compile flags
-#
-# NOTES: Several c files in the crypto subdirectory include headers from
-#        their local directories.  Metrowerks wouldn't find these h files
-#        without adding individual include directives as compile flags
-#        or modifying the c files.  Instead of adding individual include
-#        paths for each subdirectory a recursive include directive
-#        is used ( -ir crypto ).
-#
-#        A similar issue exists for the engines and apps subdirectories.
-#
-#        Turned off the "possible" warnings ( -w nopossible ).  Metrowerks
-#        complained a lot about various stuff.  May want to turn back
-#        on for further development.
-$cflags="-ir crypto -ir engines -ir apps -msgstyle gcc -align 4 -processor pentium \\
-         -char unsigned -w on -w nolargeargs -w nopossible -w nounusedarg \\
-         -w noimplicitconv -relax_pointers -nosyspath -DL_ENDIAN \\
-         -DOPENSSL_SYSNAME_NETWARE -U_WIN32 -maxerrors 20 ";
-
-# link flags
-$lflags="-msgstyle gcc -zerobss -stacksize 32768 -nostdlib -sym internal ";
-
-
-# additional flags based upon debug | non-debug
-if ($debug)
+if ($gnuc)
 {
-   $cflags.=" -opt off -g -sym internal -DDEBUG";
+   # compile flags for GNUC
+   # additional flags based upon debug | non-debug
+   if ($debug)
+   {
+      $cflags="-g -DDEBUG";
+   }
+   else
+   {
+      $cflags="-O2";
+   }
+   $cflags.=" -nostdinc -I$include_path \\
+         -fno-builtin -fpcc-struct-return -fno-strict-aliasing \\
+         -funsigned-char -Wall -Wno-unused -Wno-uninitialized";
+
+   # link flags
+   $lflags="-T";
 }
 else
 {
-# CodeWarrior compiler has a problem with optimizations for floating
-# points - no optimizations until further investigation
-#   $cflags.=" -opt all";
+   # compile flags for CodeWarrior
+   # additional flags based upon debug | non-debug
+   if ($debug)
+   {
+      $cflags="-opt off -g -sym internal -DDEBUG";
+   }
+   else
+   {
+   # CodeWarrior compiler has a problem with optimizations for floating
+   # points - no optimizations until further investigation
+   #      $cflags="-opt all";
+   }
+
+   # NOTES: Several c files in the crypto subdirectory include headers from
+   #        their local directories.  Metrowerks wouldn't find these h files
+   #        without adding individual include directives as compile flags
+   #        or modifying the c files.  Instead of adding individual include
+   #        paths for each subdirectory a recursive include directive
+   #        is used ( -ir crypto ).
+   #
+   #        A similar issue exists for the engines and apps subdirectories.
+   #
+   #        Turned off the "possible" warnings ( -w nopossible ).  Metrowerks
+   #        complained a lot about various stuff.  May want to turn back
+   #        on for further development.
+   $cflags.=" -nostdinc -ir crypto -ir engines -ir apps -I$include_path \\
+         -msgstyle gcc -align 4 -processor pentium -char unsigned \\
+         -w on -w nolargeargs -w nopossible -w nounusedarg -w nounusedexpr \\
+         -w noimplicitconv -relax_pointers -nosyspath -maxerrors 20";
+
+   # link flags
+   $lflags="-msgstyle gcc -zerobss -nostdlib -sym internal -commandfile";
 }
 
+# common defines
+$cflags.=" -DL_ENDIAN -DOPENSSL_SYSNAME_NETWARE -U_WIN32";
+
 # If LibC build add in NKS_LIBC define and set the entry/exit
 # routines - The default entry/exit routines are for CLib and don't exist
 # in LibC
 if ($LIBC)
 {
    $cflags.=" -DNETWARE_LIBC";
-   $lflags.=" -entry _LibCPrelude -exit _LibCPostlude -flags pseudopreemption";
+   $nlmstart = "_LibCPrelude";
+   $nlmexit = "_LibCPostlude";
+   @nlm_flags = ("pseudopreemption", "flag_on 64");
 }
 else
 {
    $cflags.=" -DNETWARE_CLIB";
-   $lflags.=" -entry _Prelude -exit _Stop";
+   $nlmstart = "_Prelude";
+   $nlmexit = "_Stop";
 }
 
 # If BSD Socket support is requested, set a define for the compiler
 if ($BSDSOCK)
 {
    $cflags.=" -DNETWARE_BSDSOCK";
+   if (!$LIBC)
+   {
+      $cflags.=" -DNETDB_USE_INTERNET";
+   }
 }
 
 
@@ -154,16 +270,25 @@ if ($shlib)
 }
 else
 {
-   $libp=".lib";
-   $shlibp=".lib";
-   $lib_flags="-nodefaults -type library";
+   if ($gnuc) # GNUC Tools
+   {
+      $libp=".a";
+      $shlibp=".a";
+      $lib_flags="-cr";
+   }
+   else       # CodeWarrior
+   {
+      $libp=".lib";
+      $shlibp=".lib";
+      $lib_flags="-nodefaults -type library -o";
+   }
    if ($LIBC)
    {
       $out_def.="_nw_libc";
       $tmp_def.="_nw_libc";
       $inc_def.="_nw_libc";
    }
-   else  # NETWARE_CLIB 
+   else  # NETWARE_CLIB
    {
       $out_def.="_nw_clib";
       $tmp_def.="_nw_clib";
@@ -172,7 +297,7 @@ else
 }
 
 # used by mk1mf.pl
-$obj='.obj';
+$obj='.o';
 $ofile='-o ';
 $efile='';
 $exep='.nlm';
@@ -180,30 +305,43 @@ $ex_libs='';
 
 if (!$no_asm)
 {
-   $bn_asm_obj="crypto${o}bn${o}asm${o}bn-nw.obj";
+   $bn_asm_obj="\$(OBJ_D)${o}bn-nw${obj}";
    $bn_asm_src="crypto${o}bn${o}asm${o}bn-nw.asm";
-   $des_enc_obj="crypto${o}des${o}asm${o}d-nw.obj crypto${o}des${o}asm${o}y-nw.obj";
+   $bnco_asm_obj="\$(OBJ_D)${o}co-nw${obj}";
+   $bnco_asm_src="crypto${o}bn${o}asm${o}co-nw.asm";
+   $aes_asm_obj="\$(OBJ_D)${o}a-nw${obj}";
+   $aes_asm_src="crypto${o}aes${o}asm${o}a-nw.asm";
+   $des_enc_obj="\$(OBJ_D)${o}d-nw${obj} \$(OBJ_D)${o}y-nw${obj}";
    $des_enc_src="crypto${o}des${o}asm${o}d-nw.asm crypto${o}des${o}asm${o}y-nw.asm";
-   $bf_enc_obj="crypto${o}bf${o}asm${o}b-nw.obj";
+   $bf_enc_obj="\$(OBJ_D)${o}b-nw${obj}";
    $bf_enc_src="crypto${o}bf${o}asm${o}b-nw.asm";
-   $cast_enc_obj="crypto${o}cast${o}asm${o}c-nw.obj";
+   $cast_enc_obj="\$(OBJ_D)${o}c-nw${obj}";
    $cast_enc_src="crypto${o}cast${o}asm${o}c-nw.asm";
-   $rc4_enc_obj="crypto${o}rc4${o}asm${o}r4-nw.obj";
+   $rc4_enc_obj="\$(OBJ_D)${o}r4-nw${obj}";
    $rc4_enc_src="crypto${o}rc4${o}asm${o}r4-nw.asm";
-   $rc5_enc_obj="crypto${o}rc5${o}asm${o}r5-nw.obj";
+   $rc5_enc_obj="\$(OBJ_D)${o}r5-nw${obj}";
    $rc5_enc_src="crypto${o}rc5${o}asm${o}r5-nw.asm";
-   $md5_asm_obj="crypto${o}md5${o}asm${o}m5-nw.obj";
+   $md5_asm_obj="\$(OBJ_D)${o}m5-nw${obj}";
    $md5_asm_src="crypto${o}md5${o}asm${o}m5-nw.asm";
-   $sha1_asm_obj="crypto${o}sha${o}asm${o}s1-nw.obj";
+   $sha1_asm_obj="\$(OBJ_D)${o}s1-nw${obj}";
    $sha1_asm_src="crypto${o}sha${o}asm${o}s1-nw.asm";
-   $rmd160_asm_obj="crypto${o}ripemd${o}asm${o}rm-nw.obj";
+   $rmd160_asm_obj="\$(OBJ_D)${o}rm-nw${obj}";
    $rmd160_asm_src="crypto${o}ripemd${o}asm${o}rm-nw.asm";
-   $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";
+   $whirlpool_asm_obj="\$(OBJ_D)${o}wp-nw${obj}";
+   $whirlpool_asm_src="crypto${o}whrlpool${o}asm${o}wp-nw.asm";
+   $cpuid_asm_obj="\$(OBJ_D)${o}x86cpuid-nw${obj}";
+   $cpuid_asm_src="crypto${o}x86cpuid-nw.asm";
+   $cflags.=" -DOPENSSL_CPUID_OBJ -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DSHA1_ASM -DWHIRLPOOL_ASM";
+   $cflags.=" -DAES_ASM -DRMD160_ASM";
 }
 else
 {
    $bn_asm_obj='';
    $bn_asm_src='';
+   $bnco_asm_obj='';
+   $bnco_asm_src='';
+   $aes_asm_obj='';
+   $aes_asm_src='';
    $des_enc_obj='';
    $des_enc_src='';
    $bf_enc_obj='';
@@ -220,15 +358,17 @@ else
    $sha1_asm_src='';
    $rmd160_asm_obj='';
    $rmd160_asm_src='';
+   $whirlpool_asm_obj='';
+   $whirlpool_asm_src='';
+   $cpuid_asm_obj='';
+   $cpuid_asm_src='';
 }
 
 # create the *.def linker command files in \openssl\netware\ directory
 sub do_def_file
 {
    # strip off the leading path
-   my($target) = bname(@_);
-   my($def_file);
-   my($mod_file);
+   my($target) = bname(shift);
    my($i);
 
    if ($target =~ /(.*).nlm/)
@@ -239,35 +379,72 @@ sub do_def_file
    # special case for openssl - the mk1mf.pl defines E_EXE = openssl
    if ($target =~ /E_EXE/)
    {
-      $target = "openssl";
+      $target =~ s/\$\(E_EXE\)/openssl/;
    }
 
    # Note: originally tried to use full path ( \openssl\netware\$target.def )
    # Metrowerks linker choked on this with an assertion failure. bug???
    #
-   $def_file = "netware\\$target.def";
+   my($def_file) = "netware${o}$target.def";
 
    open(DEF_OUT, ">$def_file") || die("unable to open file $def_file\n");
 
-   print( DEF_OUT "# command file generated by netware.pl for Metrowerks build\n" );
+   print( DEF_OUT "# command file generated by netware.pl for NLM target.\n" );
+   print( DEF_OUT "# do not edit this file - all your changes will be lost!!\n" );
    print( DEF_OUT "#\n");
-   print( DEF_OUT "DESCRIPTION \"$target\"\n");
-   
+   print( DEF_OUT "DESCRIPTION \"$target ($libarch) - OpenSSL $nlmverstr\"\n");
+   print( DEF_OUT "COPYRIGHT \"$nlmcpystr\"\n");
+   print( DEF_OUT "VERSION $nlmvernum\n");
+   print( DEF_OUT "STACK $nlmstack\n");
+   print( DEF_OUT "START $nlmstart\n");
+   print( DEF_OUT "EXIT $nlmexit\n");
+
+   # special case for openssl
+   if ($target eq "openssl")
+   {
+      print( DEF_OUT "SCREENNAME \"OpenSSL $nlmverstr\"\n");
+   }
+   else
+   {
+      print( DEF_OUT "SCREENNAME \"DEFAULT\"\n");
+   }
+
    foreach $i (@misc_imports)
    {
       print( DEF_OUT "IMPORT $i\n");
    }
-   
+
    foreach $i (@import_files)
    {
-      print( DEF_OUT "IMPORT \@$import_path\\$i\n");
+      print( DEF_OUT "IMPORT \@$import_path${o}$i\n");
    }
-   
+
    foreach $i (@module_files)
    {
       print( DEF_OUT "MODULE $i\n");
    }
 
+   foreach $i (@nlm_flags)
+   {
+      print( DEF_OUT "$i\n");
+   }
+
+   if ($gnuc)
+   {
+      if ($target =~ /openssl/)
+      {
+         print( DEF_OUT "INPUT ${tmp_def}${o}openssl${obj}\n");
+         print( DEF_OUT "INPUT ${tmp_def}${o}openssl${libp}\n");
+      }
+      else
+      {
+         print( DEF_OUT "INPUT ${tmp_def}${o}${target}${obj}\n");
+      }
+      print( DEF_OUT "INPUT $prelude\n");
+      print( DEF_OUT "INPUT ${out_def}${o}${ssl}${libp} ${out_def}${o}${crypto}${libp}\n");
+      print( DEF_OUT "OUTPUT $target.nlm\n");
+   }
+
    close(DEF_OUT);
    return($def_file);
 }
@@ -281,7 +458,7 @@ sub do_lib_rule
    if (!$shlib)
    {
       $ret.="\t\@echo Building Lib: $name\n";
-      $ret.="\t\$(MKLIB) $lib_flags -o $target $objs\n";
+      $ret.="\t\$(MKLIB) $lib_flags $target $objs\n";
       $ret.="\t\@echo .\n"
    }
    else
@@ -297,17 +474,15 @@ sub do_link_rule
 {
    my($target,$files,$dep_libs,$libs)=@_;
    my($ret);
-   my($def_file);
-
-   $def_file = do_def_file($target);
+   my($def_file) = do_def_file($target);
 
-   # special case for openssl - the mk1mf.pl defines E_EXE = openssl
+   $ret.="$target: $files $dep_libs\n";
 
    # NOTE:  When building the test nlms no screen name is given
    #  which causes the console screen to be used.  By using the console
    #  screen there is no "<press any key to continue>" message which
-   #  requires user interaction.  The test script ( tests.pl ) needs to be
-   #  able to run the tests without requiring user interaction.
+   #  requires user interaction.  The test script ( do_tests.pl ) needs
+   #  to be able to run the tests without requiring user interaction.
    #
    #  However, the sample program "openssl.nlm" is used by the tests and is
    #  a interactive sample so a screen is desired when not be run by the
@@ -315,27 +490,41 @@ sub do_link_rule
    #    openssl2 - no screen used by tests
    #    openssl - default screen - use for normal interactive modes
    #
+
+   # special case for openssl - the mk1mf.pl defines E_EXE = openssl
    if ($target =~ /E_EXE/)
    {
       my($target2) = $target;
 
       $target2 =~ s/\(E_EXE\)/\(E_EXE\)2/;
 
-      $ret.="$target: $files $dep_libs\n";
-
-         # openssl
-      $ret.="\t\$(LINK) \$(LFLAGS) -screenname openssl -commandfile $def_file $files \"$prelude\" $libs -o $target\n";
-         # openssl2
-      $ret.="\t\$(LINK) \$(LFLAGS) -commandfile $def_file $files \"$prelude\" $libs -o $target2\n";
+      # openssl2
+      my($def_file2) = do_def_file($target2);
+
+      if ($gnuc)
+      {
+         $ret.="\t\$(MKLIB) $lib_flags \$(TMP_D)${o}\$(E_EXE).a \$(filter-out \$(TMP_D)${o}\$(E_EXE)${obj},$files)\n";
+         $ret.="\t\$(LINK) \$(LFLAGS) $def_file2\n";
+         $ret.="\t\@$mv \$(E_EXE)2.nlm \$(TEST_D)\n";
+      }
+      else
+      {
+         $ret.="\t\$(LINK) \$(LFLAGS) $def_file2 $files \"$prelude\" $libs -o $target2\n";
+      }
+   }
+   if ($gnuc)
+   {
+      $ret.="\t\$(LINK) \$(LFLAGS) $def_file\n";
+      $ret.="\t\@$mv \$(\@F) \$(TEST_D)\n";
    }
    else
    {
-      $ret.="$target: $files $dep_libs\n";
-      $ret.="\t\$(LINK) \$(LFLAGS) -commandfile $def_file $files \"$prelude\" $libs -o $target\n";
+      $ret.="\t\$(LINK) \$(LFLAGS) $def_file $files \"$prelude\" $libs -o $target\n";
    }
 
    $ret.="\n";
    return($ret);
+
 }
 
 1;