From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id D8A34941209 for ; Fri, 28 Jul 2023 06:41:22 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=HsfNh0s3qtzZOjlOY0hwDSBjvL18bCsewO9kH4Yg0zI=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-IronPort-AV:X-IronPort-AV:X-Received:X-ExtLoop1:X-IronPort-AV:X-IronPort-AV:X-Received:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:X-Gm-Message-State:Content-Transfer-Encoding; s=20140610; t=1690526481; v=1; b=X0vmZ2qXwwzO0C+7JIFhdBMDvMbn/rupudUawMVk9bSr2yv9NTfEJmkD6RTjxTOysZWFe+C+ 53atfmO2T1QwcSOaj6d/hJ+Z/L1n5fOUobplLF6XurSQQlIs9rDvcwMSBYMZpgFWxQz03NfSP5V OOFC4j8kjkix0AQ/P98S7qY4= X-Received: by 127.0.0.2 with SMTP id mebbYY7687511xgUaldazem6; Thu, 27 Jul 2023 23:41:21 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.27086.1690526480132085043 for ; Thu, 27 Jul 2023 23:41:21 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10784"; a="434804245" X-IronPort-AV: E=Sophos;i="6.01,236,1684825200"; d="scan'208";a="434804245" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2023 23:41:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10784"; a="762495995" X-IronPort-AV: E=Sophos;i="6.01,236,1684825200"; d="scan'208";a="762495995" X-Received: from liyi4-desktop.ccr.corp.intel.com ([10.239.153.10]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2023 23:41:00 -0700 From: "Li, Yi" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Jiewen Yao , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH 09/29] CryptoPkg/TlsLib: ERR_GET_FUNC is gone Date: Fri, 28 Jul 2023 14:39:55 +0800 Message-Id: <92c86571ff0dad750a66cfaa0171347c252e61c8.1690444292.git.yi1.li@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,yi1.li@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: AfxQC6WOTjCQAXT7gJeiRYXGx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=X0vmZ2qX; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Cc: Jiewen Yao Cc: Xiaoyu Lu Cc: Guomin Jiang --- 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] -=-=-=-=-=-=-=-=-=-=-=-