crypto: asymmetric_keys/pkcs7.asn1 - remove the duplicated contentType pkcs7_note_OID processing logic

Commit Message

YiLin.Li Nov. 11, 2023, 5:55 a.m. UTC

The OID of contentType has been recorded in
`ContentType ::= OBJECT IDENTIFIER ({ pkcs7_note_OID })`,
so there is no need to re-extract the OID of contentType in
`contentType ContentType ({ pkcs7_note_OID })`.
Therefore, we need to remove the duplicated contentType
pkcs7_note_OID processing logic.

Signed-off-by: YiLin.Li <[e-mail]>
---
 crypto/asymmetric_keys/pkcs7.asn1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

YiLin.Li Dec. 1, 2023, 7:44 a.m. UTC | #1

gently ping...
> The OID of contentType has been recorded in
> `ContentType ::= OBJECT IDENTIFIER ({ pkcs7_note_OID })`,
> so there is no need to re-extract the OID of contentType in
> `contentType ContentType ({ pkcs7_note_OID })`.
> Therefore, we need to remove the duplicated contentType
> pkcs7_note_OID processing logic.
>
> Signed-off-by: YiLin.Li <[e-mail]>
> ---
>   crypto/asymmetric_keys/pkcs7.asn1 | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/crypto/asymmetric_keys/pkcs7.asn1 b/crypto/asymmetric_keys/pkcs7.asn1
> index 28e1f4a41c14..3f7adec38245 100644
> --- a/crypto/asymmetric_keys/pkcs7.asn1
> +++ b/crypto/asymmetric_keys/pkcs7.asn1
> @@ -28,7 +28,7 @@ SignedData ::= SEQUENCE {
>   }
>   
>   ContentInfo ::= SEQUENCE {
> -	contentType	ContentType ({ pkcs7_note_OID }),
> +	contentType	ContentType,
>   	content		[0] EXPLICIT Data OPTIONAL
>   }
>

YiLin.Li Jan. 6, 2024, 7:41 a.m. UTC | #2

gently ping...

在 2023/12/1 15:44, YiLin.Li 写道:
> gently ping...

Patch

diff --git a/crypto/asymmetric_keys/pkcs7.asn1 b/crypto/asymmetric_keys/pkcs7.asn1
index 28e1f4a41c14..3f7adec38245 100644
--- a/crypto/asymmetric_keys/pkcs7.asn1
+++ b/crypto/asymmetric_keys/pkcs7.asn1
@@ -28,7 +28,7 @@  SignedData ::= SEQUENCE {
 }
 
 ContentInfo ::= SEQUENCE {
-	contentType	ContentType ({ pkcs7_note_OID }),
+	contentType	ContentType,
 	content		[0] EXPLICIT Data OPTIONAL
 }