From nobody Wed May 8 11:53:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58197+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58197+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588034997; cv=none; d=zohomail.com; s=zohoarc; b=WxaIwqQ4Patu3jQBrw89mGxuyLT26xlLQxyQ+Y+V+CA14B3lWBvZHsQT4P6lBIAblaCgzqr978hYBpwdyeeh2iH10O6jLXkoGxHFD/pzltzRziipfpGWG40WnsLkmXW9ysllPUQbrCPHMEkwX2sVk3Z52B2ioohKp+MhhWBiwOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588034997; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=AstRD29kAk+tvNNmC2Bp/OgKgeX8vsaFX6I9I0qL86o=; b=OfDAyiYuhpcyNXKrScPmpSsprvj0jhnSTnBwswMRPvm++o7InZ7z2Aijogt1vP81cSyQISqyqeQOfLq9oskvhfhYUopIAuoZNUjvbnXC7l5JQO5SmeH3Z0CihDHAC9ztkDDg/im8MHZM3vs/tos5uajYKAa5374h7+w5kx9eSMQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58197+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1588034997537805.4731581214885; Mon, 27 Apr 2020 17:49:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WUJ4YY1788612x1Rhy722kBv; Mon, 27 Apr 2020 17:49:57 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.2343.1588034996398609348 for ; Mon, 27 Apr 2020 17:49:56 -0700 IronPort-SDR: cGa2WAGW0rg5QmcSwcswAOg37psHgHZ5dTRNP4qsqbjRDNmZ47sHNP/QT1cnUTNCyupwozIC9X +mBdpgS6M3Tw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2020 17:49:55 -0700 IronPort-SDR: cNL/N6J0cyO231aEZlZ+XQXB/s2w+xTRocSnGXv1wvDt5VkbcVwNBUqH7rAbKY0KwRba43d7dj prtY90s8a06A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,325,1583222400"; d="scan'208";a="458597647" X-Received: from guominji-mobl.ccr.corp.intel.com ([10.238.5.173]) by fmsmga005.fm.intel.com with ESMTP; 27 Apr 2020 17:49:54 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Jian J Wang , Xiaoyu Lu Subject: [edk2-devel] [PATCH v5] CryptoPkg/Pkcs7: Extend support for other OID types Date: Tue, 28 Apr 2020 08:49:53 +0800 Message-Id: <20200428004953.83-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: <27952.devel.edk2.groups.io> Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guomin.jiang@intel.com X-Gm-Message-State: 25Z6Yv6Ph2U0RttVlJ5lR8H9x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588034997; bh=YTb3+B1i0lvMU+5X726BibeG94niR4ZACmXlcJmE5Yo=; h=Cc:Date:From:Reply-To:Subject:To; b=bZkl2FQBofeZ2URJMUY3M8TAHiT3YtU1FSFHQOuC6BX0YfGiOHFk0J4Xkvna2LYMZHZ 1QMSZXQXO+R3A0N+fXTQKu6nMUynN1HmKrnWGrgmq5khmww/9C9MdvNj7xQEn1UZ/4U/i Ne6xCqNDsfEBv6X8AnzH/r8/lT3MZFjJc2U= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2539 Microsoft signtool supports creation of attached P7's with any OID payload via the "/p7co" parameter. It is necessary to check the data before get the string. Cc: Jian J Wang Cc: Xiaoyu Lu Signed-off-by: Guomin Jiang --- .../BaseCryptLib/Pk/CryptPkcs7VerifyBase.c | 66 ++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c b/Cry= ptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c index 313f459b11..1b23ec99af 100644 --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c @@ -13,6 +13,66 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include =20 +/** + Check the contents of PKCS7 is not data. + + It is copied from PKCS7_type_is_other() in pk7_doit.c. + + @param[in] P7 Pointer to the location at which the PKCS7 is located. + + @return INTN The content type. +**/ +STATIC +INTN +Pkcs7TypeIsOther ( + IN PKCS7 *P7 + ) +{ + INTN Others =3D 1; + INTN Nid =3D OBJ_obj2nid (P7->type); + + switch (Nid) { + case NID_pkcs7_data: + case NID_pkcs7_signed: + case NID_pkcs7_enveloped: + case NID_pkcs7_signedAndEnveloped: + case NID_pkcs7_encrypted: + Others =3D 0; + break; + default: + Others =3D 1; + } + + return Others; +} + +/** + Get the ASN.1 string for the PKCS7. + + It is copied from PKCS7_get_octet_string() in pk7_doit.c. + + @param[in] P7 Pointer to the location at which the PKCS7 is located. + + @return ASN1_OCTET_STRING ASN.1 string. +**/ +STATIC +ASN1_OCTET_STRING* +Pkcs7GetOctetString ( + IN PKCS7 *P7 + ) +{ + if (PKCS7_type_is_data (P7)) { + return P7->d.data; + } + + if ((Pkcs7TypeIsOther(P7) =3D=3D 1) && P7->d.other && + (P7->d.other->type =3D=3D V_ASN1_OCTET_STRING)) { + return P7->d.other->value.octet_string; + } + + return NULL; +} + /** Extracts the attached content from a PKCS#7 signed data if existed. The = input signed data could be wrapped in a ContentInfo structure. @@ -98,7 +158,11 @@ Pkcs7GetAttachedContent ( // // Retrieve the attached content in PKCS7 signedData // - OctStr =3D Pkcs7->d.sign->contents->d.data; + OctStr =3D Pkcs7GetOctetString (Pkcs7->d.sign->contents); + if (OctStr =3D=3D NULL) { + goto _Exit; + } + if ((OctStr->length > 0) && (OctStr->data !=3D NULL)) { *ContentSize =3D OctStr->length; *Content =3D AllocatePool (*ContentSize); --=20 2.25.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 (#58197): https://edk2.groups.io/g/devel/message/58197 Mute This Topic: https://groups.io/mt/73318347/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-