From patchwork Sat Nov 11 05:55:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "YiLin.Li" X-Patchwork-Id: 744053 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B0A0C6FAD; Sat, 11 Nov 2023 05:56:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=none Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12CBB4204; Fri, 10 Nov 2023 21:56:04 -0800 (PST) X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R891e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=ay29a033018045170; MF=yilin.li@linux.alibaba.com; NM=1; PH=DS; RN=8; SR=0; TI=SMTPD_---0Vw6WwWY_1699682161; Received: from localhost(mailfrom:YiLin.Li@linux.alibaba.com fp:SMTPD_---0Vw6WwWY_1699682161) by smtp.aliyun-inc.com; Sat, 11 Nov 2023 13:56:02 +0800 From: "YiLin.Li" To: David Howells , Herbert Xu , "David S. Miller" , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Cc: YiLin.Li@linux.alibaba.com, tianjia.zhang@linux.alibaba.com Subject: [PATCH] crypto: asymmetric_keys/pkcs7.asn1 - remove the duplicated contentType pkcs7_note_OID processing logic Date: Sat, 11 Nov 2023 05:55:53 +0000 Message-Id: <20231111055553.103757-1-YiLin.Li@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- 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 }