tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CryptoPkg/Pkcs7: Extend support for other OID types 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2539

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 <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>

Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
This commit is contained in:
Guomin Jiang 2020-03-30 15:17:49 +08:00 committed by mergify[bot]
parent 55d6e39f72
commit 469eb46169
1 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c
View File

@ -13,6 +13,67 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <openssl/x509v3.h>
#include <openssl/pkcs7.h>
/**
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 = 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 = FALSE;
break;
default:
Others = 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 != NULL) &&
(P7->d.other->type == 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 = Pkcs7->d.sign->contents->d.data;
OctStr = Pkcs7GetOctetString (Pkcs7->d.sign->contents);
if (OctStr == NULL) {
goto _Exit;
}
if ((OctStr->length > 0) && (OctStr->data != NULL)) {
*ContentSize = OctStr->length;
*Content = AllocatePool (*ContentSize);