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

util/fipslink.pl: further adjustments.

Browse Source
This commit is contained in:
Andy Polyakov 2012-10-27 23:36:43 +00:00
parent 7f5bf370db
commit 536a16435b
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fips/sha/Makefile
View File

@ -30,7 +30,8 @@ LIB=$(TOP)/libcrypto.a
LIBSRC=fips_sha1_selftest.c LIBSRC=fips_sha1_selftest.c
LIBOBJ=fips_sha1_selftest.o LIBOBJ=fips_sha1_selftest.o
SRC= $(LIBSRC) fips_standalone_sha1.c SRC= $(LIBSRC)
PROGS= fips_standalone_sha1.c
EXHEADER= EXHEADER=
HEADER= HEADER=

1
test/Makefile
View File

@ -12,6 +12,7 @@ PERL= perl
# KRB5 stuff # KRB5 stuff
KRB5_INCLUDES= KRB5_INCLUDES=
LIBKRB5= LIBKRB5=
TEST= fips_algvs.c
PEX_LIBS= PEX_LIBS=
EX_LIBS= #-lnsl -lsocket EX_LIBS= #-lnsl -lsocket

23
util/fipslink.pl
View File

@ -33,12 +33,12 @@ check_hash($sha1_exe, "fipscanister.lib");
print "Integrity check OK\n"; print "Integrity check OK\n";
if (grep /fips_premain\.obj/,@ARGV) { if (is_premain_linked(@ARGV)) {
print "$fips_cc $fips_cc_args $fips_libdir/fips_premain.c\n"; print "$fips_cc $fips_cc_args $fips_libdir/fips_premain.c\n";
system "$fips_cc $fips_cc_args $fips_libdir/fips_premain.c"; system "$fips_cc $fips_cc_args $fips_libdir/fips_premain.c";
die "First stage Compile failure" if $? != 0; die "First stage Compile failure" if $? != 0;
} elsif (!defined($ENV{FIPS_SIG})) { } elsif (!defined($ENV{FIPS_SIG})) {
die "no fips_premain.obj"; die "no fips_premain.obj linked";
} }
print "$fips_link @ARGV\n"; print "$fips_link @ARGV\n";
@ -46,7 +46,8 @@ system "$fips_link @ARGV";
die "First stage Link failure" if $? != 0; die "First stage Link failure" if $? != 0;
if (defined($ENV{FIPS_SIG})) { if (defined($ENV{FIPS_SIG})) {
system "$ENV{FIPS_SIG} $fips_target" print "$ENV{FIPS_SIG} $fips_target\n";
system "$ENV{FIPS_SIG} $fips_target";
die "$ENV{FIPS_SIG} $fips_target failed" if $? != 0; die "$ENV{FIPS_SIG} $fips_target failed" if $? != 0;
exit; exit;
} }
@ -71,6 +72,22 @@ print "$fips_link @ARGV\n";
system "$fips_link @ARGV"; system "$fips_link @ARGV";
die "Second stage Link failure" if $? != 0; die "Second stage Link failure" if $? != 0;
sub is_premain_linked
{
return 1 if (grep /fips_premain\.obj/,@_);
foreach (@_)
{
if (/^@(.*)/ && -f $1)
{
open FD,$1 or die "can't open $1";
my $ret = (grep /fips_premain\.obj/,<FD>)?1:0;
close FD;
return $ret;
}
}
return 0;
}
sub check_hash sub check_hash
{ {
my ($sha1_exe, $filename) = @_; my ($sha1_exe, $filename) = @_;