From bdf3142eb7825bda48ec515a9acc0a1eb6a88959 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann <kraxel@redhat.com> Date: Thu, 3 Aug 2023 12:37:37 +0800 Subject: [PATCH] CryptoPkg/TlsLib: use unsigned long for ErrorCode 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> --- CryptoPkg/Library/TlsLib/TlsConfig.c | 3 ++- CryptoPkg/Library/TlsLib/TlsProcess.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CryptoPkg/Library/TlsLib/TlsConfig.c b/CryptoPkg/Library/TlsLib/TlsConfig.c index 5adb1976e3..f9333165a9 100644 --- a/CryptoPkg/Library/TlsLib/TlsConfig.c +++ b/CryptoPkg/Library/TlsLib/TlsConfig.c @@ -701,7 +701,6 @@ TlsSetCaCertificate ( TLS_CONNECTION *TlsConn; SSL_CTX *SslCtx; INTN Ret; - UINTN ErrorCode; BioCert = NULL; Cert = NULL; @@ -753,6 +752,8 @@ TlsSetCaCertificate ( // Ret = X509_STORE_add_cert (X509Store, Cert); if (Ret != 1) { + unsigned long ErrorCode; + ErrorCode = ERR_peek_last_error (); // // Ignore "already in table" errors diff --git a/CryptoPkg/Library/TlsLib/TlsProcess.c b/CryptoPkg/Library/TlsLib/TlsProcess.c index ddd0317ee6..1b712cd452 100644 --- a/CryptoPkg/Library/TlsLib/TlsProcess.c +++ b/CryptoPkg/Library/TlsLib/TlsProcess.c @@ -81,7 +81,6 @@ TlsDoHandshake ( TLS_CONNECTION *TlsConn; UINTN PendingBufferSize; INTN Ret; - UINTN ErrorCode; TlsConn = (TLS_CONNECTION *)Tls; PendingBufferSize = 0; @@ -133,6 +132,8 @@ TlsDoHandshake ( )); DEBUG_CODE_BEGIN (); while (TRUE) { + unsigned long ErrorCode; + ErrorCode = ERR_get_error (); if (ErrorCode == 0) { break;