diff options
author | appro <appro> | 2011-11-06 23:22:58 +0000 |
---|---|---|
committer | appro <appro> | 2011-11-06 23:22:58 +0000 |
commit | 38a0ed2162b3175fd25c7eb89709ed27081c6762 (patch) | |
tree | 148966cf0dc97e1d5a18573da9816071fc2ad01e /fips | |
parent | 55e032617a31277d810393ade9566ba015cf1ef7 (diff) | |
download | openssl-38a0ed2162b3175fd25c7eb89709ed27081c6762.tar.gz |
fipsld, incore: switch to new cross-compile support.
Diffstat (limited to 'fips')
-rwxr-xr-x | fips/fipsld | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/fips/fipsld b/fips/fipsld index 6184e2064..62565fd03 100755 --- a/fips/fipsld +++ b/fips/fipsld @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (c) 2005-2007 The OpenSSL Project. +# Copyright (c) 2005-2011 The OpenSSL Project. # # Depending on output file name, the script either embeds fingerprint # into libcrypto.so or static application. "Static" refers to static @@ -127,12 +127,15 @@ lib*|*.dll) # must be linking a shared lib... "${PREMAIN_C}" \ ${_WL_PREMAIN} "$@" - # generate signature... - if [ -z "${FIPS_SIG}" ]; then - SIG=`"${PREMAIN_DSO}" "${TARGET}"` - else - SIG=`"${FIPS_SIG}" -dso "${TARGET}"` + if [ "x${FIPS_SIG}" != "x" ]; then + # embed signature + "${FIPS_SIG}" "${TARGET}" + [ $? -ne 42 ] && exit $? fi + + # generate signature... + SIG=`"${PREMAIN_DSO}" "${TARGET}"` + /bin/rm -f "${TARGET}" if [ -z "${SIG}" ]; then echo "unable to collect signature"; exit 1 @@ -172,12 +175,15 @@ lib*|*.dll) # must be linking a shared lib... "${PREMAIN_C}" \ ${_WL_PREMAIN} "$@" - # generate signature... - if [ -z "${FIPS_SIG}" ]; then - SIG=`"${TARGET}"` - else - SIG=`"${FIPS_SIG}" -exe "${TARGET}"` + if [ "x${FIPS_SIG}" != "x" ]; then + # embed signature + "${FIPS_SIG}" "${TARGET}" + [ $? -ne 42 ] && exit $? fi + + # generate signature... + SIG=`"${TARGET}"` + /bin/rm -f "${TARGET}" if [ -z "${SIG}" ]; then echo "unable to collect signature"; exit 1 |