Support shared library builds of FIPS capable OpenSSL, add fipscanister.o

to libcrypto.a so linking to libcrypto.a works.

diff --git a/Makefile.org b/Makefile.org
index 4f5b4351ff3cd6c44d54c6665e436b45478656f7..56abf480f9b9515fd70bac97d729e5552a4e8308 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -285,9 +285,20 @@ all_testapps: build_libs build_testapps
 build_testapps:
        @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
-libcrypto$(SHLIB_EXT): libcrypto.a
+fips_premain_dso$(EXE_EXT): libcrypto.a
+       [ -n "$(FIPSCANLIB)" ] && $(CC) $(CFLAGS) \
+               -DFINGERPRINT_PREMAIN_DSO_LOAD -o $@  \
+               $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \
+               libcrypto.a $(EX_LIBS)
+
+libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
        @if [ "$(SHLIB_TARGET)" != "" ]; then \
-               $(MAKE) SHLIBDIRS=crypto build-shared; \
+               if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+                       FIPSLD_LIBCRYPTO=libcrypto.a ; \
+                       FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)bin/fipsld; \
+                       export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
+               fi; \
+               $(MAKE) -e SHLIBDIRS=crypto build-shared; \
        else \
                echo "There's no support for shared libraries on this platform" >&2; \
                exit 1; \

diff --git a/crypto/Makefile b/crypto/Makefile
index 54c6b46ac022b625a63beb924680455f61c60daa..3e5f7ae88211552e84a695e1afd099b85f40ed4e 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -102,6 +102,7 @@ lib:        $(LIB)
        @touch lib
 $(LIB):        $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)
+       [ -n "$(FIPSLIBDIR)" ] && $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
        $(RANLIB) $(LIB) || echo Never mind.
 
 shared: buildinf.h lib subdirs