Send no_renegotiation alert as required by spec.

[oweals/openssl.git] / fips / Makefile

diff --git a/fips/Makefile b/fips/Makefile
index 4e016b7b0ea977a7f32e0de606545c8539c0ea2f..720a883a6949fae8b2d106a144f805f21fe4788f 100644 (file)
--- a/fips/Makefile
+++ b/fips/Makefile
@@ -63,7 +63,7 @@ testapps:
 all:
        @if [ -z "$(FIPSLIBDIR)" ]; then \
                $(MAKE) -e subdirs lib fips_premain_dso$(EXE_EXT); \
-       else \
+       else  \
                $(MAKE) -e lib fips_premain_dso$(EXE_EXT) fips_standalone_sha1$(EXE_EXT); \
        fi
 
@@ -109,7 +109,7 @@ fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
                HP-UX|OSF1|SunOS) set -x; /usr/ccs/bin/ld -r -o $@ $$objs ;; \
                *) set -x; $(CC) $$cflags -r -o $@ $$objs ;; \
        esac fi
-       ./fips_standalone_sha1 fipscanister.o > fipscanister.o.sha1
+       ./fips_standalone_sha1$(EXE_EXT) fipscanister.o > fipscanister.o.sha1
 
 # If another exception is immediately required, assign approprite
 # site-specific ld command to FIPS_SITE_LD environment variable.
@@ -123,7 +123,11 @@ fips_premain_dso$(EXE_EXT): fips_premain.c
                $(FIPSLIBDIR)fipscanister.o ../libcrypto.a $(EX_LIBS)
 # this is executed only when linking with external fipscanister.o
 fips_standalone_sha1$(EXE_EXT):        sha/fips_standalone_sha1.c
-       $(CC) $(CFLAGS) -DFIPSCANISTER_O -o $@ sha/fips_standalone_sha1.c $(FIPSLIBDIR)fipscanister.o $(EX_LIBS)
+       if [ -z $(HOSTCC) ] ; then \
+               $(CC) $(CFLAGS) -DFIPSCANISTER_O -o $@ sha/fips_standalone_sha1.c $(FIPSLIBDIR)fipscanister.o $(EX_LIBS) ; \
+       else \
+               $(HOSTCC) $(HOSTCFLAGS) -o $ $@ -I../include -I../crypto sha/fips_standalone_sha1.c ../crypto/sha/sha1dgst.c ; \
+       fi
 
 subdirs:
        @target=all; $(RECURSIVE_MAKE)
@@ -179,10 +183,17 @@ install:
        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
        done;
        @target=install; $(RECURSIVE_MAKE)
-       @cp -p -f fipscanister.o fipscanister.o.sha1 fips_premain.c \
-               fips_premain.c.sha1 \
-               $(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \
-       chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*
+       for i in $(EXE) ; \
+       do \
+               echo "installing $$i"; \
+               cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
+               chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
+               mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
+       done
+       cp -p -f $(FIPSLIBDIR)fipscanister.o $(FIPSLIBDIR)fipscanister.o.sha1 \
+               $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fips_premain.c.sha1 \
+               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/; \
+       chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/fips*
 
 lint:
        @target=lint; $(RECURSIVE_MAKE)