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

revert fipslink.pl unlink retry change

parent ac381944

fips/fips_locl.h

+2 −2
Original line number Diff line number Diff line
@@ -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_status(void);



#define FIPS_MODULE_VERSION_NUMBER	0x20000008L

#define FIPS_MODULE_VERSION_TEXT	"FIPS 2.0-rc8 unvalidated test module xx XXX xxxx"

#define FIPS_MODULE_VERSION_NUMBER	0x20000009L

#define FIPS_MODULE_VERSION_TEXT	"FIPS 2.0-rc9 unvalidated test module xx XXX xxxx"



#ifdef  __cplusplus

}

util/fipslink.pl

+0 −10
Original line number Diff line number Diff line
@@ -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";

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";

system "$fips_link @ARGV";

die "Second stage Link failure" if $? != 0;