pefile: Handle pesign using the wrong OID

[cascardo/linux.git] / crypto / asymmetric_keys / mscode_parser.c

diff --git a/crypto/asymmetric_keys/mscode_parser.c b/crypto/asymmetric_keys/mscode_parser.c
index 09336c3..214a992 100644 (file)
--- a/crypto/asymmetric_keys/mscode_parser.c
+++ b/crypto/asymmetric_keys/mscode_parser.c
@@ -58,7 +58,13 @@ int mscode_note_content_type(void *context, size_t hdrlen,
                return -EBADMSG;
        }
 
-       if (oid != OID_msIndividualSPKeyPurpose) {
+       /*
+        * pesign utility had a bug where it was putting
+        * OID_msIndividualSPKeyPurpose instead of OID_msPeImageDataObjId
+        * So allow both OIDs.
+        */
+       if (oid != OID_msPeImageDataObjId &&
+           oid != OID_msIndividualSPKeyPurpose) {
                pr_err("Unexpected content type OID %u\n", oid);
                return -EBADMSG;
        }