diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-05-26 21:23:11 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-05-26 21:23:11 +0000 |
| commit | a168ec1d27afc234791de0e4ee6a784bad411b22 (patch) | |
| tree | 393a5aca788031ec3f185482856e7db462653ad4 /Makefile.org | |
| parent | 2a351443276ea827c7716eb0e25933ed88444afb (diff) | |
| download | openssl-a168ec1d27afc234791de0e4ee6a784bad411b22.tar.gz | |
Support shared library builds of FIPS capable OpenSSL, add fipscanister.o
to libcrypto.a so linking to libcrypto.a works.
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org index 4f5b4351ff..56abf480f9 100644 --- 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; \ |