diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2023-08-03 12:37:27 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-08-09 07:10:31 +0000 |
| commit | eac38f74c4b05b5b42c5bdf2769838549026dafd (patch) | |
| tree | 6416cfb127da915877e46156839857aaeeb01539 | |
| parent | 2a6dc1211f9b73ca6264ce7c2ab1a8dfeb1f1c0f (diff) | |
| download | edk2-eac38f74c4b05b5b42c5bdf2769838549026dafd.tar.gz edk2-eac38f74c4b05b5b42c5bdf2769838549026dafd.tar.bz2 edk2-eac38f74c4b05b5b42c5bdf2769838549026dafd.zip | |
CryptoPkg/TlsLib: ERR_GET_FUNC is gone
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>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Tested-by: Ard Biesheuvel <ardb@kernel.org>
Tested-by: Brian J. Johnson <brian.johnson@hpe.com>
Tested-by: Kenneth Lautner <klautner@microsoft.com>
| -rw-r--r-- | CryptoPkg/Library/TlsLib/TlsConfig.c | 2 | ||||
| -rw-r--r-- | 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)
));
}
|