diff options
| author | Eneas U de Queiroz <cote2004-github@yahoo.com> | 2018-11-14 13:58:06 -0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-12-10 13:19:26 +0100 |
| commit | ae8183690fa53b978d4647563f5a521c4cafe94c (patch) | |
| tree | 6d43c99c5e71e3599f00b13a335a88788cfe63eb /crypto/engine/eng_devcrypto.c | |
| parent | 4d9f99654441e36fdcb49540a1dbc9d4c70ccb68 (diff) | |
eng_devcrypto: fix copy of unitilialized digest
If the source ctx has not been initialized, don't initialize the copy
either.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7585)
Diffstat (limited to 'crypto/engine/eng_devcrypto.c')
| -rw-r--r-- | crypto/engine/eng_devcrypto.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c index 8fb604ccbb..1bb6308adc 100644 --- a/crypto/engine/eng_devcrypto.c +++ b/crypto/engine/eng_devcrypto.c @@ -338,7 +338,8 @@ static int devcrypto_ciphers(ENGINE *e, const EVP_CIPHER **cipher, struct digest_ctx { struct session_op sess; - int init; + /* This signals that the init function was called, not that it succeeded. */ + int init_called; }; static const struct digest_data_st { @@ -403,7 +404,7 @@ static int digest_init(EVP_MD_CTX *ctx) const struct digest_data_st *digest_d = get_digest_data(EVP_MD_CTX_type(ctx)); - digest_ctx->init = 1; + digest_ctx->init_called = 1; memset(&digest_ctx->sess, 0, sizeof(digest_ctx->sess)); digest_ctx->sess.mac = digest_d->devcryptoid; @@ -476,14 +477,9 @@ static int digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) (struct digest_ctx *)EVP_MD_CTX_md_data(to); struct cphash_op cphash; - if (digest_from == NULL) + if (digest_from == NULL || digest_from->init_called != 1) return 1; - if (digest_from->init != 1) { - SYSerr(SYS_F_IOCTL, EINVAL); - return 0; - } - if (!digest_init(to)) { SYSerr(SYS_F_IOCTL, errno); return 0; |