prepare for rc5

return error if counter exceeds limit and seed value supplied
check counter value against 4 * L, not 4096
2011-11-25 16:27:19 +00:00 · 2011-11-25 16:03:27 +00:00 · 2011-11-25 15:00:20 +00:00 · 2011-11-21 00:05:15 +00:00
2 changed files with 9 additions and 3 deletions
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -666,7 +666,13 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N,
 			/* "offset = offset + n + 1" */

 			/* step 14 */
-			if (counter >= 4096) break;
+			if (counter >= (int)(4 * L)) break;
+			}
+		if (seed_in)
+			{
+			ok = 0;
+			DSAerr(DSA_F_DSA_BUILTIN_PARAMGEN2, DSA_R_INVALID_PARAMETERS);
+			goto err;
 			}
 		}
 end:
--- 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	0x20000004L
-#define FIPS_MODULE_VERSION_TEXT	"FIPS 2.0-rc4 unvalidated test module xx XXX xxxx"
+#define FIPS_MODULE_VERSION_NUMBER	0x20000005L
+#define FIPS_MODULE_VERSION_TEXT	"FIPS 2.0-rc5 unvalidated test module xx XXX xxxx"

 #ifdef  __cplusplus
 }
Author	SHA1	Message	Date
Dr. Stephen Henson	9bd2dde42f	prepare for rc5	2011-11-25 16:27:19 +00:00
Dr. Stephen Henson	31bf5f13e0	return error if counter exceeds limit and seed value supplied	2011-11-25 16:03:27 +00:00
Dr. Stephen Henson	7dcdc0d94d	check counter value against 4 * L, not 4096	2011-11-25 15:00:20 +00:00
Dr. Stephen Henson	6ecd287acc	bump version for rc5-dev: hopefully will never be needed...	2011-11-21 00:05:15 +00:00