Commit e392e1f
crypto: fix large DH generator validation
Unfortunately, `std::optional<>` implements `operator<` in such a way
that this check will fail for very large generators. Since `bn_g` is
unsigned, if its value does not fit into a single word, we can be
certain that it is at least 2. By only checking the value if it does
indeed fit into a word, the check correctly ignores very large
generators.
Signed-off-by: Tobias Nießen <tniessen@tnie.de>
PR-URL: #64092
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>1 parent f50a55d commit e392e1f
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -196,7 +196,7 @@ void New(const FunctionCallbackInfo<Value>& args) { | |||
| 196 | 196 | #endif | |
| 197 | 197 | return ThrowCryptoError(env, ERR_get_error(), "Invalid generator"); | |
| 198 | 198 | } | |
| 199 | - if (bn_g.getWord() < 2) { | ||
| 199 | + if (bn_g.getWord().has_value() && bn_g.getWord().value() < 2) { | ||
| 200 | 200 | #ifndef OPENSSL_IS_BORINGSSL | |
| 201 | 201 | ERR_put_error(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR, __FILE__, __LINE__); | |
| 202 | 202 | #else | |
0 commit comments