generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Install fipscanister.o and friends from FIPSLIBDIR location.
This commit is contained in:
Dr. Stephen Henson
2009-01-19 16:40:44 +00:00
parent dc0cb7e74f
commit f82c1f0dd8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Configure
View File

@@ -1052,6 +1052,7 @@ foreach (sort (keys %disabled))
print "\n"; print "\n";
} }
push @skip, "fips" unless $fips;
my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
@@ -1447,6 +1448,7 @@ while (<IN>)
} }
} }
$sdirs = 0 unless /\\$/; $sdirs = 0 unless /\\$/;
s/fips // if (/^DIRS=/ && !$fips);
s/^VERSION=.*/VERSION=$version/; s/^VERSION=.*/VERSION=$version/;
s/^MAJOR=.*/MAJOR=$major/; s/^MAJOR=.*/MAJOR=$major/;
s/^MINOR=.*/MINOR=$minor/; s/^MINOR=.*/MINOR=$minor/;

4
fips/Makefile
View File

@@ -179,8 +179,8 @@ install:
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
done; done;
@target=install; $(RECURSIVE_MAKE) @target=install; $(RECURSIVE_MAKE)
@cp -p -f fipscanister.o fipscanister.o.sha1 fips_premain.c \ @cp -p -f $(FIPSLIBDIR)fipscanister.o $(FIPSLIBDIR)fipscanister.o.sha1 \
fips_premain.c.sha1 \ $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fips_premain.c.sha1 \
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \ $(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \
chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips* chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*