diff options
author | djm <> | 2009-01-09 12:15:52 +0000 |
---|---|---|
committer | djm <> | 2009-01-09 12:15:52 +0000 |
commit | 23f8d96f0f508b8bef2602049feee9c44228d34c (patch) | |
tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/util/pl | |
parent | 30562050421d947c3eb3c10edde6e87730b17471 (diff) | |
download | openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2 openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/util/pl')
-rw-r--r-- | src/lib/libcrypto/util/pl/VC-32.pl | 179 |
1 files changed, 162 insertions, 17 deletions
diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl index 1e254119e6..166785db8d 100644 --- a/src/lib/libcrypto/util/pl/VC-32.pl +++ b/src/lib/libcrypto/util/pl/VC-32.pl | |||
@@ -4,12 +4,26 @@ | |||
4 | # | 4 | # |
5 | 5 | ||
6 | $ssl= "ssleay32"; | 6 | $ssl= "ssleay32"; |
7 | $crypto="libeay32"; | 7 | |
8 | if ($fips && !$shlib) | ||
9 | { | ||
10 | $crypto="libeayfips32"; | ||
11 | $crypto_compat = "libeaycompat32.lib"; | ||
12 | } | ||
13 | else | ||
14 | { | ||
15 | $crypto="libeay32"; | ||
16 | } | ||
17 | |||
18 | if ($fipscanisterbuild) | ||
19 | { | ||
20 | $fips_canister_path = "\$(LIB_D)\\fipscanister.lib"; | ||
21 | } | ||
8 | 22 | ||
9 | $o='\\'; | 23 | $o='\\'; |
10 | $cp='$(PERL) util/copy.pl'; | 24 | $cp='$(PERL) util/copy.pl'; |
11 | $mkdir='$(PERL) util/mkdir-p.pl'; | 25 | $mkdir='$(PERL) util/mkdir-p.pl'; |
12 | $rm='del'; | 26 | $rm='del /Q'; |
13 | 27 | ||
14 | $zlib_lib="zlib1.lib"; | 28 | $zlib_lib="zlib1.lib"; |
15 | 29 | ||
@@ -96,7 +110,7 @@ else # Win32 | |||
96 | $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; | 110 | $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; |
97 | $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 | 111 | $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 |
98 | $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 | 112 | $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 |
99 | my $f = $shlib?' /MD':' /MT'; | 113 | my $f = $shlib || $fips ?' /MD':' /MT'; |
100 | $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib | 114 | $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib |
101 | $opt_cflags=$f.' /Ox /O2 /Ob2'; | 115 | $opt_cflags=$f.' /Ox /O2 /Ob2'; |
102 | $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; | 116 | $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; |
@@ -165,12 +179,17 @@ if ($nasm) { | |||
165 | # pick newest version | 179 | # pick newest version |
166 | $asm=($ver gt $vew?"nasm":"nasmw")." -f win32"; | 180 | $asm=($ver gt $vew?"nasm":"nasmw")." -f win32"; |
167 | $afile='-o '; | 181 | $afile='-o '; |
182 | } elsif ($ml64) { | ||
183 | $asm='ml64 /c /Cp /Cx'; | ||
184 | $asm.=' /Zi' if $debug; | ||
185 | $afile='/Fo'; | ||
168 | } else { | 186 | } else { |
169 | $asm='ml /Cp /coff /c /Cx'; | 187 | $asm='ml /Cp /coff /c /Cx'; |
170 | $asm.=" /Zi" if $debug; | 188 | $asm.=" /Zi" if $debug; |
171 | $afile='/Fo'; | 189 | $afile='/Fo'; |
172 | } | 190 | } |
173 | 191 | ||
192 | $aes_asm_obj=''; | ||
174 | $bn_asm_obj=''; | 193 | $bn_asm_obj=''; |
175 | $bn_asm_src=''; | 194 | $bn_asm_src=''; |
176 | $des_enc_obj=''; | 195 | $des_enc_obj=''; |
@@ -179,11 +198,13 @@ $bf_enc_obj=''; | |||
179 | $bf_enc_src=''; | 198 | $bf_enc_src=''; |
180 | 199 | ||
181 | if (!$no_asm) | 200 | if (!$no_asm) |
201 | { | ||
202 | if ($FLAVOR =~ "WIN32") | ||
182 | { | 203 | { |
183 | $aes_asm_obj='crypto\aes\asm\a_win32.obj'; | 204 | $aes_asm_obj='crypto\aes\asm\a_win32.obj'; |
184 | $aes_asm_src='crypto\aes\asm\a_win32.asm'; | 205 | $aes_asm_src='crypto\aes\asm\a_win32.asm'; |
185 | $bn_asm_obj='crypto\bn\asm\bn_win32.obj'; | 206 | $bn_asm_obj='crypto\bn\asm\bn_win32.obj crypto\bn\asm\mt_win32.obj'; |
186 | $bn_asm_src='crypto\bn\asm\bn_win32.asm'; | 207 | $bn_asm_src='crypto\bn\asm\bn_win32.asm crypto\bn\asm\mt_win32.asm'; |
187 | $bnco_asm_obj='crypto\bn\asm\co_win32.obj'; | 208 | $bnco_asm_obj='crypto\bn\asm\co_win32.obj'; |
188 | $bnco_asm_src='crypto\bn\asm\co_win32.asm'; | 209 | $bnco_asm_src='crypto\bn\asm\co_win32.asm'; |
189 | $des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj'; | 210 | $des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj'; |
@@ -204,12 +225,26 @@ if (!$no_asm) | |||
204 | $rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm'; | 225 | $rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm'; |
205 | $cpuid_asm_obj='crypto\cpu_win32.obj'; | 226 | $cpuid_asm_obj='crypto\cpu_win32.obj'; |
206 | $cpuid_asm_src='crypto\cpu_win32.asm'; | 227 | $cpuid_asm_src='crypto\cpu_win32.asm'; |
207 | $cflags.=" -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DSHA1_ASM -DRMD160_ASM"; | 228 | $cflags.=" -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT -DMD5_ASM -DSHA1_ASM -DRMD160_ASM"; |
208 | } | 229 | } |
230 | elsif ($FLAVOR =~ "WIN64A") | ||
231 | { | ||
232 | $aes_asm_obj='$(OBJ_D)\aes-x86_64.obj'; | ||
233 | $aes_asm_src='crypto\aes\asm\aes-x86_64.asm'; | ||
234 | $bn_asm_obj='$(OBJ_D)\x86_64-mont.obj $(OBJ_D)\bn_asm.obj'; | ||
235 | $bn_asm_src='crypto\bn\asm\x86_64-mont.asm'; | ||
236 | $sha1_asm_obj='$(OBJ_D)\sha1-x86_64.obj $(OBJ_D)\sha256-x86_64.obj $(OBJ_D)\sha512-x86_64.obj'; | ||
237 | $sha1_asm_src='crypto\sha\asm\sha1-x86_64.asm crypto\sha\asm\sha256-x86_64.asm crypto\sha\asm\sha512-x86_64.asm'; | ||
238 | $cpuid_asm_obj='$(OBJ_D)\cpuid-x86_64.obj'; | ||
239 | $cpuid_asm_src='crypto\cpuid-x86_64.asm'; | ||
240 | $cflags.=" -DOPENSSL_CPUID_OBJ -DAES_ASM -DOPENSSL_BN_ASM_MONT -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM"; | ||
241 | } | ||
242 | } | ||
209 | 243 | ||
210 | if ($shlib && $FLAVOR !~ /CE/) | 244 | if ($shlib && $FLAVOR !~ /CE/) |
211 | { | 245 | { |
212 | $mlflags.=" $lflags /dll"; | 246 | $mlflags.=" $lflags /dll"; |
247 | # $cflags =~ s| /MD| /MT|; | ||
213 | $lib_cflag=" -D_WINDLL"; | 248 | $lib_cflag=" -D_WINDLL"; |
214 | $out_def="out32dll"; | 249 | $out_def="out32dll"; |
215 | $tmp_def="tmp32dll"; | 250 | $tmp_def="tmp32dll"; |
@@ -232,8 +267,8 @@ $(INCO_D)\applink.c: ms\applink.c | |||
232 | EXHEADER= $(EXHEADER) $(INCO_D)\applink.c | 267 | EXHEADER= $(EXHEADER) $(INCO_D)\applink.c |
233 | 268 | ||
234 | LIBS_DEP=$(LIBS_DEP) $(OBJ_D)\applink.obj | 269 | LIBS_DEP=$(LIBS_DEP) $(OBJ_D)\applink.obj |
235 | CRYPTOOBJ=$(OBJ_D)\uplink.obj $(CRYPTOOBJ) | ||
236 | ___ | 270 | ___ |
271 | $banner .= "CRYPTOOBJ=\$(OBJ_D)\\uplink.obj \$(CRYPTOOBJ)\n"; | ||
237 | $banner.=<<'___' if ($FLAVOR =~ /WIN64/); | 272 | $banner.=<<'___' if ($FLAVOR =~ /WIN64/); |
238 | CRYPTOOBJ=ms\uptable.obj $(CRYPTOOBJ) | 273 | CRYPTOOBJ=ms\uptable.obj $(CRYPTOOBJ) |
239 | ___ | 274 | ___ |
@@ -250,26 +285,56 @@ $cflags.=" /Fd$out_def"; | |||
250 | 285 | ||
251 | sub do_lib_rule | 286 | sub do_lib_rule |
252 | { | 287 | { |
253 | local($objs,$target,$name,$shlib)=@_; | 288 | my($objs,$target,$name,$shlib,$ign,$base_addr) = @_; |
254 | local($ret); | 289 | local($ret); |
255 | 290 | ||
256 | $taget =~ s/\//$o/g if $o ne '/'; | 291 | $taget =~ s/\//$o/g if $o ne '/'; |
257 | if ($name ne "") | 292 | my $base_arg; |
293 | if ($base_addr ne "") | ||
294 | { | ||
295 | $base_arg= " /base:$base_addr"; | ||
296 | } | ||
297 | else | ||
298 | { | ||
299 | $base_arg = ""; | ||
300 | } | ||
301 | if ($target =~ /O_CRYPTO/ && $fipsdso) | ||
302 | { | ||
303 | $name = "/def:ms/libeayfips.def"; | ||
304 | } | ||
305 | elsif ($name ne "") | ||
258 | { | 306 | { |
259 | $name =~ tr/a-z/A-Z/; | 307 | $name =~ tr/a-z/A-Z/; |
260 | $name = "/def:ms/${name}.def"; | 308 | $name = "/def:ms/${name}.def"; |
261 | } | 309 | } |
262 | # $target="\$(LIB_D)$o$target"; | 310 | # $target="\$(LIB_D)$o$target"; |
263 | $ret.="$target: $objs\n"; | 311 | # $ret.="$target: $objs\n"; |
264 | if (!$shlib) | 312 | if (!$shlib) |
265 | { | 313 | { |
266 | # $ret.="\t\$(RM) \$(O_$Name)\n"; | 314 | # $ret.="\t\$(RM) \$(O_$Name)\n"; |
267 | $ex =' '; | 315 | $ex =' '; |
316 | $ret.="$target: $objs\n"; | ||
268 | $ret.="\t\$(MKLIB) $lfile$target @<<\n $objs $ex\n<<\n"; | 317 | $ret.="\t\$(MKLIB) $lfile$target @<<\n $objs $ex\n<<\n"; |
269 | } | 318 | } |
270 | else | 319 | else |
271 | { | 320 | { |
272 | local($ex)=($target =~ /O_CRYPTO/)?'':' $(L_CRYPTO)'; | 321 | my $ex = ""; |
322 | if ($target =~ /O_SSL/) | ||
323 | { | ||
324 | $ex .= " \$(L_CRYPTO)"; | ||
325 | #$ex .= " \$(L_FIPS)" if $fipsdso; | ||
326 | } | ||
327 | my $fipstarget; | ||
328 | if ($fipsdso) | ||
329 | { | ||
330 | $fipstarget = "O_FIPS"; | ||
331 | } | ||
332 | else | ||
333 | { | ||
334 | $fipstarget = "O_CRYPTO"; | ||
335 | } | ||
336 | |||
337 | |||
273 | if ($name eq "") | 338 | if ($name eq "") |
274 | { | 339 | { |
275 | $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); | 340 | $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); |
@@ -290,7 +355,39 @@ sub do_lib_rule | |||
290 | $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); | 355 | $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); |
291 | } | 356 | } |
292 | $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; | 357 | $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; |
293 | $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; | 358 | |
359 | if ($fips && $target =~ /$fipstarget/) | ||
360 | { | ||
361 | $ex.= $mwex unless $fipscanisterbuild; | ||
362 | $ret.="$target: $objs \$(PREMAIN_DSO_EXE)"; | ||
363 | if ($fipsdso) | ||
364 | { | ||
365 | $ex.=" \$(OBJ_D)\\\$(LIBFIPS).res"; | ||
366 | $ret.=" \$(OBJ_D)\\\$(LIBFIPS).res"; | ||
367 | $ret.=" ms/\$(LIBFIPS).def"; | ||
368 | } | ||
369 | $ret.="\n\tSET FIPS_LINK=\$(LINK)\n"; | ||
370 | $ret.="\tSET FIPS_CC=\$(CC)\n"; | ||
371 | $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n"; | ||
372 | $ret.="\tSET PREMAIN_DSO_EXE=\$(PREMAIN_DSO_EXE)\n"; | ||
373 | $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n"; | ||
374 | $ret.="\tSET FIPS_TARGET=$target\n"; | ||
375 | $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n"; | ||
376 | $ret.="\t\$(FIPSLINK) \$(MLFLAGS) /map $base_arg $efile$target "; | ||
377 | $ret.="$name @<<\n \$(SHLIB_EX_OBJ) $objs "; | ||
378 | $ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n"; | ||
379 | } | ||
380 | else | ||
381 | { | ||
382 | $ret.="$target: $objs"; | ||
383 | if ($target =~ /O_CRYPTO/ && $fipsdso) | ||
384 | { | ||
385 | $ret .= " \$(O_FIPS)"; | ||
386 | $ex .= " \$(L_FIPS)"; | ||
387 | } | ||
388 | $ret.="\n\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; | ||
389 | } | ||
390 | |||
294 | $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n"; | 391 | $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n"; |
295 | } | 392 | } |
296 | $ret.="\n"; | 393 | $ret.="\n"; |
@@ -299,16 +396,64 @@ sub do_lib_rule | |||
299 | 396 | ||
300 | sub do_link_rule | 397 | sub do_link_rule |
301 | { | 398 | { |
302 | local($target,$files,$dep_libs,$libs)=@_; | 399 | my($target,$files,$dep_libs,$libs,$standalone)=@_; |
303 | local($ret,$_); | 400 | local($ret,$_); |
304 | |||
305 | $file =~ s/\//$o/g if $o ne '/'; | 401 | $file =~ s/\//$o/g if $o ne '/'; |
306 | $n=&bname($targer); | 402 | $n=&bname($targer); |
307 | $ret.="$target: $files $dep_libs\n"; | 403 | $ret.="$target: $files $dep_libs\n"; |
308 | $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n"; | 404 | if ($standalone == 1) |
309 | $ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n"; | 405 | { |
310 | $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n"; | 406 | $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t"; |
407 | $ret.= "$mwex advapi32.lib " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild); | ||
408 | $ret.="$files $libs\n<<\n"; | ||
409 | } | ||
410 | elsif ($standalone == 2) | ||
411 | { | ||
412 | $ret.="\tSET FIPS_LINK=\$(LINK)\n"; | ||
413 | $ret.="\tSET FIPS_CC=\$(CC)\n"; | ||
414 | $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n"; | ||
415 | $ret.="\tSET PREMAIN_DSO_EXE=\n"; | ||
416 | $ret.="\tSET FIPS_TARGET=$target\n"; | ||
417 | $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n"; | ||
418 | $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n"; | ||
419 | $ret.="\t\$(FIPSLINK) \$(LFLAGS) /map $efile$target @<<\n"; | ||
420 | $ret.="\t\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n"; | ||
421 | } | ||
422 | else | ||
423 | { | ||
424 | $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n"; | ||
425 | $ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n"; | ||
426 | } | ||
427 | $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n"; | ||
311 | return($ret); | 428 | return($ret); |
312 | } | 429 | } |
313 | 430 | ||
431 | sub do_rlink_rule | ||
432 | { | ||
433 | local($target,$rl_start, $rl_mid, $rl_end,$dep_libs,$libs)=@_; | ||
434 | local($ret,$_); | ||
435 | my $files = "$rl_start $rl_mid $rl_end"; | ||
436 | |||
437 | $file =~ s/\//$o/g if $o ne '/'; | ||
438 | $n=&bname($targer); | ||
439 | $ret.="$target: $files $dep_libs \$(FIPS_SHA1_EXE)\n"; | ||
440 | $ret.="\t\$(PERL) ms\\segrenam.pl \$\$a $rl_start\n"; | ||
441 | $ret.="\t\$(PERL) ms\\segrenam.pl \$\$b $rl_mid\n"; | ||
442 | $ret.="\t\$(PERL) ms\\segrenam.pl \$\$c $rl_end\n"; | ||
443 | $ret.="\t\$(MKLIB) $lfile$target @<<\n\t$files\n<<\n"; | ||
444 | $ret.="\t\$(FIPS_SHA1_EXE) $target > ${target}.sha1\n"; | ||
445 | $ret.="\t\$(PERL) util${o}copy.pl -stripcr fips${o}fips_premain.c \$(LIB_D)${o}fips_premain.c\n"; | ||
446 | $ret.="\t\$(CP) fips${o}fips_premain.c.sha1 \$(LIB_D)${o}fips_premain.c.sha1\n"; | ||
447 | $ret.="\n"; | ||
448 | return($ret); | ||
449 | } | ||
450 | |||
451 | sub do_sdef_rule | ||
452 | { | ||
453 | my $ret = "ms/\$(LIBFIPS).def: \$(O_FIPSCANISTER)\n"; | ||
454 | $ret.="\t\$(PERL) util/mksdef.pl \$(MLFLAGS) /out:dummy.dll /def:ms/libeay32.def @<<\n \$(O_FIPSCANISTER)\n<<\n"; | ||
455 | $ret.="\n"; | ||
456 | return $ret; | ||
457 | } | ||
458 | |||
314 | 1; | 459 | 1; |