From 6ff28e017daa16716b2195598be0a7702a1083f3 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Fri, 4 Jan 2008 13:18:09 +0000
Subject: Update netware to use new SHA2 assembly language modules.

---
 Netware/build.bat  | 2 ++
 util/pl/netware.pl | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Netware/build.bat b/Netware/build.bat
index b146dd9f2b..3125c2a487 100644
--- a/Netware/build.bat
+++ b/Netware/build.bat
@@ -159,6 +159,8 @@ cd ..\..\..
 echo SHA1
 cd crypto\sha\asm
 perl sha1-586.pl %ASM_MODE% > s1-nw.asm
+perl sha256-586.pl %ASM_MODE% > sha256-nw.asm
+perl sha512-586.pl %ASM_MODE% > sha512-nw.asm
 cd ..\..\..
 
 echo RIPEMD160
diff --git a/util/pl/netware.pl b/util/pl/netware.pl
index 57f8091e3c..473f14801c 100644
--- a/util/pl/netware.pl
+++ b/util/pl/netware.pl
@@ -131,13 +131,14 @@ else
 # assembler
 if ($nw_nasm)
 {
+   $asm=(`nasm -v 2>NUL` gt `nasmw -v 2>NUL`?"nasm":"nasmw");
    if ($gnuc)
    {
-      $asm="nasmw -s -f elf";
+      $asm.=" -s -f elf";
    }
    else
    {
-      $asm="nasmw -s -f coff -d __coff__";
+      $asm.=" -s -f coff -d __coff__";
    }
    $afile="-o ";
    $asm.=" -g" if $debug;
@@ -323,8 +324,8 @@ if (!$no_asm)
    $rc5_enc_src="crypto${o}rc5${o}asm${o}r5-nw.asm";
    $md5_asm_obj="\$(OBJ_D)${o}m5-nw${obj}";
    $md5_asm_src="crypto${o}md5${o}asm${o}m5-nw.asm";
-   $sha1_asm_obj="\$(OBJ_D)${o}s1-nw${obj}";
-   $sha1_asm_src="crypto${o}sha${o}asm${o}s1-nw.asm";
+   $sha1_asm_obj="\$(OBJ_D)${o}s1-nw${obj} \$(OBJ_D)${o}sha256-nw${obj} \$(OBJ_D)${o}sha512-nw${obj}";
+   $sha1_asm_src="crypto${o}sha${o}asm${o}s1-nw.asm crypto${o}sha${o}asm${o}sha256-nw.asm crypto${o}sha${o}asm${o}sha512-nw.asm";
    $rmd160_asm_obj="\$(OBJ_D)${o}rm-nw${obj}";
    $rmd160_asm_src="crypto${o}ripemd${o}asm${o}rm-nw.asm";
    $whirlpool_asm_obj="\$(OBJ_D)${o}wp-nw${obj}";
-- 
cgit v1.2.3