From: "Li, Yi" <yi1.li@intel.com>
To: devel@edk2.groups.io
Cc: Gerd Hoffmann <kraxel@redhat.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Xiaoyu Lu <xiaoyu1.lu@intel.com>,
Guomin Jiang <guomin.jiang@intel.com>
Subject: [edk2-devel] [PATCH 09/29] CryptoPkg/TlsLib: ERR_GET_FUNC is gone
Date: Fri, 28 Jul 2023 14:39:55 +0800 [thread overview]
Message-ID: <92c86571ff0dad750a66cfaa0171347c252e61c8.1690444292.git.yi1.li@intel.com> (raw)
In-Reply-To: <cover.1690444292.git.yi1.li@intel.com>
From: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
---
CryptoPkg/Library/TlsLib/TlsConfig.c | 2 +-
CryptoPkg/Library/TlsLib/TlsProcess.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/CryptoPkg/Library/TlsLib/TlsConfig.c b/CryptoPkg/Library/TlsLib/TlsConfig.c
index fdda73690a..5adb1976e3 100644
--- a/CryptoPkg/Library/TlsLib/TlsConfig.c
+++ b/CryptoPkg/Library/TlsLib/TlsConfig.c
@@ -757,7 +757,7 @@ TlsSetCaCertificate (
//
// Ignore "already in table" errors
//
- if (!((ERR_GET_FUNC (ErrorCode) == X509_F_X509_STORE_ADD_CERT) &&
+ if (!((ERR_GET_LIB (ErrorCode) == ERR_LIB_X509) &&
(ERR_GET_REASON (ErrorCode) == X509_R_CERT_ALREADY_IN_HASH_TABLE)))
{
Status = EFI_ABORTED;
diff --git a/CryptoPkg/Library/TlsLib/TlsProcess.c b/CryptoPkg/Library/TlsLib/TlsProcess.c
index db296053fd..ddd0317ee6 100644
--- a/CryptoPkg/Library/TlsLib/TlsProcess.c
+++ b/CryptoPkg/Library/TlsLib/TlsProcess.c
@@ -140,11 +140,10 @@ TlsDoHandshake (
DEBUG ((
DEBUG_ERROR,
- "%a ERROR 0x%x=L%x:F%x:R%x\n",
+ "%a ERROR 0x%x=L%x:R%x\n",
__func__,
ErrorCode,
ERR_GET_LIB (ErrorCode),
- ERR_GET_FUNC (ErrorCode),
ERR_GET_REASON (ErrorCode)
));
}
--
2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107348): https://edk2.groups.io/g/devel/message/107348
Mute This Topic: https://groups.io/mt/100406045/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2023-07-28 6:41 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 6:39 [edk2-devel] [PATCH 00/29] CryptoPkg: Update OpenSSL submodule to 3.0.9 Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 01/29] CryptoPkg/openssl: update submodule to openssl-3.0.9 Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 02/29] CryptoPkg/openssl: cleanup all openssl1.1.1 generated files and code Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 03/29] CryptoPkg/openssl: update Openssl*.inf files for openssl 3.0 Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 04/29] CryptoPkg/openssl: add openssl3 configure scripts Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 05/29] CryptoPkg/openssl: UefiAsm.conf update for openssl 3.0 Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 06/29] CryptoPkg/BaseCryptLib: no openssl deprecation warnings please Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 07/29] CryptoPkg/BaseCryptLib: adapt CryptSm3.c to openssl 3.0 changes Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 08/29] CryptoPkg/BaseCryptLib: drop BIO_* dummy functions Li, Yi
2023-07-28 6:39 ` Li, Yi [this message]
2023-07-28 6:39 ` [edk2-devel] [PATCH 10/29] CryptoPkg/openssl: adapt rand_pool.c to openssl 3.0 changes Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 11/29] CryptoPkg/openssl: move compiler_flags to buildinf.c Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 12/29] CryptoPkg/openssl: store dummy update for openssl 3.0 Li, Yi
2023-07-28 6:39 ` [edk2-devel] [PATCH 13/29] CryptoPkg/openssl: adapt EcSm2Null.c " Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 14/29] CryptoPkg: Move all UEFI implement of openssl to OpensslStub Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 15/29] CryptoPkg: use UEFI provider as default Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 16/29] CryptoPkg: adapt 3.0 change in SslNull.c Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 17/29] CryptoPkg: Add instrinsics to support building openssl3 on IA32 windows Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 18/29] CryptoPkg: disable C4133 warning in openssl libraries Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 19/29] CryptoPkg/TlsLib: use unsigned long for ErrorCode Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 20/29] CryptoPkg: Align with 4096 when build with OpensslFullAccel Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 21/29] CryptoPkg: Enable memcpy sys call in RISCV64 build Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 22/29] CryptoPkg: add missing gcc instructions Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 23/29] CryptoPkg: add define of maximum unsigned size_t Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 24/29] CryptoPkg: add implemention of _ftol2_sse() to avoid build error Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 25/29] CryptoPkg: add more dummy implement of openssl for size optimization Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 26/29] CryptoPkg: run configure.py to update all generated files Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 27/29] CryptoPkg: remove strcmp to syscall Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 28/29] CryptoPkg/openssl: update CI config for openssl 3.0 Li, Yi
2023-07-28 6:40 ` [edk2-devel] [PATCH 29/29] CryptoPkg: remove BN and EC accel for size optimization Li, Yi
2023-08-02 10:06 ` 回复: [edk2-devel] [PATCH 00/29] CryptoPkg: Update OpenSSL submodule to 3.0.9 gaoliming via groups.io
2023-08-02 16:41 ` Michael D Kinney
2023-08-02 18:46 ` Leif Lindholm
2023-08-04 9:44 ` 回复: " gaoliming via groups.io
2023-08-04 20:54 ` Brian J. Johnson
2023-08-04 22:55 ` Michael Kubacki
2023-08-08 23:59 ` Yao, Jiewen
2023-08-09 0:45 ` Kenneth Lautner via groups.io
2023-08-09 7:43 ` Yao, Jiewen
2023-08-03 5:16 ` Li, Yi
2023-08-03 7:57 ` Yao, Jiewen
2023-08-03 9:20 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=92c86571ff0dad750a66cfaa0171347c252e61c8.1690444292.git.yi1.li@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox