From nobody Sun Apr 28 21:49:03 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+58284+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+58284+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588121540; cv=none; d=zohomail.com; s=zohoarc; b=j99WpG3GIxzVf+y+MMEEuoruMA06hUjH2epHVdoNHrPgYMr/1CmV0G8FiqDve4NIBRqt8M5a07bHrfvokpiZsH2h34f01CWZK4FdcJobN3gtOKBzAuXuSL6Yv1/OElWVglaqVEb+zeIDZexY0idNuwxDhPDtrlBViEY4yn5YLOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588121540; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=k7MDU3Ys+SV9Supf3LqzOxxUK/DO+aBKnA0FWKgduTg=; b=iVEoPON3B3lwzpQrnN3diayVas9mssxAWFGYRiArIY73dccgeBqNfdcJiNfPa1oPPAuauLspStidWzn3CUvjaF2MZcbotL7AuY5de2fAgU8mQCrmZGAgaDXQrqDUY9dp2X+jjNOk0ftQogCPNMrg45WkUkh7l/UWiYEGKbSGWfY= 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+58284+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 158812154070689.64102320908432; Tue, 28 Apr 2020 17:52:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6PIxYY1788612xl8dYbTPWOl; Tue, 28 Apr 2020 17:52:20 -0700 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.2163.1588121539406216934 for ; Tue, 28 Apr 2020 17:52:19 -0700 IronPort-SDR: LLQGS+NO+3mFtQ+t9C7HwejdN9wzPMkgjJ/IA/OemcXDH87SS0GL+8DbrBIoo+0ziEOzMCNOSg 5haeRzIHt02g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2020 17:52:17 -0700 IronPort-SDR: j/PchO61oBqhAfrFzr/QGFEAA8TBTblZfOPHQycIb9VbE00T4ki0KmNpROUt1LKDEb/Q9fPjvp QdQXU51m7+mQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,329,1583222400"; d="scan'208";a="293044921" X-Received: from guominji-mobl.ccr.corp.intel.com ([10.238.5.173]) by fmsmga002.fm.intel.com with ESMTP; 28 Apr 2020 17:52:16 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Jian J Wang , Xiaoyu Lu Subject: [edk2-devel] [PATCH v6] CryptoPkg/Pkcs7: Extend support for other OID types Date: Wed, 29 Apr 2020 08:52:15 +0800 Message-Id: <20200429005215.597-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: EeRxH0edQa8yAxbI4NqHqlNTx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588121540; bh=/ctz2/UhPaDstfwcrFTiCtLI0qeqZeIgqA+VScaA2fc=; h=Cc:Date:From:Reply-To:Subject:To; b=HKHYxV/xqOXPBqNyabEND39uDd1b8HXPT2wGfE6Kfg4ax2FAylpaj3/PTOnjzbHNTfm xyS+98Qq4ym5WPEzGMV9m9GeyDFpXHTblRhV56b1odSGo+7ENYY53Z/sSJCI1JyoU5yrX 6FnWlWpLweLuYINRp52biuMmoQ1WLORhi8M= 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 Reviewed-by: Jian J Wang --- .../BaseCryptLib/Pk/CryptPkcs7VerifyBase.c | 67 ++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c b/Cry= ptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c index 313f459b11..112c13c226 100644 --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c @@ -13,6 +13,67 @@ 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. + + @retval TRUE If the type is others. + @retval FALSE If the type is expected. +**/ +STATIC +BOOLEAN +Pkcs7TypeIsOther ( + IN PKCS7 *P7 + ) +{ + BOOLEAN Others; + 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 FALSE; + break; + default: + Others =3D TRUE; + } + + 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) && (P7->d.other !=3D NULL) && + (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 +159,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 (#58284): https://edk2.groups.io/g/devel/message/58284 Mute This Topic: https://groups.io/mt/73344002/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-