diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2023-07-23 14:27:54 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2023-07-26 13:19:53 +0200 |
| commit | 06bbee97aaa6b1998d05e03825a750f40fc836ea (patch) | |
| tree | c3a26c0ec9a71ef48dde0057c5376a828075f373 /crypto/dh | |
| parent | 33d03540d7c54e75d3d645b19ea7142782974b86 (diff) | |
Make DH_check set some error bits in recently added error
The pre-existing error cases where DH_check returned zero
are not related to the dh params in any way, but are only
triggered by out-of-memory errors, therefore having *ret
set to zero feels right, but since the new error case is
triggered by too large p values that is something different.
On the other hand some callers of this function might not
be prepared to handle the return value correctly but only
rely on *ret. Therefore we set some error bits in *ret as
additional safety measure.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21524)
(cherry picked from commit 81d10e61a4b7d5394d08a718bf7d6bae20e818fc)
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh_check.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c index 84a926998e..aef6f9b1b7 100644 --- a/crypto/dh/dh_check.c +++ b/crypto/dh/dh_check.c @@ -155,6 +155,7 @@ int DH_check(const DH *dh, int *ret) /* Don't do any checks at all with an excessively large modulus */ if (BN_num_bits(dh->params.p) > OPENSSL_DH_CHECK_MAX_MODULUS_BITS) { ERR_raise(ERR_LIB_DH, DH_R_MODULUS_TOO_LARGE); + *ret = DH_MODULUS_TOO_LARGE | DH_CHECK_P_NOT_PRIME; return 0; } |