Commit 71bbc79b 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)
parent 6c0e1e20

crypto/rsa/rsa_err.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ static ERR_STRING_DATA RSA_str_functs[] = { 
    {ERR_FUNC(RSA_F_PKEY_RSA_CTRL), "pkey_rsa_ctrl"},

    {ERR_FUNC(RSA_F_PKEY_RSA_CTRL_STR), "pkey_rsa_ctrl_str"},

    {ERR_FUNC(RSA_F_PKEY_RSA_SIGN), "pkey_rsa_sign"},

    {ERR_FUNC(RSA_F_PKEY_RSA_VERIFY), "pkey_rsa_verify"},

    {ERR_FUNC(RSA_F_PKEY_RSA_VERIFYRECOVER), "pkey_rsa_verifyrecover"},

    {ERR_FUNC(RSA_F_RSA_ALGOR_TO_MD), "rsa_algor_to_md"},

    {ERR_FUNC(RSA_F_RSA_BUILTIN_KEYGEN), "rsa_builtin_keygen"},

crypto/rsa/rsa_pmeth.c

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

include/openssl/rsa.h

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ int ERR_load_RSA_strings(void); 
# define RSA_F_PKEY_RSA_CTRL                              143

# define RSA_F_PKEY_RSA_CTRL_STR                          144

# define RSA_F_PKEY_RSA_SIGN                              142

# define RSA_F_PKEY_RSA_VERIFY                            149

# define RSA_F_PKEY_RSA_VERIFYRECOVER                     141

# define RSA_F_RSA_ALGOR_TO_MD                            156

# define RSA_F_RSA_BUILTIN_KEYGEN                         129