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 E2D127803CD for ; Thu, 3 Aug 2023 04:38:54 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=0zkt3EQGF/52K0czqYIeY3rPQ5Ti8SbJHDK6gKROtUw=; c=relaxed/simple; d=groups.io; h=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:Content-Transfer-Encoding; s=20140610; t=1691037533; v=1; b=ZImiNS6I9/GlLHSdCFBA0WJ0+vma0mrQa8GYXTBZf7AmXowHmKawX7QxAYEEQ4LM6xpZWwPS FrpCXjuFbPLrxJG8nYGUsfsDAMa8B1giBOL0e3g3Pep8TCJg8mPaNhXVVXrSodhV64vo2L0ymfQ /yRdu70r+Zpro58mq2Ncp0pk= X-Received: by 127.0.0.2 with SMTP id koeBYY7687511xIddDOzRgFE; Wed, 02 Aug 2023 21:38:53 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.7306.1691037531078533765 for ; Wed, 02 Aug 2023 21:38:51 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="456141174" X-IronPort-AV: E=Sophos;i="6.01,251,1684825200"; d="scan'208";a="456141174" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 21:38:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="794848032" X-IronPort-AV: E=Sophos;i="6.01,251,1684825200"; d="scan'208";a="794848032" X-Received: from liyi4-desktop.ccr.corp.intel.com ([10.239.153.10]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 21:38:20 -0700 From: "Li, Yi" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Jiewen Yao , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH V2 09/29] CryptoPkg/TlsLib: ERR_GET_FUNC is gone Date: Thu, 3 Aug 2023 12:37:27 +0800 Message-Id: <92c86571ff0dad750a66cfaa0171347c252e61c8.1691031203.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: 4OT9ct7n3VBIq5tlvsXvYQElx7686176AA= 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=ZImiNS6I; 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 (#107492): https://edk2.groups.io/g/devel/message/107492 Mute This Topic: https://groups.io/mt/100520594/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-