diff options
author | djm <> | 2009-01-05 21:36:39 +0000 |
---|---|---|
committer | djm <> | 2009-01-05 21:36:39 +0000 |
commit | 13c662ccd1d22d856f1f2defeea26dd18c0af043 (patch) | |
tree | e0d2d687fbd4e4e9eb6bc4b178ea069817f0aba4 /src/lib/libcrypto/util/pl | |
parent | acc5957d1b6d6872ce50e4100edebccea0476481 (diff) | |
download | openbsd-13c662ccd1d22d856f1f2defeea26dd18c0af043.tar.gz openbsd-13c662ccd1d22d856f1f2defeea26dd18c0af043.tar.bz2 openbsd-13c662ccd1d22d856f1f2defeea26dd18c0af043.zip |
update to openssl-0.9.8i; tested by several, especially krw@
Diffstat (limited to 'src/lib/libcrypto/util/pl')
-rw-r--r-- | src/lib/libcrypto/util/pl/VC-32.pl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl index 9cb2ab7e99..1e254119e6 100644 --- a/src/lib/libcrypto/util/pl/VC-32.pl +++ b/src/lib/libcrypto/util/pl/VC-32.pl | |||
@@ -138,7 +138,7 @@ if ($FLAVOR =~ /CE/) | |||
138 | } | 138 | } |
139 | else | 139 | else |
140 | { | 140 | { |
141 | $ex_libs.=' gdi32.lib advapi32.lib user32.lib'; | 141 | $ex_libs.=' gdi32.lib crypt32.lib advapi32.lib user32.lib'; |
142 | $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); | 142 | $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); |
143 | } | 143 | } |
144 | 144 | ||
@@ -259,7 +259,6 @@ sub do_lib_rule | |||
259 | $name =~ tr/a-z/A-Z/; | 259 | $name =~ tr/a-z/A-Z/; |
260 | $name = "/def:ms/${name}.def"; | 260 | $name = "/def:ms/${name}.def"; |
261 | } | 261 | } |
262 | |||
263 | # $target="\$(LIB_D)$o$target"; | 262 | # $target="\$(LIB_D)$o$target"; |
264 | $ret.="$target: $objs\n"; | 263 | $ret.="$target: $objs\n"; |
265 | if (!$shlib) | 264 | if (!$shlib) |
@@ -274,6 +273,10 @@ sub do_lib_rule | |||
274 | if ($name eq "") | 273 | if ($name eq "") |
275 | { | 274 | { |
276 | $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); | 275 | $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); |
276 | if ($target =~ /capi/) | ||
277 | { | ||
278 | $ex.=' crypt32.lib advapi32.lib'; | ||
279 | } | ||
277 | } | 280 | } |
278 | elsif ($FLAVOR =~ /CE/) | 281 | elsif ($FLAVOR =~ /CE/) |
279 | { | 282 | { |
@@ -283,6 +286,7 @@ sub do_lib_rule | |||
283 | { | 286 | { |
284 | $ex.=' unicows.lib' if ($FLAVOR =~ /NT/); | 287 | $ex.=' unicows.lib' if ($FLAVOR =~ /NT/); |
285 | $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; | 288 | $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; |
289 | $ex.=' crypt32.lib'; | ||
286 | $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); | 290 | $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); |
287 | } | 291 | } |
288 | $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; | 292 | $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; |