diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2007-07-21 20:18:47 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2007-07-21 20:18:47 +0000 |
| commit | 1970bc2703489cc05107a89ea5ff9a6c070f51fd (patch) | |
| tree | 80344f6133e3538424a9ce8703a42e3b03edb375 | |
| parent | 08debe11f879487b7fb3391b3229a845545f8026 (diff) | |
For Unix fips builds...
1. Make shared library build default.
2. Fix libcrypto build to work with shared builds.
3. Link fips utilities to fipscanister.o except for fipsdso builds.
| -rwxr-xr-x | Configure | 7 | ||||
| -rw-r--r-- | Makefile.org | 7 | ||||
| -rw-r--r-- | test/Makefile | 2 |
3 files changed, 13 insertions, 3 deletions
@@ -903,6 +903,11 @@ print "Configuring for $target\n"; &usage if (!defined($table{$target})); +if ($fips && ($disabled{"shared"} eq "default")) + { + delete $disabled{"shared"}; + } + foreach (sort (keys %disabled)) { @@ -1179,7 +1184,7 @@ if ($zlib) my $shared_mark = ""; if ($shared_target eq "") { - $no_shared_warn = 1 if !$no_shared; + $no_shared_warn = 1 if !$no_shared && !$fips; $no_shared = 1; } if (!$no_shared) diff --git a/Makefile.org b/Makefile.org index 2843a9fbb0..6a19e9e898 100644 --- a/Makefile.org +++ b/Makefile.org @@ -354,7 +354,12 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS) $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \ $(AR) libcrypto.a fips-1.0/fipscanister.o ; \ else \ - $(MAKE) SHLIBDIRS='crypto' build-shared; \ + if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ + FIPSLD_CC=$(CC); CC=fips-1.0/fipsld; \ + FIPSLD_NPT="y"; FIPSLD_LIBFIPS=y; \ + export CC FIPSLD_CC FIPSLD_NPT FIPSLD_LIBFIPS; \ + fi; \ + $(MAKE) -e SHLIBDIRS='crypto' build-shared; \ fi \ else \ echo "There's no support for shared libraries on this platform" >&2; \ diff --git a/test/Makefile b/test/Makefile index 8421b999aa..2338406d30 100644 --- a/test/Makefile +++ b/test/Makefile @@ -397,7 +397,7 @@ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ shlib_target="$(SHLIB_TARGET)"; \ fi; \ - if [ -z "$(SHARED_LIBS)" -o "$${shlib_target}" = "darwin-shared" ] ; then \ + if [ "$(FIPSCANLIB)" != "libfips" -o -z "$(SHARED_LIBS)" -o "$${shlib_target}" = "darwin-shared" ] ; then \ LIBRARIES=""; \ if [ -n "$(FIPSCANLIB)" ]; then \ FIPSLD_CC=$(CC); CC=$(TOP)/fips-1.0/fipsld; FIPSLD_NPT="y" \ |