diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-05-26 21:20:14 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-05-26 21:20:14 +0000 |
| commit | 64f5178d67f56ae909e74724bab0e2be635f0986 (patch) | |
| tree | 5afe27bc342f3eca8a96199451c3a60b5ced949c /fips/fipsld | |
| parent | e558c2aa3ff35145e5d622389100e35634e090a8 (diff) | |
Use FIPSLD_LIBCRYPTO for consistency with other env variables in fipsld.
Use current directory for fips_premain_dso
Diffstat (limited to 'fips/fipsld')
| -rwxr-xr-x | fips/fipsld | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fips/fipsld b/fips/fipsld index 442eba45c3..8ce39c3ea5 100755 --- a/fips/fipsld +++ b/fips/fipsld @@ -94,7 +94,7 @@ lib*|*.dll) # must be linking a shared lib... PREMAIN_DSO="${THERE}/fips/fips_premain_dso" elif [ -x "${THERE}/bin/fips_standalone_sha1" ]; then FINGERTYPE="${THERE}/bin/fips_standalone_sha1" - PREMAIN_DSO="fips_premain_dso" + PREMAIN_DSO="./fips_premain_dso" fi # verify fipspremain.c against its detached signature... @@ -106,17 +106,17 @@ lib*|*.dll) # must be linking a shared lib... diff -w "${CANISTER_O}.sha1" - || \ { echo "${CANISTER_O} fingerprint mismatch"; exit 1; } - [ -z "${FIPSLIBCRYPTO}" -a -f "${THERE}/libcrypto.a" ] && \ - FIPSLIBCRYPTO = -f "${THERE}/libcrypto.a" + [ -z "${FIPSLD_LIBCRYPTO}" -a -f "${THERE}/libcrypto.a" ] && \ + FIPSLD_LIBCRYPTO = -f "${THERE}/libcrypto.a" # Temporarily remove fipscanister.o from libcrypto.a! # We are required to use the standalone copy... - if [ -n "${FIPSLIBCRYPTO}" ]; then - if ar d "${FIPSLIBCRYPTO}" fipscanister.o; then - (ranlib "${FIPSLIBCRYPTO}") 2>/dev/null || : - trap 'ar r "${FIPSLIBCRYPTO}" "${CANISTER_O}"; - (ranlib "${FIPSLIBCRYPTO}") 2>/dev/null || :; + if [ -n "${FIPSLD_LIBCRYPTO}" ]; then + if ar d "${FIPSLD_LIBCRYPTO}" fipscanister.o; then + (ranlib "${FIPSLD_LIBCRYPTO}") 2>/dev/null || : + trap 'ar r "${FIPSLD_LIBCRYPTO}" "${CANISTER_O}"; + (ranlib "${FIPSLD_LIBCRYPTO}") 2>/dev/null || :; sleep 1; touch -c "${TARGET}"' 0 fi |