Commit 4d60bb492f for openssl.org
commit 4d60bb492fa21c2c73228509e097555b779ce497
Author: Dailey, Alaric <alaricd@pengdows.com>
Date: Thu Nov 5 19:45:41 2026 -0600
Reject SNMPKDF output sizes that differ from the digest size
Require the requested key length to equal the selected digest size.
This keeps EVP_KDF_derive() consistent with SNMPKDFs fixed output size
and prevents a successful call from leaving a caller-provided output
tail unwritten.
Resolves: https://github.com/openssl/openssl/issues/33560
Fixes: 1b035166bdb2 "Add SNMPKDF implementation"
Assisted-by: Codex:gpt-6
Reviewed-by: Jakub Zelenka <jakub.zelenka@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Merge-date: Sat Nov 21 06:47:57 2026
Merged-from: https://github.com/openssl/openssl/pull/33569
diff --git a/providers/implementations/kdfs/snmpkdf.c b/providers/implementations/kdfs/snmpkdf.c
index 11dff38653..7fc2d9fa5a 100644
--- a/providers/implementations/kdfs/snmpkdf.c
+++ b/providers/implementations/kdfs/snmpkdf.c
@@ -310,8 +310,12 @@ static int SNMPKDF(const EVP_MD *evp_md,
}
value = EVP_MD_get_size(evp_md);
- if (value <= 0 || (size_t)value > keylen)
+ if (value <= 0)
goto err;
+ if ((size_t)value != keylen) {
+ ERR_raise(ERR_LIB_PROV, PROV_R_WRONG_OUTPUT_BUFFER_SIZE);
+ goto err;
+ }
mdsize = (size_t)value;
if (!EVP_DigestInit_ex(md, evp_md, NULL))
diff --git a/test/evp_kdf_test.c b/test/evp_kdf_test.c
index c9568a8d3a..801489d135 100644
--- a/test/evp_kdf_test.c
+++ b/test/evp_kdf_test.c
@@ -3784,6 +3784,62 @@ err:
}
#endif /* OPENSSL_NO_KBKDF */
+#ifndef OPENSSL_NO_SNMPKDF
+static int test_kdf_snmpkdf_output_size(void)
+{
+ int ret = 0;
+ EVP_KDF_CTX *kctx = NULL;
+ unsigned char password[] = "maplesyrup";
+ unsigned char eid[12] = { 0 };
+ unsigned char out[33];
+ OSSL_PARAM params[4];
+ size_t digest_size;
+ size_t i;
+
+ eid[sizeof(eid) - 1] = 2;
+ params[0] = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
+ "SHA256", 0);
+ params[1] = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
+ password, sizeof(password) - 1);
+ params[2] = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SNMPKDF_EID,
+ eid, sizeof(eid));
+ params[3] = OSSL_PARAM_construct_end();
+
+ if (!TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SNMPKDF)))
+ goto err;
+
+ if (!TEST_true(EVP_KDF_CTX_set_params(kctx, params)))
+ goto err;
+ digest_size = EVP_KDF_CTX_get_kdf_size(kctx);
+ if (!TEST_size_t_eq(digest_size, 32))
+ goto err;
+
+ memset(out, 0xAA, sizeof(out));
+ if (!TEST_int_eq(EVP_KDF_derive(kctx, out, digest_size - 1, params), 0))
+ goto err;
+ for (i = 0; i < sizeof(out); i++) {
+ if (!TEST_uint_eq(out[i], 0xAA))
+ goto err;
+ }
+
+ memset(out, 0xAA, sizeof(out));
+ if (!TEST_int_gt(EVP_KDF_derive(kctx, out, digest_size, params), 0))
+ goto err;
+ memset(out, 0xAA, sizeof(out));
+ if (!TEST_int_eq(EVP_KDF_derive(kctx, out, digest_size + 1, params), 0))
+ goto err;
+ for (i = 0; i < sizeof(out); i++) {
+ if (!TEST_uint_eq(out[i], 0xAA))
+ goto err;
+ }
+
+ ret = 1;
+err:
+ EVP_KDF_CTX_free(kctx);
+ return ret;
+}
+#endif /* OPENSSL_NO_SNMPKDF */
+
int setup_tests(void)
{
ADD_TEST(test_kdf_pbkdf1);
@@ -3812,6 +3868,9 @@ int setup_tests(void)
ADD_TEST(test_kdf_ctx_get_kdf);
#if !defined(OPENSSL_NO_DEPRECATED_4_1)
ADD_TEST(test_kdf_ctx_kdf);
+#endif
+#ifndef OPENSSL_NO_SNMPKDF
+ ADD_TEST(test_kdf_snmpkdf_output_size);
#endif
ADD_TEST(test_kdf_tls1_prf);
ADD_TEST(test_kdf_tls1_prf_set_skey);