From 282d50493adf5a00e80bf6a453fb5a4713bb8142 Mon Sep 17 00:00:00 2001 From: Nick Child Date: Wed, 1 Feb 2023 18:32:55 +0000 Subject: [PATCH] pkcs7: Remove duplicate oid condition MBEDTLS_OID_PKCS7_ENCRYPTED_DATA was listed twice in the oid conditional. Remove one of them. Signed-off-by: Nick Child --- library/pkcs7.c | 1 - 1 file changed, 1 deletion(-) diff --git a/library/pkcs7.c b/library/pkcs7.c index f380a7026..273842b2f 100644 --- a/library/pkcs7.c +++ b/library/pkcs7.c @@ -573,7 +573,6 @@ int mbedtls_pkcs7_parse_der(mbedtls_pkcs7 *pkcs7, const unsigned char *buf, } if (!MBEDTLS_OID_CMP(MBEDTLS_OID_PKCS7_DATA, &pkcs7->content_type_oid) - || !MBEDTLS_OID_CMP(MBEDTLS_OID_PKCS7_ENCRYPTED_DATA, &pkcs7->content_type_oid) || !MBEDTLS_OID_CMP(MBEDTLS_OID_PKCS7_ENVELOPED_DATA, &pkcs7->content_type_oid) || !MBEDTLS_OID_CMP(MBEDTLS_OID_PKCS7_SIGNED_AND_ENVELOPED_DATA, &pkcs7->content_type_oid) || !MBEDTLS_OID_CMP(MBEDTLS_OID_PKCS7_DIGESTED_DATA, &pkcs7->content_type_oid)