diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-11-18 12:49:19 +0300 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-11-27 00:58:01 +0300 |
| commit | 719bc0e826317d22c0687cf919e97749fa53d54a (patch) | |
| tree | aa6de7298aa461857d87f6daa52c7613f0fce9ee /crypto/evp/evp_enc.c | |
| parent | 8dc34b1f579f71f24aa385d33112da4a91db7079 (diff) | |
Fix EVP_CIPHER_CTX_set_padding for legacy path
Fixes #13057
When using an engine, there is no cipher->prov so a call to
EVP_CIPHER_CTX_set_padding() returns an error when
evp_do_ciph_ctx_setparams() is called. For the legacy path it needs to
avoid doing the call and just return 1.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/13437)
Diffstat (limited to 'crypto/evp/evp_enc.c')
| -rw-r--r-- | crypto/evp/evp_enc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index f439e8d61d..7818ab25ea 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -948,6 +948,8 @@ int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *ctx, int pad) else ctx->flags |= EVP_CIPH_NO_PADDING; + if (ctx->cipher != NULL && ctx->cipher->prov == NULL) + return 1; params[0] = OSSL_PARAM_construct_uint(OSSL_CIPHER_PARAM_PADDING, &pd); ok = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->provctx, params); |