From patchwork Sun Feb 18 13:24:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Coelho X-Patchwork-Id: 10226759 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8A92B602DC for ; Sun, 18 Feb 2018 13:55:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B81928AEC for ; Sun, 18 Feb 2018 13:55:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F2CA28AF5; Sun, 18 Feb 2018 13:55:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2B0B28AEC for ; Sun, 18 Feb 2018 13:55:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751429AbeBRNzo (ORCPT ); Sun, 18 Feb 2018 08:55:44 -0500 Received: from paleale.coelho.fi ([176.9.41.70]:59514 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751335AbeBRNzo (ORCPT ); Sun, 18 Feb 2018 08:55:44 -0500 Received: from 91-156-4-241.elisa-laajakaista.fi ([91.156.4.241] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1enOxq-0001N7-7J; Sun, 18 Feb 2018 15:25:10 +0200 From: Luca Coelho To: backports@vger.kernel.org Cc: Luca Coelho Date: Sun, 18 Feb 2018 15:24:54 +0200 Message-Id: <20180218132459.11011-6-luca@coelho.fi> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180218132459.11011-1-luca@coelho.fi> References: <20180218132459.11011-1-luca@coelho.fi> X-SA-Exim-Connect-IP: 91.156.4.241 X-SA-Exim-Mail-From: luca@coelho.fi Subject: [PATCH 05/10] backport: remove pkcs7_verify.c patch hunk X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on farmhouse.coelho.fi) Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Luca Coelho The change that used to be patched into the pkcs7_verify.c file is now part of newer kernels, so we don't need to patch it anymore. Remove this hunk from verify.patch accordingly. Signed-off-by: Luca Coelho --- patches/verify.patch | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/patches/verify.patch b/patches/verify.patch index 0fda8411e43a..442f2f622351 100644 --- a/patches/verify.patch +++ b/patches/verify.patch @@ -62,14 +62,3 @@ struct x509_certificate { struct x509_certificate *next; struct x509_certificate *signer; /* Certificate that signed this one */ ---- a/compat/verification/pkcs7_verify.c -+++ b/compat/verification/pkcs7_verify.c -@@ -150,7 +150,7 @@ - pr_devel("Sig %u: Found cert serial match X.509[%u]\n", - sinfo->index, certix); - -- if (x509->pub->pkey_algo != sinfo->sig->pkey_algo) { -+ if (strcmp(x509->pub->pkey_algo, sinfo->sig->pkey_algo)) { - pr_warn("Sig %u: X.509 algo and PKCS#7 sig algo don't match\n", - sinfo->index); - continue;