Index: openssl/util/pl/netware.pl |
=================================================================== |
--- openssl/util/pl/netware.pl (revision 105093) |
+++ openssl/util/pl/netware.pl (working copy) |
@@ -131,13 +131,14 @@ |
# 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"; |
+ $asm.=" -s -f coff -d __coff__"; |
} |
$afile="-o "; |
$asm.=" -g" if $debug; |
@@ -323,13 +324,16 @@ |
$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}"; |
+ $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"; |
+ $cflags.=" -DOPENSSL_CPUID_OBJ -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DWHIRLPOOL_ASM"; |
+ $cflags.=" -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM"; |
$cflags.=" -DAES_ASM -DRMD160_ASM"; |
} |
else |
@@ -356,6 +360,8 @@ |
$sha1_asm_src=''; |
$rmd160_asm_obj=''; |
$rmd160_asm_src=''; |
+ $whirlpool_asm_obj=''; |
+ $whirlpool_asm_src=''; |
$cpuid_asm_obj=''; |
$cpuid_asm_src=''; |
} |