.../BaseCryptLib/Pk/CryptPkcs7VerifyBase.c | 63 ++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-)
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>
---
.../BaseCryptLib/Pk/CryptPkcs7VerifyBase.c | 63 ++++++++++++++++++-
1 file changed, 62 insertions(+), 1 deletion(-)
diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c
index 313f459b11..00840e7f83 100644
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c
@@ -13,6 +13,63 @@ 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 p7 Pointer to the location which the PKCS7 is located at.
+
+ @return int The content type.
+**/
+static
+int
+Pkcs7TypeIsOther (
+ PKCS7 *p7
+ )
+{
+ int isOthers = 1;
+ int 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:
+ isOthers = 0;
+ break;
+ default:
+ isOthers = 1;
+ }
+
+ return isOthers;
+}
+
+/**
+ Get the ASN.1 string for the PKCS7.
+
+ It is copied from PKCS7_get_octet_string() in pk7_doit.c.
+ @param p7 Pointer to the location which the PKCS7 is located at.
+
+ @return ASN1_OCTET_STRING ASN.1 string.
+**/
+static
+ASN1_OCTET_STRING*
+Pkcs7GetOctetString (
+ PKCS7 *p7
+ )
+{
+ if (PKCS7_type_is_data(p7)) {
+ return p7->d.data;
+ }
+ if (Pkcs7TypeIsOther(p7) && p7->d.other &&
+ (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 +155,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);
--
2.25.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#57175): https://edk2.groups.io/g/devel/message/57175
Mute This Topic: https://groups.io/mt/72912787/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Hi Guomin, The coding style is still not matching edk2 requirement completely. Could you check again every symbol not from openssl? Regards, Jian > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Guomin > Jiang > Sent: Friday, April 10, 2020 10:31 AM > To: devel@edk2.groups.io > Cc: Wang, Jian J <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com> > Subject: [edk2-devel] [PATCH v3] 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> > --- > .../BaseCryptLib/Pk/CryptPkcs7VerifyBase.c | 63 ++++++++++++++++++- > 1 file changed, 62 insertions(+), 1 deletion(-) > > diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c > b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c > index 313f459b11..00840e7f83 100644 > --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c > +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c > @@ -13,6 +13,63 @@ 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 p7 Pointer to the location which the PKCS7 is located at. > > + > > + @return int The content type. > > +**/ > > +static > > +int > > +Pkcs7TypeIsOther ( > > + PKCS7 *p7 > > + ) > > +{ > > + int isOthers = 1; > > + int 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: > > + isOthers = 0; > > + break; > > + default: > > + isOthers = 1; > > + } > > + > > + return isOthers; > > +} > > + > > +/** > > + Get the ASN.1 string for the PKCS7. > > + > > + It is copied from PKCS7_get_octet_string() in pk7_doit.c. > > + @param p7 Pointer to the location which the PKCS7 is located at. > > + > > + @return ASN1_OCTET_STRING ASN.1 string. > > +**/ > > +static > > +ASN1_OCTET_STRING* > > +Pkcs7GetOctetString ( > > + PKCS7 *p7 > > + ) > > +{ > > + if (PKCS7_type_is_data(p7)) { > > + return p7->d.data; > > + } > > + if (Pkcs7TypeIsOther(p7) && p7->d.other && > > + (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 +155,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); > > -- > 2.25.1.windows.1 > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > > View/Reply Online (#57175): https://edk2.groups.io/g/devel/message/57175 > Mute This Topic: https://groups.io/mt/72912787/1768734 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [jian.j.wang@intel.com] > -=-=-=-=-=-= -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57180): https://edk2.groups.io/g/devel/message/57180 Mute This Topic: https://groups.io/mt/72912787/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.