From nobody Fri Oct 18 09:21:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101071+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101071+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678696234; cv=none; d=zohomail.com; s=zohoarc; b=kb3Xu7+xLLxKIOnkKtC6ONT5G066gIM3luqAuyFW/ngoIvZIKQVCu+PoxqyFu/GpFqxIRf9p4sXafurcnPcjSCUZb0jcRYelX6GXnOAEl34jOBp97ElBhay6nmn6D5hohos79ytYr8goPC2pisqWTAa3sG2YrJrKeo7kCdT9jeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678696234; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=5HZiGcT4Z+bY7uNLAWQL1MNopO2FpoPYRY/IkxNcI4Q=; b=aZK/5+7D7GvsY8T9khjoFqH3EC6OXkOy6Qfo+q2/WPahaVDZ3AyrqUJxB3sGdhBZgPB5t4ZkDBBi0TQsMBi/tmpTDK/43eNkwTBFxu9cWN5q5k2MvQt3dbj+AHLiq3+qpQBi/PcNAR/kIuRH+3pk7DkheTa9hXUX23nh0dsp9nE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101071+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1678696234987963.245067960692; Mon, 13 Mar 2023 01:30:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5THqYY1788612xBmtzzkkxqa; Mon, 13 Mar 2023 01:30:34 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.15101.1678696233728732757 for ; Mon, 13 Mar 2023 01:30:34 -0700 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-49-sKf0CBisNqWr_IMj1B-Neg-1; Mon, 13 Mar 2023 04:30:28 -0400 X-MC-Unique: sKf0CBisNqWr_IMj1B-Neg-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B415485D183; Mon, 13 Mar 2023 08:30:27 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7E83EC164E7; Mon, 13 Mar 2023 08:30:27 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5FB0A1801E89; Mon, 13 Mar 2023 09:30:16 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jian J Wang , Pawel Polawski , Xiaoyu Lu , Ard Biesheuvel , Guomin Jiang , Gerd Hoffmann , Jiewen Yao , Oliver Steffen , Jordan Justen Subject: [edk2-devel] [PATCH 10/22] CryptoPkg/TlsLib: ERR_GET_FUNC is gone Date: Mon, 13 Mar 2023 09:30:04 +0100 Message-Id: <20230313083016.136448-11-kraxel@redhat.com> In-Reply-To: <20230313083016.136448-1-kraxel@redhat.com> References: <20230313083016.136448-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: 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,kraxel@redhat.com X-Gm-Message-State: Z4BYnQvLcPHFSSLPHaAR6mQFx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678696234; bh=NKcyI+5gutYSDcN5rGdCxGQnGnqtDpAoD0UifdfdcCs=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=HHQxc6hMFN4S8VKiC+n9mwLvYQvdDZmTsgh1cjAWGGV8gTuErqyLCTE9k//WFf2WYE1 6WXVwz513UGIyIDzxmQ2A84SRT0qwip39P03xLzKgC6ENBrIZdeiYyYEzSREWo3kabRXR M+Fbm5l8Uum1zp93mMrPFahwR9+dOJWVgks= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678696236878100045 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann --- 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/TlsLi= b/TlsConfig.c index 60559de4a7f3..37f6cfc27095 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) =3D=3D X509_F_X509_STORE_ADD_CERT) && + if (!((ERR_GET_LIB (ErrorCode) =3D=3D ERR_LIB_X509) && (ERR_GET_REASON (ErrorCode) =3D=3D X509_R_CERT_ALREADY_IN_HASH_T= ABLE))) { Status =3D EFI_ABORTED; diff --git a/CryptoPkg/Library/TlsLib/TlsProcess.c b/CryptoPkg/Library/TlsL= ib/TlsProcess.c index a803d86c4f4e..1d63d6268125 100644 --- a/CryptoPkg/Library/TlsLib/TlsProcess.c +++ b/CryptoPkg/Library/TlsLib/TlsProcess.c @@ -140,11 +140,10 @@ TlsDoHandshake ( =20 DEBUG (( DEBUG_ERROR, - "%a ERROR 0x%x=3DL%x:F%x:R%x\n", + "%a ERROR 0x%x=3DL%x:R%x\n", __FUNCTION__, ErrorCode, ERR_GET_LIB (ErrorCode), - ERR_GET_FUNC (ErrorCode), ERR_GET_REASON (ErrorCode) )); } --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#101071): https://edk2.groups.io/g/devel/message/101071 Mute This Topic: https://groups.io/mt/97576417/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-