root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

EVP_{CIPHER,MD}_CTX_ctrl(): make sure to return 0 or 1 

Even thought the underlying calls might return something other than 0
or 1, EVP_CIPHER_CTX_ctrl() and EVP_MD_CTX_ctrl() were made to only
return those values regardless.  That behaviour was recently lost, so
we need to restore it.

Fixes #10106

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10108)
This commit is contained in:
Richard Levitte 2019-10-06 10:45:17 +02:00
parent 7cfc0a555c
commit 552be00d42
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/evp/digest.c
View File

@ -665,7 +665,7 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
ret = EVP_MD_CTX_set_params(ctx, params); ret = EVP_MD_CTX_set_params(ctx, params);
else else
ret = EVP_MD_CTX_get_params(ctx, params); ret = EVP_MD_CTX_get_params(ctx, params);
return ret; goto conclude;
/* TODO(3.0): Remove legacy code below */ /* TODO(3.0): Remove legacy code below */
@ -676,6 +676,7 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
} }
ret = ctx->digest->md_ctrl(ctx, cmd, p1, p2); ret = ctx->digest->md_ctrl(ctx, cmd, p1, p2);
conclude:
if (ret <= 0) if (ret <= 0)
return 0; return 0;
return ret; return ret;

4
crypto/evp/evp_enc.c
View File

@ -1148,7 +1148,7 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
ret = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->provctx, params); ret = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->provctx, params);
else else
ret = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->provctx, params); ret = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->provctx, params);
return ret; goto conclude;
/* TODO(3.0): Remove legacy code below */ /* TODO(3.0): Remove legacy code below */
legacy: legacy:
@ -1158,6 +1158,8 @@ legacy:
} }
ret = ctx->cipher->ctrl(ctx, type, arg, ptr); ret = ctx->cipher->ctrl(ctx, type, arg, ptr);
conclude:
if (ret == EVP_CTRL_RET_UNSUPPORTED) { if (ret == EVP_CTRL_RET_UNSUPPORTED) {
EVPerr(EVP_F_EVP_CIPHER_CTX_CTRL, EVPerr(EVP_F_EVP_CIPHER_CTX_CTRL,
EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED); EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED);