summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-11-25 16:03:27 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-11-25 16:03:27 +0000
commit31bf5f13e0250890b5711478c23ba6def7966f5e (patch)
tree8f9d7477716455a809b4fc80721a45bc0a081b99
parent7dcdc0d94d692cd6539bdf3950b3e4be61a0f441 (diff)
return error if counter exceeds limit and seed value supplied
-rw-r--r--crypto/dsa/dsa_gen.c6
1 files changed, 6 insertions, 0 deletions
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))