generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use FIPSLD_LIBCRYPTO for consistency with other env variables in fipsld.

Browse Source 
Use current directory for fips_premain_dso
This commit is contained in:
Dr. Stephen Henson 2011-05-26 21:20:14 +00:00
parent e558c2aa3f
commit 64f5178d67
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fips/fipsld
View File

@ -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