From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 12 Apr 2024 13:37:58 +0000 (+0200)
Subject: fuzz/decoder.c: Limit the EVP_PKEY_param_check on DHX keys as well
X-Git-Tag: openssl-3.4.0-alpha1~685
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d8a0144303374f69f73fc944dd55c68600d15e5;p=thirdparty%2Fopenssl.git

fuzz/decoder.c: Limit the EVP_PKEY_param_check on DHX keys as well

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24126)
---

diff --git a/fuzz/decoder.c b/fuzz/decoder.c
index c7b6d02f737..4888c5cd40e 100644
--- a/fuzz/decoder.c
+++ b/fuzz/decoder.c
@@ -68,7 +68,8 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
          * Param check will take too long time on large DH parameters.
          * Skip it.
          */
-        if (!EVP_PKEY_is_a(pkey, "DH") || EVP_PKEY_get_bits(pkey) <= 8192)
+        if ((!EVP_PKEY_is_a(pkey, "DH") && !EVP_PKEY_is_a(pkey, "DHX"))
+            || EVP_PKEY_get_bits(pkey) <= 8192)
             EVP_PKEY_param_check(ctx);
 
         EVP_PKEY_public_check(ctx);