summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2013-08-30 17:15:10 +0200
committerDavid Howells <dhowells@redhat.com>2013-09-25 16:51:07 +0200
commit9abc4e66eb839c28516916543768be08c814a3c8 (patch)
tree1cf2c1715b7c9ea166338a84d37ff90ea6254591 /kernel
parentKEYS: Add per-user_namespace registers for persistent per-UID kerberos caches (diff)
downloadlinux-9abc4e66eb839c28516916543768be08c814a3c8.tar.xz
linux-9abc4e66eb839c28516916543768be08c814a3c8.zip
KEYS: Rename public key parameter name arrays
Rename the arrays of public key parameters (public key algorithm names, hash algorithm names and ID type names) so that the array name ends in "_name". Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Josh Boyer <jwboyer@redhat.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module_signing.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/module_signing.c b/kernel/module_signing.c
index f2970bddc5ea..ee476404167b 100644
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
@@ -54,7 +54,7 @@ static struct public_key_signature *mod_make_digest(enum pkey_hash_algo hash,
/* Allocate the hashing algorithm we're going to need and find out how
* big the hash operational data will be.
*/
- tfm = crypto_alloc_shash(pkey_hash_algo[hash], 0, 0);
+ tfm = crypto_alloc_shash(pkey_hash_algo_name[hash], 0, 0);
if (IS_ERR(tfm))
return (PTR_ERR(tfm) == -ENOENT) ? ERR_PTR(-ENOPKG) : ERR_CAST(tfm);
@@ -217,7 +217,7 @@ int mod_verify_sig(const void *mod, unsigned long *_modlen)
return -ENOPKG;
if (ms.hash >= PKEY_HASH__LAST ||
- !pkey_hash_algo[ms.hash])
+ !pkey_hash_algo_name[ms.hash])
return -ENOPKG;
key = request_asymmetric_key(sig, ms.signer_len,