From fecd4c265527459e3db5ac37bbf77ab47aa10dc7 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 8 Dec 2016 12:16:02 +0000 Subject: [PATCH] Check input length to pkey_rsa_verify() Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2065) (cherry picked from commit 71bbc79b7d3b1195a7a7dd5f547d52ddce32d6f0) Conflicts: crypto/rsa/rsa_err.c include/openssl/rsa.h --- crypto/rsa/rsa_pmeth.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c index 94db87a063..ac583bf60b 100644 --- a/crypto/rsa/rsa_pmeth.c +++ b/crypto/rsa/rsa_pmeth.c @@ -373,6 +373,10 @@ static int pkey_rsa_verify(EVP_PKEY_CTX *ctx, if (rctx->pad_mode == RSA_PKCS1_PADDING) return RSA_verify(EVP_MD_type(rctx->md), tbs, tbslen, sig, siglen, rsa); + if (tbslen != (size_t)EVP_MD_size(rctx->md)) { + RSAerr(RSA_F_PKEY_RSA_VERIFY, RSA_R_INVALID_DIGEST_LENGTH); + return -1; + } if (rctx->pad_mode == RSA_X931_PADDING) { if (pkey_rsa_verifyrecover(ctx, NULL, &rslen, sig, siglen) <= 0) return 0; -- 2.25.1