From patchwork Tue Aug 1 12:28:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 9874501 X-Patchwork-Delegate: herbert@gondor.apana.org.au 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 5F8AB6038F for ; Tue, 1 Aug 2017 12:29:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C2AC28689 for ; Tue, 1 Aug 2017 12:29:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 513C228699; Tue, 1 Aug 2017 12:29:25 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable 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 09D3828689 for ; Tue, 1 Aug 2017 12:29:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751773AbdHAM3K (ORCPT ); Tue, 1 Aug 2017 08:29:10 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34041 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751199AbdHAM3I (ORCPT ); Tue, 1 Aug 2017 08:29:08 -0400 Received: by mail-wm0-f68.google.com with SMTP id x64so2818682wmg.1; Tue, 01 Aug 2017 05:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=28z27SPfMW1RrchatFfxbkuYtS31seBRplHiyHETjI0=; b=pWQ+ekMuQljNkWbtcq9/LQIArh4aAiYwdfzWLpEi5LLKbOivhIl+83Av3+htg3Ovam l7Q5DRAPHnvjXKL1RxECRXDgxlNuJCBqqv68n1Ub+JIgR3rpu0gwn1awFMOIbhfu79bX vTx/M6O2gfu+S14uwftcXz7D9I3wcR39sX5XMeoIh81rqqtox6YlRkJrCMPW3mR4ewK1 ueDwjLPT+mwbDjSSRXxaZv+RErlEEgJqxXh73ftfSSQqpHd3Hd3pDuoIFKVp0Ljj+Cb0 Juc0Np1jUM9yFxg1Q8yChJtEtfwkxQYrDsluyr6FJtR4yWSjCZgAMTvHmUTsqSDJYSJp P7XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=28z27SPfMW1RrchatFfxbkuYtS31seBRplHiyHETjI0=; b=n1sf6TokWIrOwRgo4lzKAFj7sZdT+X/NrDnMhqhxhaBo0E6K7scCRQD1JS47Ls6AXT cJnM5gQr2A8iu+pQ/uO9/JmJsy+4QPab5iRoBlziki21ktgmVmN2Bj1DZYNHJAL6fvYZ U1cBATOS/pv1yQjcGwvZVps95vlesuOjNuig+rqloiqq01AN4BUO9ucZg1ffBJwd6q4x tWklOLq1JR3mzco76x8hehptLnzNLcim5uZCthyWwVL6GXvQachO+jyAeo2nIIK+OsH8 VW7EUtUiD9vXbWLlxBcczRBakIWbSDyy8M0RqlMs0AptfwY+xnX1CAuVqoAwOH1hPI0n TvYA== X-Gm-Message-State: AIVw1132dIcMphSULskeXcX1Twa4S3Kr3uN8K/cAJr/Zh34S0i7YN8G1 dmcVM+C5FUkZsw== X-Received: by 10.28.101.5 with SMTP id z5mr1384650wmb.136.1501590547037; Tue, 01 Aug 2017 05:29:07 -0700 (PDT) Received: from mephisto.homenet.telecomitalia.it (host78-154-dynamic.17-79-r.retail.telecomitalia.it. [79.17.154.78]) by smtp.gmail.com with ESMTPSA id a25sm19226266wrd.43.2017.08.01.05.29.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 05:29:06 -0700 (PDT) From: Carlo Caione To: dhowells@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessm.com Cc: Carlo Caione Subject: [PATCH] X.509: Recognize the legacy OID 1.3.14.3.2.29 (sha1WithRSASignature) Date: Tue, 1 Aug 2017 14:28:59 +0200 Message-Id: <20170801122859.24806-1-carlo@caione.org> X-Mailer: git-send-email 2.13.3 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Carlo Caione sha1WithRSASignature is a deprecated equivalent of sha1WithRSAEncryption. It originates from the NIST Open Systems Environment (OSE) Implementor's Workshop (OIW). It is supported for compatibility with Microsoft's certificate APIs and tools, particularly makecert.exe, which default(ed/s) to this OID for SHA-1. Signed-off-by: Carlo Caione --- crypto/asymmetric_keys/x509_cert_parser.c | 1 + include/linux/oid_registry.h | 1 + 2 files changed, 2 insertions(+) diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c index dd03fead1ca3..cdbc8c2def79 100644 --- a/crypto/asymmetric_keys/x509_cert_parser.c +++ b/crypto/asymmetric_keys/x509_cert_parser.c @@ -203,6 +203,7 @@ int x509_note_pkey_algo(void *context, size_t hdrlen, break; case OID_sha1WithRSAEncryption: + case OID_sha1WithRSASignature: ctx->cert->sig->hash_algo = "sha1"; ctx->cert->sig->pkey_algo = "rsa"; break; diff --git a/include/linux/oid_registry.h b/include/linux/oid_registry.h index d2fa9ca42e9a..26faee80357f 100644 --- a/include/linux/oid_registry.h +++ b/include/linux/oid_registry.h @@ -62,6 +62,7 @@ enum OID { OID_certAuthInfoAccess, /* 1.3.6.1.5.5.7.1.1 */ OID_sha1, /* 1.3.14.3.2.26 */ + OID_sha1WithRSASignature, /* 1.3.14.3.2.29 */ OID_sha256, /* 2.16.840.1.101.3.4.2.1 */ OID_sha384, /* 2.16.840.1.101.3.4.2.2 */ OID_sha512, /* 2.16.840.1.101.3.4.2.3 */