diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-05-26 14:19:19 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-05-26 14:19:19 +0000 |
| commit | 7207eca1ee06ad4b5b5ab7b16e57f5f4f61606dd (patch) | |
| tree | 807dd0dc17677e2ba0a464548ac94096a4ca6933 /apps/Makefile | |
| parent | 9c34782478f00faba7bac87bd03a0f4f1ee53747 (diff) | |
The first of many changes to make OpenSSL 1.0.1 FIPS capable.
Add static build support to openssl utility.
Add new "fips" option to Configure.
Make use of installed fipsld and fips_standalone_sha1
Initialise FIPS error callbacks, locking and DRBG.
Doesn't do anything much yet: no crypto is redirected to the FIPS module.
Doesn't completely build either but the openssl utility can enter FIPS mode:
which doesn't do anything much either.
Diffstat (limited to 'apps/Makefile')
| -rw-r--r-- | apps/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/Makefile b/apps/Makefile index bb384abdf3..658a09a2f2 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -153,6 +153,8 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) $(RM) $(EXE) shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ shlib_target="$(SHLIB_TARGET)"; \ + elif [ -n "$(FIPSCANLIB)" ]; then \ + FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)bin/fipsld; export CC FIPSLD_CC; \ fi; \ LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ $(MAKE) -f $(TOP)/Makefile.shared -e \ |