diff options
| author | Eneas U de Queiroz <cote2004-github@yahoo.com> | 2018-11-05 15:59:44 -0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-12-10 13:22:14 +0100 |
| commit | 5378c582c8d3f1130b17abb2950bfd09cde099c6 (patch) | |
| tree | 092218a5ae21142ff58b66c95b7e5ef919bb232e /crypto | |
| parent | 68b02a8ab798b7e916c8141a36ab69d7493fc707 (diff) | |
eng_devcrypto: close session on cleanup, not final
Close the session in digest_cleanup instead of digest_final. A failure
in closing the session does not mean a previous successful digest final
has failed as well.
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)
(cherry picked from commit a67203a19d379a8cc8b369587c60c46eb4e19014)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/engine/eng_devcrypto.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c index a9ddc9c86b..1b87774c8a 100644 --- a/crypto/engine/eng_devcrypto.c +++ b/crypto/engine/eng_devcrypto.c @@ -461,10 +461,6 @@ static int digest_final(EVP_MD_CTX *ctx, unsigned char *md) SYSerr(SYS_F_IOCTL, errno); return 0; } - if (ioctl(cfd, CIOCFSESSION, &digest_ctx->sess.ses) < 0) { - SYSerr(SYS_F_IOCTL, errno); - return 0; - } return 1; } @@ -496,6 +492,15 @@ static int digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) static int digest_cleanup(EVP_MD_CTX *ctx) { + struct digest_ctx *digest_ctx = + (struct digest_ctx *)EVP_MD_CTX_md_data(ctx); + + if (digest_ctx == NULL) + return 1; + if (ioctl(cfd, CIOCFSESSION, &digest_ctx->sess.ses) < 0) { + SYSerr(SYS_F_IOCTL, errno); + return 0; + } return 1; } |