3cd2ff3150
Refresh patch: - 100-Configure-afalg-support.patch - 120-strip-cflags-from-binary.patch - 140-allow-prefer-chacha20.patch - 500-e_devcrypto-default-to-not-use-digests-in-engine.patch - 510-e_devcrypto-ignore-error-when-closing-session.patch Signed-off-by: Ryan Keane <the.ra2.ifv@gmail.com> Link: https://github.com/openwrt/openwrt/pull/15804 Signed-off-by: Robert Marko <robimarko@gmail.com>
25 lines
897 B
Diff
25 lines
897 B
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>
|
|
|
|
--- a/engines/e_devcrypto.c
|
|
+++ b/engines/e_devcrypto.c
|
|
@@ -212,9 +212,8 @@ static int cipher_init(EVP_CIPHER_CTX *c
|
|
int ret;
|
|
|
|
/* 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;
|