PKCS#7: Appropriately restrict authenticated attributes and content type

[firefly-linux-kernel-4.4.55.git] / crypto / asymmetric_keys / pkcs7.asn1

diff --git a/crypto/asymmetric_keys/pkcs7.asn1 b/crypto/asymmetric_keys/pkcs7.asn1
index 6bf8ff4f7414ee7bb9aa7ae833e212f6aa010178..1eca740b816ace4680870df9e3a7885b8ba47538 100644 (file)
--- a/crypto/asymmetric_keys/pkcs7.asn1
+++ b/crypto/asymmetric_keys/pkcs7.asn1
@@ -8,7 +8,7 @@ ContentType ::= OBJECT IDENTIFIER ({ pkcs7_note_OID })
 SignedData ::= SEQUENCE {
        version                 INTEGER ({ pkcs7_note_signeddata_version }),
        digestAlgorithms        DigestAlgorithmIdentifiers,
-       contentInfo             ContentInfo,
+       contentInfo             ContentInfo ({ pkcs7_note_content }),
        certificates            CHOICE {
                certSet         [0] IMPLICIT ExtendedCertificatesAndCertificates,
                certSequence    [2] IMPLICIT Certificates
@@ -21,7 +21,7 @@ SignedData ::= SEQUENCE {
 }
 
 ContentInfo ::= SEQUENCE {
-       contentType     ContentType,
+       contentType     ContentType ({ pkcs7_note_OID }),
        content         [0] EXPLICIT Data OPTIONAL
 }
 
@@ -111,7 +111,7 @@ AuthenticatedAttribute ::= SEQUENCE {
 }
 
 UnauthenticatedAttribute ::= SEQUENCE {
-       type                    OBJECT IDENTIFIER ({ pkcs7_note_OID }),
+       type                    OBJECT IDENTIFIER,
        values                  SET OF ANY
 }