Commit 14149949d5 for openssl.org
commit 14149949d5c13c12c92a17f1a9eb943a003d0f43
Author: Daniel Kubec <kubec@openssl.foundation>
Date: Fri Jul 24 22:03:02 2026 +0200
CMS: Guard against int overflow in cms_kek_cipher()
Mirror the check from cms_kari.c in cms_kemri.c.
Reviewed-by: Jakub Zelenka <jakub.zelenka@openssl.foundation>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Wed Jul 29 16:56:18 2026
(Merged from https://github.com/openssl/openssl/pull/32072)
diff --git a/crypto/cms/cms_kemri.c b/crypto/cms/cms_kemri.c
index 3284ebc23a..ba5311f8ab 100644
--- a/crypto/cms/cms_kemri.c
+++ b/crypto/cms/cms_kemri.c
@@ -270,6 +270,9 @@ static int cms_kek_cipher(unsigned char **pout, size_t *poutlen,
return 0;
}
+ if (inlen > INT_MAX)
+ return 0;
+
if (!kdf_derive(kek, keklen, ss, sslen, kemri))
goto err;