Commit f82c1f0d authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

If not compiling for fips don't do anything in fips directory. 

Install fipscanister.o and friends from FIPSLIBDIR location.
parent dc0cb7e7

Configure

+2 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,7 @@ foreach (sort (keys %disabled)) 
	print "\n";

	}



push @skip, "fips" unless $fips;



my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
@@ -1447,6 +1448,7 @@ while (<IN>) 
			}

		}

	$sdirs = 0 unless /\\$/;

        s/fips // if (/^DIRS=/ && !$fips);

	s/^VERSION=.*/VERSION=$version/;

	s/^MAJOR=.*/MAJOR=$major/;

	s/^MINOR=.*/MINOR=$minor/;

fips/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -179,8 +179,8 @@ 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 \

	@cp -p -f $(FIPSLIBDIR)fipscanister.o $(FIPSLIBDIR)fipscanister.o.sha1 \

		$(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fips_premain.c.sha1 \

		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \

	chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*