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

Auto configure for fips is from restricted tarball.

Browse Source 
Remove more unnecessary files form fips tarball.
This commit is contained in:
Dr. Stephen Henson 2011-04-10 16:18:19 +00:00
parent 6ceb1e8efb
commit c105c96bac
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Configure
View File

@ -693,6 +693,16 @@ my $default_ranlib;
my $perl; my $perl;
my $fips=0; my $fips=0;
# If ssl directory missing assume truncated FIPS tarball
if (! -d ssl)
{
print STDERR "Auto Configuring fipsonly\n";
$fips = 1;
$nofipscanistercheck = 1;
$fipslibdir="";
$fipscanisterinternal="y";
$fipscanisteronly = 1;
}
# All of the following is disabled by default (RC5 was enabled before 0.9.8): # All of the following is disabled by default (RC5 was enabled before 0.9.8):

2
Makefile.fips
View File

@ -487,7 +487,7 @@ openssl.pc: Makefile
echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
Makefile: Makefile.org Configure config Makefile: Makefile.fips Configure config
@echo "Makefile is older than Makefile.org, Configure or config." @echo "Makefile is older than Makefile.org, Configure or config."
@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please." @echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
@false @false

26
util/fipsdist.pl
View File

@ -21,11 +21,29 @@ foreach (split / /, $ENV{LINKDIRS} ) { $cdirs{$_} = 1 };
$cdirs{perlasm} = 1; $cdirs{perlasm} = 1;
my %keep =
(
"Makefile.fips" => 1,
"Makefile.shared" => 1,
"README.FIPS" => 1,
"e_os.h" => 1,
"e_os2.h" => 1,
"Configure" => 1,
"config" => 1,
);
while (<STDIN>) while (<STDIN>)
{ {
chomp; chomp;
# Skip directories but leave top level files. # Keep top level files in list
next unless (/^(fips\/|crypto|util|test|include|ms)/ || (!/\// && -f $_)); if (!/\// && -f $_)
{
next unless exists $keep{$_};
}
else
{
next unless (/^(fips\/|crypto|util|test|include|ms)/);
}
if (/^crypto\/([^\/]+)/) if (/^crypto\/([^\/]+)/)
{ {
# Skip unused directories under crypto/ # Skip unused directories under crypto/
@ -37,6 +55,10 @@ while (<STDIN>)
next if !/(\w+\.c)$/ || !exists $tarobjs{$1}; next if !/(\w+\.c)$/ || !exists $tarobjs{$1};
} }
} }
if (/^test\//)
{
next unless /Makefile/ || /dummytest.c/;
}
print "$_\n"; print "$_\n";
} }
exit 1; exit 1;