Commit 1bcbf658 authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Rich Salz
Browse files

Fix handling of EVP_PKEY_CTRL_PKCS7_ENCRYPT/DECRYPT with OPENSSL_NO_CMS. 



Reviewed-by: default avatarStephen Henson <steve@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2764)
parent a00b9560

crypto/rsa/rsa_pmeth.c

+2 −1
Original line number Diff line number Diff line
@@ -553,9 +553,10 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 
#ifndef OPENSSL_NO_CMS

    case EVP_PKEY_CTRL_CMS_DECRYPT:

    case EVP_PKEY_CTRL_CMS_ENCRYPT:

#endif

    if (!pkey_ctx_is_pss(ctx))

        return 1;

#endif

    /* fall through */

    case EVP_PKEY_CTRL_PEER_KEY:

        RSAerr(RSA_F_PKEY_RSA_CTRL,

               RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);