From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 25 Nov 2011 16:03:42 +0000 (+0000)
Subject: return error if counter exceeds limit and seed value supplied
X-Git-Tag: master-post-reformat~2069
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f6c0bd641c649bd7f206c275363c6ff2eec4d759;p=oweals%2Fopenssl.git

return error if counter exceeds limit and seed value supplied
---

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 3b49420c76..9e3e57a828 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -668,6 +668,12 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N,
 			/* step 14 */
 			if (counter >= (int)(4 * L)) break;
 			}
+		if (seed_in)
+			{
+			ok = 0;
+			DSAerr(DSA_F_DSA_BUILTIN_PARAMGEN2, DSA_R_INVALID_PARAMETERS);
+			goto err;
+			}
 		}
 end:
 	if(!BN_GENCB_call(cb, 2, 1))