summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/util/pl
diff options
context:
space:
mode:
authordjm <>2010-10-01 22:54:18 +0000
committerdjm <>2010-10-01 22:54:18 +0000
commitb204ac0374903f9d6a2fcc50cfd94578e357d00a (patch)
tree11298f84d1fd40ee808d1e96c219ce8db2ce537e /src/lib/libcrypto/util/pl
parent424deb351931af3fd885740bc351436321fad2f9 (diff)
parentf6ca1ae73bb9eabfb510df2cffc2599db98d35a9 (diff)
downloadopenbsd-b204ac0374903f9d6a2fcc50cfd94578e357d00a.tar.gz
openbsd-b204ac0374903f9d6a2fcc50cfd94578e357d00a.tar.bz2
openbsd-b204ac0374903f9d6a2fcc50cfd94578e357d00a.zip
This commit was generated by cvs2git to track changes on a CVS vendor
branch.
Diffstat (limited to 'src/lib/libcrypto/util/pl')
-rw-r--r--src/lib/libcrypto/util/pl/netware.pl16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/lib/libcrypto/util/pl/netware.pl b/src/lib/libcrypto/util/pl/netware.pl
index 173c9919f2..c78bcfc874 100644
--- a/src/lib/libcrypto/util/pl/netware.pl
+++ b/src/lib/libcrypto/util/pl/netware.pl
@@ -131,13 +131,14 @@ else
131# assembler 131# assembler
132if ($nw_nasm) 132if ($nw_nasm)
133{ 133{
134 $asm=(`nasm -v 2>NUL` gt `nasmw -v 2>NUL`?"nasm":"nasmw");
134 if ($gnuc) 135 if ($gnuc)
135 { 136 {
136 $asm="nasmw -s -f elf"; 137 $asm.=" -s -f elf";
137 } 138 }
138 else 139 else
139 { 140 {
140 $asm="nasmw -s -f coff"; 141 $asm.=" -s -f coff -d __coff__";
141 } 142 }
142 $afile="-o "; 143 $afile="-o ";
143 $asm.=" -g" if $debug; 144 $asm.=" -g" if $debug;
@@ -323,13 +324,16 @@ if (!$no_asm)
323 $rc5_enc_src="crypto${o}rc5${o}asm${o}r5-nw.asm"; 324 $rc5_enc_src="crypto${o}rc5${o}asm${o}r5-nw.asm";
324 $md5_asm_obj="\$(OBJ_D)${o}m5-nw${obj}"; 325 $md5_asm_obj="\$(OBJ_D)${o}m5-nw${obj}";
325 $md5_asm_src="crypto${o}md5${o}asm${o}m5-nw.asm"; 326 $md5_asm_src="crypto${o}md5${o}asm${o}m5-nw.asm";
326 $sha1_asm_obj="\$(OBJ_D)${o}s1-nw${obj}"; 327 $sha1_asm_obj="\$(OBJ_D)${o}s1-nw${obj} \$(OBJ_D)${o}sha256-nw${obj} \$(OBJ_D)${o}sha512-nw${obj}";
327 $sha1_asm_src="crypto${o}sha${o}asm${o}s1-nw.asm"; 328 $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";
328 $rmd160_asm_obj="\$(OBJ_D)${o}rm-nw${obj}"; 329 $rmd160_asm_obj="\$(OBJ_D)${o}rm-nw${obj}";
329 $rmd160_asm_src="crypto${o}ripemd${o}asm${o}rm-nw.asm"; 330 $rmd160_asm_src="crypto${o}ripemd${o}asm${o}rm-nw.asm";
331 $whirlpool_asm_obj="\$(OBJ_D)${o}wp-nw${obj}";
332 $whirlpool_asm_src="crypto${o}whrlpool${o}asm${o}wp-nw.asm";
330 $cpuid_asm_obj="\$(OBJ_D)${o}x86cpuid-nw${obj}"; 333 $cpuid_asm_obj="\$(OBJ_D)${o}x86cpuid-nw${obj}";
331 $cpuid_asm_src="crypto${o}x86cpuid-nw.asm"; 334 $cpuid_asm_src="crypto${o}x86cpuid-nw.asm";
332 $cflags.=" -DOPENSSL_CPUID_OBJ -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DSHA1_ASM"; 335 $cflags.=" -DOPENSSL_CPUID_OBJ -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DWHIRLPOOL_ASM";
336 $cflags.=" -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM";
333 $cflags.=" -DAES_ASM -DRMD160_ASM"; 337 $cflags.=" -DAES_ASM -DRMD160_ASM";
334} 338}
335else 339else
@@ -356,6 +360,8 @@ else
356 $sha1_asm_src=''; 360 $sha1_asm_src='';
357 $rmd160_asm_obj=''; 361 $rmd160_asm_obj='';
358 $rmd160_asm_src=''; 362 $rmd160_asm_src='';
363 $whirlpool_asm_obj='';
364 $whirlpool_asm_src='';
359 $cpuid_asm_obj=''; 365 $cpuid_asm_obj='';
360 $cpuid_asm_src=''; 366 $cpuid_asm_src='';
361} 367}