wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert fipslink.pl unlink retry change

Browse source
This commit is contained in:
Dr. Stephen Henson 2012-01-18 15:07:11 +00:00
parent ac381944ac
commit 1de6a62222
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fips/fips_locl.h
View file

@ -67,8 +67,8 @@ int fips_post_failed(int id, int subid, void *ex);
int fips_post_corrupt(int id, int subid, void *ex); int fips_post_corrupt(int id, int subid, void *ex);
int fips_post_status(void); int fips_post_status(void);
#define FIPS_MODULE_VERSION_NUMBER 0x20000008L #define FIPS_MODULE_VERSION_NUMBER 0x20000009L
#define FIPS_MODULE_VERSION_TEXT "FIPS 2.0-rc8 unvalidated test module xx XXX xxxx" #define FIPS_MODULE_VERSION_TEXT "FIPS 2.0-rc9 unvalidated test module xx XXX xxxx"
#ifdef __cplusplus #ifdef __cplusplus
} }

10
util/fipslink.pl
View file

@ -57,16 +57,6 @@ print "$fips_cc -DHMAC_SHA1_SIG=\\\"$fips_hash\\\" $fips_cc_args $fips_libdir/fi
system "$fips_cc -DHMAC_SHA1_SIG=\\\"$fips_hash\\\" $fips_cc_args $fips_libdir/fips_premain.c"; system "$fips_cc -DHMAC_SHA1_SIG=\\\"$fips_hash\\\" $fips_cc_args $fips_libdir/fips_premain.c";
die "Second stage Compile failure" if $? != 0; die "Second stage Compile failure" if $? != 0;
my $delcnt = 0;
# On windows the previous file doesn't always close straight away
# so retry an unlink operation a few times if it fails.
while (!unlink($fips_target))
{
sleep 2;
die "Can't delete $fips_target" if ($delcnt++ > 10);
}
print "$fips_link @ARGV\n"; 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;