aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs/openssl/patches/230-eng_devcrypto-close-session-on-cleanup-not-final.patch
diff options
context:
space:
mode:
authorEneas U de Queiroz <cote2004-github@yahoo.com>2019-02-27 18:06:44 -0300
committerHauke Mehrtens <hauke@hauke-m.de>2019-02-27 22:43:30 +0100
commit9e8cbecb7f188dcf31b3a4e268d8e2b8e6d55a58 (patch)
tree164548cc7b2cdd029b0bc54ee236a5fdff968895 /package/libs/openssl/patches/230-eng_devcrypto-close-session-on-cleanup-not-final.patch
parentc8153722a2eddceb6a8df5fd1a676d6d1f688640 (diff)
downloadupstream-9e8cbecb7f188dcf31b3a4e268d8e2b8e6d55a58.tar.gz
upstream-9e8cbecb7f188dcf31b3a4e268d8e2b8e6d55a58.tar.bz2
upstream-9e8cbecb7f188dcf31b3a4e268d8e2b8e6d55a58.zip
openssl: bump to release 1.1.1b
This is bugfix release that incorporated all of the devcrypto engine patches currently in the tree. The cleaning procedure in Package/Configure was not removing the dependency files, causing linking errors during a rebuild with different options. It was replaced by a simple make clean. Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Diffstat (limited to 'package/libs/openssl/patches/230-eng_devcrypto-close-session-on-cleanup-not-final.patch')
-rw-r--r--package/libs/openssl/patches/230-eng_devcrypto-close-session-on-cleanup-not-final.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/package/libs/openssl/patches/230-eng_devcrypto-close-session-on-cleanup-not-final.patch b/package/libs/openssl/patches/230-eng_devcrypto-close-session-on-cleanup-not-final.patch
deleted file mode 100644
index 050853a3d1..0000000000
--- a/package/libs/openssl/patches/230-eng_devcrypto-close-session-on-cleanup-not-final.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 5378c582c8d3f1130b17abb2950bfd09cde099c6 Mon Sep 17 00:00:00 2001
-From: Eneas U de Queiroz <cote2004-github@yahoo.com>
-Date: Mon, 5 Nov 2018 15:59:44 -0200
-Subject: [PATCH 4/7] 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)
-
---- a/crypto/engine/eng_devcrypto.c
-+++ b/crypto/engine/eng_devcrypto.c
-@@ -461,10 +461,6 @@ static int digest_final(EVP_MD_CTX *ctx,
- 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, c
-
- 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;
- }
-