Commit ea8d9cec authored by Brad Spencer's avatar Brad Spencer Committed by Ben Kaduk
Browse files

Test the result of CMS_RecipientInfo_ktri_get0_algs() before using its output in rsa_cms_encrypt(). 



CLA: trivial

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4966)

(cherry picked from commit 178989b4)
parent fa9ab9ee

crypto/rsa/rsa_ameth.c

+2 −1
Original line number Diff line number Diff line
@@ -773,7 +773,8 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri) 
    EVP_PKEY_CTX *pkctx = CMS_RecipientInfo_get0_pkey_ctx(ri);

    int pad_mode = RSA_PKCS1_PADDING, rv = 0, labellen;

    unsigned char *label;

    CMS_RecipientInfo_ktri_get0_algs(ri, NULL, NULL, &alg);

    if (CMS_RecipientInfo_ktri_get0_algs(ri, NULL, NULL, &alg) <= 0)

        return 0;

    if (pkctx) {

        if (EVP_PKEY_CTX_get_rsa_padding(pkctx, &pad_mode) <= 0)

            return 0;