revert fipslink.pl unlink retry change

give a hand old assemblers assembling loop instruction. (original by Andy)
typo
2012-01-18 15:07:11 +00:00 · 2012-01-18 14:54:20 +00:00 · 2012-01-03 19:43:06 +00:00 · 2012-01-03 14:23:54 +00:00 · 2012-01-03 14:22:45 +00:00 · 2011-12-12 14:02:57 +00:00
3 changed files with 4 additions and 7 deletions
--- a/crypto/perlasm/x86gas.pl
+++ b/crypto/perlasm/x86gas.pl
@@ -45,10 +45,8 @@ sub ::generic
    undef $suffix if ($dst =~ m/^%[xm]/o || $src =~ m/^%[xm]/o);

    if ($#_==0)				{ &::emit($opcode);		}
-    elsif ($opcode =~ m/^j/o && $#_==1)	{ &::emit($opcode,@arg);	}
-    elsif ($opcode eq "call" && $#_==1)	{ &::emit($opcode,@arg);	}
-    elsif ($opcode eq "clflush" && $#_==1){ &::emit($opcode,@arg);	}
-    elsif ($opcode =~ m/^set/&& $#_==1)	{ &::emit($opcode,@arg);	}
+    elsif ($#_==1 && $opcode =~ m/^(call|clflush|j|loop|set)/o)
+					{ &::emit($opcode,@arg);	}
    else				{ &::emit($opcode.$suffix,@arg);}

  1;
--- a/fips/fips_locl.h
+++ b/fips/fips_locl.h
@@ -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	0x20000007L
-#define FIPS_MODULE_VERSION_TEXT	"FIPS 2.0-rc7 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
 }
--- a/util/fipslink.pl
+++ b/util/fipslink.pl
@@ -57,7 +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;

-
 print "$fips_link @ARGV\n";
 system "$fips_link @ARGV";
 die "Second stage Link failure" if $? != 0;
Author	SHA1	Message	Date
Dr. Stephen Henson	1de6a62222	revert fipslink.pl unlink retry change	2012-01-18 15:07:11 +00:00
Dr. Stephen Henson	ac381944ac	give a hand old assemblers assembling loop instruction. (original by Andy)	2012-01-18 14:54:20 +00:00
Dr. Stephen Henson	24fadf2a20	typo	2012-01-03 19:43:06 +00:00
Dr. Stephen Henson	409abd2fec	Prepare RC8	2012-01-03 14:23:54 +00:00
Dr. Stephen Henson	421de62232	unlink target and retry to avoid intermittent Win32 failures	2012-01-03 14:22:45 +00:00
Dr. Stephen Henson	c567812fa6	set version to rc8-dev	2011-12-12 14:02:57 +00:00