From nobody Wed May 8 10:40:17 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+83510+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+83510+1787277+3901457@groups.io; dmarc=pass(p=none dis=none) header.from=groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636462716; cv=none; d=zohomail.com; s=zohoarc; b=iL9aH9XPLmeqhAm5IxEFrJKnY6MyYrUkI3Yt6vZojY3Xnlxx5tgW4nA4DGiaKXISjU4jMwSMNs/wVGTwgVhxyTXH7mCguUc0YOjfUwaCAVgh6asLn+vQyrMPCwIeLfH7VN4gi3Yol1ONRFamiK9nRnrXawDRlM/kjOxbizc3ur8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636462716; h=Content-Type: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=yOi9L0U+tj06oZ+S6kVzCq+aI5to+n3CXbK1xkOX72M=; b=PPDDBrg7ZILFtcwuAV045dSaq3jXTLJBPbFZYEnztGw1pE6XZ/s+TWjvD8F86th3LgKX6tFE56TCI7NLXDMiRWafEqFQurg1Y/UAIRrruu2RXS/EOstxbkGFDmeTSHi9kOs7FdLy0qKKsAAlTMFnSYzwYSJaX8LFXi9SKPDOVc4= 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+83510+1787277+3901457@groups.io; dmarc=pass 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 163646271617713.154583926731448; Tue, 9 Nov 2021 04:58:36 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id BHg8YY1788612xaAmvCfGeja; Tue, 09 Nov 2021 04:58:35 -0800 X-Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mx.groups.io with SMTP id smtpd.web12.11657.1636462713906494513 for ; Tue, 09 Nov 2021 04:58:34 -0800 X-Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4HpSf86DMvz1DJM2 for ; Tue, 9 Nov 2021 20:56:16 +0800 (CST) X-Received: from kwepemm600004.china.huawei.com (7.193.23.242) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Tue, 9 Nov 2021 20:58:25 +0800 X-Received: from kwephisprg16640.huawei.com (10.247.83.252) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Tue, 9 Nov 2021 20:58:24 +0800 From: "wenyi,xie via groups.io" To: , , , , CC: , , Subject: [edk2-devel] [PATCH EDK2 v1 1/1] CryptoPkg/BaseCryptLib: Support PEM certification Date: Tue, 9 Nov 2021 20:58:19 +0800 Message-ID: <20211109125819.21740-2-xiewenyi2@huawei.com> In-Reply-To: <20211109125819.21740-1-xiewenyi2@huawei.com> References: <20211109125819.21740-1-xiewenyi2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.247.83.252] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected 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,xiewenyi2@huawei.com X-Gm-Message-State: WLLh97NpNqPO0DyKhBQTRR94x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636462715; bh=jmiR20ccMkgu3f/FIQXRyRgoUO4SAlIw4jI/L6QO2k8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=BxqP9x/Opz53E6wBIfgCLUHed55KLkv+9vuJK4VyOiMtIcAqPPPb5mteu9URT5n4q6W kDsTA/sanWSQDXbyGZaVPiGxkAsQVt01NpSIrm4Ju7cTJ0j+62ENi5HNYJ1A3VnDgzE90 QSn5x/DM5V2Pp26m8D7OqB1Gm4/CZrLrz0c= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636462717892100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As PEM-encoded certificate is also necessary, add support for PEM-encoded certificate in X509ConstructCertificate. Cc: Jiewen Yao Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Signed-off-by: Jiaxia Xu Signed-off-by: Wenyi Xie --- CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c | 33 ++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c b/CryptoPkg/Libr= ary/BaseCryptLib/Pk/CryptX509.c index b1393a89c5ab..db122cd574fa 100644 --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c @@ -9,6 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "InternalCryptLib.h" #include #include +#include =20 /** Construct a X509 object from DER-encoded certificate data. @@ -33,7 +34,12 @@ X509ConstructCertificate ( ) { X509 *X509Cert; + BIO *BioCert; CONST UINT8 *Temp; + BOOLEAN CertFlag; + + BioCert =3D NULL; + CertFlag =3D TRUE; =20 // // Check input parameters. @@ -48,12 +54,35 @@ X509ConstructCertificate ( Temp =3D Cert; X509Cert =3D d2i_X509 (NULL, &Temp, (long) CertSize); if (X509Cert =3D=3D NULL) { - return FALSE; + BioCert =3D BIO_new (BIO_s_mem ()); + if (BioCert =3D=3D NULL) { + CertFlag =3D FALSE; + goto ON_EXIT; + } + + if (BIO_write (BioCert, Temp, (UINT32) CertSize) <=3D 0) { + CertFlag =3D FALSE; + goto ON_EXIT; + } + + // + // Read PEM-encoded X509 Certificate and Construct X509 object. + // + X509Cert =3D PEM_read_bio_X509 (BioCert, NULL, NULL, NULL); + if (X509Cert =3D=3D NULL) { + CertFlag =3D FALSE; + goto ON_EXIT; + } } =20 *SingleX509Cert =3D (UINT8 *) X509Cert; =20 - return TRUE; +ON_EXIT: + if (BioCert !=3D NULL) { + BIO_free (BioCert); + } + + return CertFlag; } =20 /** --=20 2.20.1.windows.1 -=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 (#83510): https://edk2.groups.io/g/devel/message/83510 Mute This Topic: https://groups.io/mt/86930148/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-