Commit fecd4c26 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Check input length to pkey_rsa_verify() 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2065)
(cherry picked from commit 71bbc79b)

Conflicts:
	crypto/rsa/rsa_err.c
	include/openssl/rsa.h
parent 5ae285ec

crypto/rsa/rsa_pmeth.c

+4 −0
Original line number Diff line number Diff line
@@ -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;