diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-11-07 00:22:58 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-11-07 00:22:58 +0100 |
| commit | 6a0ea5d23971b437befc6d945c8042499571f9f7 (patch) | |
| tree | 1b93632bf43823ca85c88889d22ab4e6a0b75187 /fips | |
| parent | e_aes.c: fold aesni_xts_cipher and [most importantly] fix aes_xts_cipher's (diff) | |
| download | openssl-6a0ea5d23971b437befc6d945c8042499571f9f7.tar.xz openssl-6a0ea5d23971b437befc6d945c8042499571f9f7.zip | |
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 6184e2064e..62565fd032 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 |