OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Andy
Polyakov
Root: /v/openssl/cvs Email: appro openssl.org
Module: openssl Date:
26-Aug-2007 16:57:42
Branch: OpenSSL-fips-0_9_8-stable Handle:
2007082615574101
Modified files: (Branch:
OpenSSL-fips-0_9_8-stable)
openssl/fips fipsld
openssl/test Makefile
Log:
Framework update.
Summary:
Revision Changes Path
1.1.4.4 +27 -51 openssl/fips/fipsld
1.12.2.10.2.10+4 -3 openssl/test/Makefile
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/fips/fipsld
============================================================
================
$ cvs diff -u -r1.1.4.3 -r1.1.4.4 fipsld
--- openssl/fips/fipsld 26 Aug 2007 08:51:23
-0000 1.1.4.3
+++ openssl/fips/fipsld 26 Aug 2007 14:57:42
-0000 1.1.4.4
-38,7 +38,7
case `basename "$"` in
libcrypto*|libfips*|*.dll) ;;
*) case "$*" in
- *libcrypto.a*|*-lcrypto*) ;;
+ *libcrypto.a*|*-lcrypto*|*fipscanister.o*) ;;
*) exec $ "$" ;;
esac
esac
-52,13 +52,18
THERE="`echo $0 | sed -e 's|[^/]*$||'`"..
-# If set, FIPSLIBDIR is location of installed validated
FIPS module
-if [ -n "$" ]; then
- CANISTER_O="$/fipscanister.o"
-elif [ -f "$/fips/fipscanister.o" ];
then
- CANISTER_O="$/fips/fipscanister.o"
-elif [ -f "$/lib/fipscanister.o" ];
then
- CANISTER_O="$/lib/fipscanister.o"
+# fipscanister.o can appear in command line
+CANISTER_O=`(while [ "x$1" != "x" ];
do case "$1" in *fipscanister.o) echo $1; exit;;
esac; shift; done)`
+if [ -z "$" ]; then
+ # If set, FIPSLIBDIR is location of installed validated
FIPS module
+ if [ -n "$" ]; then
+ CANISTER_O="$/fipscanister.o"
+ elif [ -f "$/fips/fipscanister.o" ];
then
+ CANISTER_O="$/fips/fipscanister.o"
+ elif [ -f "$/lib/fipscanister.o" ];
then
+ CANISTER_O="$/lib/fipscanister.o"
+ fi
+ CANISTER_O_CMD="$"
fi
[ -f $ ] || { echo "unable to find
$"; exit 1; }
-80,38 +85,7
esac
case `basename "$"` in
-libfips*|*fips.dll)
- # libfips.so creation can be taking place in the source
- # directory only!!!
- FINGERTYPE="$/fips/fips_standalone_sha1"
- # fipscanister.o should be specified on command line...
- CANISTER_O=`(while [ "x$1" != "x" ];
do case "$1" in *fipscanister.o) echo $1; exit;;
esac; shift; done)`
- [ -n "$CANISTER_O" ] || { echo
"fipscanister.o is not found"; exit 1; }
- PREMAIN_C=`dirname
"$"`/fips_premain.c
-
- # verify fipspremain.c against its detached
signature...
- $ "$" | sed
"s/(.*//(/" |
- diff -w "$.sha1" - ||
- { echo "$ fingerprint mismatch";
exit 1; }
- # verify fipscanister.o against its detached
signature...
- $ "$" | sed
"s/(.*//(/" |
- diff -w "$.sha1" - ||
- { echo "$ fingerprint mismatch";
exit 1; }
-
- /bin/rm -f "$"
- $ "$" $
"$"
-
- # generate signature...
- SIG=`"$/fips/fips_premain_dso"
"$"`
- /bin/rm -f "$"
- if [ -z "$" ]; then
- echo "unable to collect signature"; exit 1
- fi
-
- # recompile with signature...
- $ -DHMAC_SHA1_SIG="$"
"$" $ "$"
- ;;
-libcrypto*|*.dll) # must be linking a shared lib...
+lib*|*.dll) # must be linking a shared lib...
# Shared lib creation can be taking place in the source
# directory only, but fipscanister.o can reside
elsewhere...
FINGERTYPE="$/fips/fips_standalone_sha1"
-127,16 +101,18
# Temporarily remove fipscanister.o from libcrypto.a!
# We are required to use the standalone copy...
- trap 'ar r "$/libcrypto.a"
"$";
- (ranlib "$/libcrypto.a")
2>/dev/null || :;
- sleep 1;
- touch -c "$"' 0
-
- ar d "$/libcrypto.a" fipscanister.o
2>&1 > /dev/null || :
- (ranlib "$/libcrypto.a") 2>/dev/null
|| :
+ if [ -f "$/libcrypto.a" ]; then
+ if ar d "$/libcrypto.a"
fipscanister.o; then
+ (ranlib "$/libcrypto.a")
2>/dev/null || :
+ trap 'ar r "$/libcrypto.a"
"$";
+ (ranlib "$/libcrypto.a")
2>/dev/null || :;
+ sleep 1;
+ touch -c "$"' 0
+ fi
+ fi
/bin/rm -f "$"
- $ "$"
+ $ ${CANISTER_O_CMD:+"$"}
"$"
$ "$"
-148,7 +124,7
fi
# recompile with signature...
- $ "$"
+ $ ${CANISTER_O_CMD:+"$"}
-DHMAC_SHA1_SIG="$"
"$"
$ "$"
;;
-175,7 +151,7
{ echo "$ fingerprint mismatch";
exit 1; }
/bin/rm -f "$"
- $ "$"
+ $ ${CANISTER_O_CMD:+"$"}
"$"
$ "$"
-187,7 +163,7
fi
# recompile with signature...
- $ "$"
+ $ ${CANISTER_O_CMD:+"$"}
-DHMAC_SHA1_SIG="$"
"$"
$ "$"
;;
.
patch -p0 <<' .'
Index: openssl/test/Makefile
============================================================
================
$ cvs diff -u -r1.12.2.10.2.9 -r1.12.2.10.2.10 Makefile
--- openssl/test/Makefile 21 Aug 2007 12:57:06
-0000 1.12.2.10.2.9
+++ openssl/test/Makefile 26 Aug 2007 14:57:41
-0000 1.12.2.10.2.10
-392,11 +392,12
FIPS_BUILD_CMD=shlib_target=; if [ -n
"$(SHARED_LIBS)" ]; then
shlib_target="$(SHLIB_TARGET)";
fi;
- LIBRARIES="$(LIBCRYPTO) $(LIBKRB5)";
- if [ -z "$(SHARED_LIBS)" ] ; then
+ if [ "$(FIPSCANLIB)" = "libfips" ];
then
+ LIBRARIES="-L$(TOP) -lfips";
+ else
FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC
FIPSLD_CC;
+ LIBRARIES="$${FIPSLIBDIR (TOP)/fips/}
fipscanister.o";
fi;
- [ "$(FIPSCANLIB)" = "libfips" ]
&& LIBRARIES="-L$(TOP) -lfips";
$(MAKE) -f $(TOP)/Makefile.shared -e
CC=$$ APPNAME=$$target$(EXE_EXT)
OBJECTS="$$target.o"
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)"
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
