You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
|
Date: Mon, 11 Mar 2019 10:15:14 -0300
|
|
Subject: e_devcrypto: ignore error when closing session
|
|
|
|
In cipher_init, ignore an eventual error when closing the previous
|
|
session. It may have been closed by another process after a fork.
|
|
|
|
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
|
|
|
diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
|
|
index d25230d366..f4570f1666 100644
|
|
--- a/engines/e_devcrypto.c
|
|
+++ b/engines/e_devcrypto.c
|
|
@@ -195,9 +195,8 @@ static int cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
|
|
get_cipher_data(EVP_CIPHER_CTX_nid(ctx));
|
|
|
|
/* cleanup a previous session */
|
|
- if (cipher_ctx->sess.ses != 0 &&
|
|
- clean_devcrypto_session(&cipher_ctx->sess) == 0)
|
|
- return 0;
|
|
+ if (cipher_ctx->sess.ses != 0)
|
|
+ clean_devcrypto_session(&cipher_ctx->sess);
|
|
|
|
cipher_ctx->sess.cipher = cipher_d->devcryptoid;
|
|
cipher_ctx->sess.keylen = cipher_d->keylen;
|