From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932195AbbHENr6 (ORCPT ); Wed, 5 Aug 2015 09:47:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54393 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752642AbbHENr4 (ORCPT ); Wed, 5 Aug 2015 09:47:56 -0400 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 26/27] KEYS: Add a name for PKEY_ID_PKCS7 [ver #7] From: David Howells To: keyrings@linux-nfs.org Cc: mcgrof@gmail.com, zohar@linux.vnet.ibm.com, kyle@kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, dwmw2@infradead.org Date: Wed, 05 Aug 2015 14:47:51 +0100 Message-ID: <20150805134751.9984.99884.stgit@warthog.procyon.org.uk> In-Reply-To: <20150805134323.9984.4454.stgit@warthog.procyon.org.uk> References: <20150805134323.9984.4454.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a name for PKEY_ID_PKCS7 into the pkey_id_type_name array. Signed-off-by: David Howells --- crypto/asymmetric_keys/public_key.c | 1 + 1 file changed, 1 insertion(+) diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index 2f6e4fb1a1ea..81efccbe22d5 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -39,6 +39,7 @@ EXPORT_SYMBOL_GPL(pkey_algo); const char *const pkey_id_type_name[PKEY_ID_TYPE__LAST] = { [PKEY_ID_PGP] = "PGP", [PKEY_ID_X509] = "X509", + [PKEY_ID_PKCS7] = "PKCS#7", }; EXPORT_SYMBOL_GPL(pkey_id_type_name);