f68dd54569
CVE-2018-0739 CVE-2019-1563 CVE-2020-1971 CVE-2021-23840 CVE-2021-23841 CVE-2022-0778 CVE-2021-3712 (cherry picked from commit a582068887203f626772052e466343c6ef2d0719)
42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
Partial backport of:
|
|
|
|
From 83151b73a4736bca1797f8edc2b0ad4cf7ac9146 Mon Sep 17 00:00:00 2001
|
|
From: Andy Polyakov <appro@openssl.org>
|
|
Date: Mon, 25 Jul 2016 15:02:26 +0200
|
|
Subject: [PATCH] evp/evp_enc.c: make assert error message more readable and
|
|
add EVPerr(PARTIALLY_OVERLAPPED)
|
|
|
|
Reviewed-by: Stephen Henson <steve@openssl.org>
|
|
---
|
|
crypto/evp/evp_enc.c | 28 +++++++++++++++++++---------
|
|
crypto/evp/evp_err.c | 3 +++
|
|
include/openssl/evp.h | 3 +++
|
|
3 files changed, 25 insertions(+), 9 deletions(-)
|
|
|
|
--- a/Cryptlib/OpenSSL/crypto/evp/evp_err.c
|
|
+++ b/Cryptlib/OpenSSL/crypto/evp/evp_err.c
|
|
@@ -92,8 +92,10 @@ static ERR_STRING_DATA EVP_str_functs[]
|
|
{ERR_FUNC(EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH),
|
|
"EVP_CIPHER_CTX_set_key_length"},
|
|
{ERR_FUNC(EVP_F_EVP_DECRYPTFINAL_EX), "EVP_DecryptFinal_ex"},
|
|
+ {ERR_FUNC(EVP_F_EVP_DECRYPTUPDATE), "EVP_DecryptUpdate"},
|
|
{ERR_FUNC(EVP_F_EVP_DIGESTINIT_EX), "EVP_DigestInit_ex"},
|
|
{ERR_FUNC(EVP_F_EVP_ENCRYPTFINAL_EX), "EVP_EncryptFinal_ex"},
|
|
+ {ERR_FUNC(EVP_F_EVP_ENCRYPTUPDATE), "EVP_EncryptUpdate"},
|
|
{ERR_FUNC(EVP_F_EVP_MD_CTX_COPY_EX), "EVP_MD_CTX_copy_ex"},
|
|
{ERR_FUNC(EVP_F_EVP_MD_SIZE), "EVP_MD_size"},
|
|
{ERR_FUNC(EVP_F_EVP_OPENINIT), "EVP_OpenInit"},
|
|
--- a/Cryptlib/Include/openssl/evp.h
|
|
+++ b/Cryptlib/Include/openssl/evp.h
|
|
@@ -1396,8 +1396,10 @@ void ERR_load_EVP_strings(void);
|
|
# define EVP_F_EVP_CIPHER_CTX_CTRL 124
|
|
# define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH 122
|
|
# define EVP_F_EVP_DECRYPTFINAL_EX 101
|
|
+# define EVP_F_EVP_DECRYPTUPDATE 166
|
|
# define EVP_F_EVP_DIGESTINIT_EX 128
|
|
# define EVP_F_EVP_ENCRYPTFINAL_EX 127
|
|
+# define EVP_F_EVP_ENCRYPTUPDATE 167
|
|
# define EVP_F_EVP_MD_CTX_COPY_EX 110
|
|
# define EVP_F_EVP_MD_SIZE 162
|
|
# define EVP_F_EVP_OPENINIT 102
|