projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Detect symmetric crypto errors in PKCS7_decrypt.
[oweals/openssl.git]
/
crypto
/
dsa
/
dsa_gen.c
diff --git
a/crypto/dsa/dsa_gen.c
b/crypto/dsa/dsa_gen.c
index d5f4debc9223419de117c5374edc3930abd318d4..9e3e57a828599e24c4d088319672c9575292bb41 100644
(file)
--- 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: