diff options
| author | nectar <nectar@FreeBSD.org> | 2005-02-25 05:49:44 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2005-02-25 05:49:44 +0000 |
| commit | ced877b043d77d97f1ad196f15b25ed720c1fcdc (patch) | |
| tree | a843375628b8f7847c8a433651d5c12a4660558c /crypto/openssl/util/pl/Mingw32.pl | |
| parent | 52bc459a40672bffc62b2ff9c2578dbe8832a0b8 (diff) | |
| download | FreeBSD-src-ced877b043d77d97f1ad196f15b25ed720c1fcdc.zip FreeBSD-src-ced877b043d77d97f1ad196f15b25ed720c1fcdc.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.7e.
Diffstat (limited to 'crypto/openssl/util/pl/Mingw32.pl')
| -rw-r--r-- | crypto/openssl/util/pl/Mingw32.pl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crypto/openssl/util/pl/Mingw32.pl b/crypto/openssl/util/pl/Mingw32.pl index 20a1509..ba00305 100644 --- a/crypto/openssl/util/pl/Mingw32.pl +++ b/crypto/openssl/util/pl/Mingw32.pl @@ -22,7 +22,7 @@ if ($debug) else { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -mcpu=i486 -Wall"; } -if ($gaswin and !$no_asm) +if ($gaswin and !$no_asm and !$fips) { $bn_asm_obj='$(OBJ_D)\bn-win32.o'; $bn_asm_src='crypto/bn/asm/bn-win32.s'; @@ -93,13 +93,18 @@ sub do_lib_rule sub do_link_rule { - local($target,$files,$dep_libs,$libs)=@_; + local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_; local($ret,$_); $file =~ s/\//$o/g if $o ne '/'; $n=&bname($target); $ret.="$target: $files $dep_libs\n"; - $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n"; + $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n"; + if (defined $sha1file) + { + $ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file"; + } + $ret.="\n"; return($ret); } 1; |
