Change fips directory to fips-1.0

Makefile.org

@@ -180,7 +180,7 @@ LIBZLIB=
 # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
 SHLIB_MARK=
 
-DIRS=   crypto fips ssl $(SHLIB_MARK) apps test tools
+DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools
 SHLIBDIRS= crypto ssl
 
 # dirs in crypto to build

apps/Makefile

@@ -145,7 +145,7 @@ $(DLIBCRYPTO):
 $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
 	$(RM) $(EXE)
 	@if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
-	  FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
+	  FIPSLD_CC=$(CC); CC=$(TOP)/fips-1.0/fipsld; export CC FIPSLD_CC; \
 	fi; \
 	SHARED_LIBS="$(SHARED_LIBS)"; \
 	if [ "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

fips-1.0/Makefile

@@ -133,7 +133,7 @@ lib:	fipscanister.o
 
 shared:	fips_premain_dso$(EXE_EXT)
 	if [ -n "$(SHARED_LIBS)" ]; then \
-		(cd ..; $(MAKE) FIPSLD_CC=$(CC) FIPSLD=fips/fipsld $(SHARED_LIB)); \
+		(cd ..; $(MAKE) FIPSLD_CC=$(CC) FIPSLD=fips-1.0/fipsld $(SHARED_LIB)); \
 	fi
 
 libs:

fips-1.0/fipscanister.o.sha1

@@ -0,0 +1 @@
+HMAC-SHA1(fipscanister.o)= 3ec9f9f0fb9c32ef4cdb93e757dab0f284f966f7

fips-1.0/fipsld

@@ -49,9 +49,9 @@ case "${TARGET}" in
 *libcrypto*|*.dll)	# must be linking a shared lib...
 	# Shared lib creation can be taking place in the source
 	# directory only!!!
-	FINGERTYPE="${THERE}/fips/sha/fips_standalone_sha1"
-	CANISTER_O="${THERE}/fips/fipscanister.o"
-	PREMAIN_C="${THERE}/fips/fips_premain.c"
+	FINGERTYPE="${THERE}/fips-1.0/sha/fips_standalone_sha1"
+	CANISTER_O="${THERE}/fips-1.0/fipscanister.o"
+	PREMAIN_C="${THERE}/fips-1.0/fips_premain.c"
 
 	# verify fipscanister.o against its detached signature...
 	${FINGERTYPE} "${CANISTER_O}" | sed "s/(.*\//(/" | \
@@ -80,7 +80,7 @@ case "${TARGET}" in
 		${_WL_PREMAIN} "$@"
 
 	# generate signature...
-	SIG=`("${THERE}/fips/fips_premain_dso" "${TARGET}" || rm "${TARGET}")`
+	SIG=`("${THERE}/fips-1.0/fips_premain_dso" "${TARGET}" || rm "${TARGET}")`
 	if [ -z "${SIG}" ]; then
 	   echo "unable to collect signature"; exit 1
 	fi
@@ -94,10 +94,10 @@ case "${TARGET}" in
 *)	# must be linking statically...
 	# Static linking can be taking place either in the source
 	# directory or off the installed binary target destination.
-	if [ -x "${THERE}/fips/sha/fips_standalone_sha1" ]; then
-		FINGERTYPE="${THERE}/fips/sha/fips_standalone_sha1"
-		CANISTER_O="${THERE}/fips/fipscanister.o"
-		PREMAIN_C="${THERE}/fips/fips_premain.c"
+	if [ -x "${THERE}/fips-1.0/sha/fips_standalone_sha1" ]; then
+		FINGERTYPE="${THERE}/fips-1.0/sha/fips_standalone_sha1"
+		CANISTER_O="${THERE}/fips-1.0/fipscanister.o"
+		PREMAIN_C="${THERE}/fips-1.0/fips_premain.c"
 	else	# Installed tree is expected to contain
 		# lib/fipscanister.o, lib/fipscanister.o.sha1 and
 		# lib/fips_premain.c [not to mention bin/openssl].

test/Makefile

@@ -337,7 +337,7 @@ BUILD_CMD=SHARED_LIBS="$(SHARED_LIBS)"; \
 	fi
 
 FIPS_BUILD_CMD=if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
-	  FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
+	  FIPSLD_CC=$(CC); CC=$(TOP)/fips-1.0/fipsld; export CC FIPSLD_CC; \
 	fi; $(BUILD_CMD)
 
 $(FIPS_AESTEST)$(EXE_EXT): $(FIPS_AESTEST).o $(DLIBCRYPTO)