diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/module_signing.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/module_signing.c b/kernel/module_signing.c index 0b6b870dc5e4..be5b8fac4bd0 100644 --- a/kernel/module_signing.c +++ b/kernel/module_signing.c | |||
@@ -29,7 +29,7 @@ | |||
29 | */ | 29 | */ |
30 | struct module_signature { | 30 | struct module_signature { |
31 | u8 algo; /* Public-key crypto algorithm [enum pkey_algo] */ | 31 | u8 algo; /* Public-key crypto algorithm [enum pkey_algo] */ |
32 | u8 hash; /* Digest algorithm [enum pkey_hash_algo] */ | 32 | u8 hash; /* Digest algorithm [enum hash_algo] */ |
33 | u8 id_type; /* Key identifier type [enum pkey_id_type] */ | 33 | u8 id_type; /* Key identifier type [enum pkey_id_type] */ |
34 | u8 signer_len; /* Length of signer's name */ | 34 | u8 signer_len; /* Length of signer's name */ |
35 | u8 key_id_len; /* Length of key identifier */ | 35 | u8 key_id_len; /* Length of key identifier */ |
@@ -40,7 +40,7 @@ struct module_signature { | |||
40 | /* | 40 | /* |
41 | * Digest the module contents. | 41 | * Digest the module contents. |
42 | */ | 42 | */ |
43 | static struct public_key_signature *mod_make_digest(enum pkey_hash_algo hash, | 43 | static struct public_key_signature *mod_make_digest(enum hash_algo hash, |
44 | const void *mod, | 44 | const void *mod, |
45 | unsigned long modlen) | 45 | unsigned long modlen) |
46 | { | 46 | { |
@@ -55,7 +55,7 @@ static struct public_key_signature *mod_make_digest(enum pkey_hash_algo hash, | |||
55 | /* Allocate the hashing algorithm we're going to need and find out how | 55 | /* Allocate the hashing algorithm we're going to need and find out how |
56 | * big the hash operational data will be. | 56 | * big the hash operational data will be. |
57 | */ | 57 | */ |
58 | tfm = crypto_alloc_shash(pkey_hash_algo_name[hash], 0, 0); | 58 | tfm = crypto_alloc_shash(hash_algo_name[hash], 0, 0); |
59 | if (IS_ERR(tfm)) | 59 | if (IS_ERR(tfm)) |
60 | return (PTR_ERR(tfm) == -ENOENT) ? ERR_PTR(-ENOPKG) : ERR_CAST(tfm); | 60 | return (PTR_ERR(tfm) == -ENOENT) ? ERR_PTR(-ENOPKG) : ERR_CAST(tfm); |
61 | 61 | ||
@@ -218,7 +218,7 @@ int mod_verify_sig(const void *mod, unsigned long *_modlen) | |||
218 | return -ENOPKG; | 218 | return -ENOPKG; |
219 | 219 | ||
220 | if (ms.hash >= PKEY_HASH__LAST || | 220 | if (ms.hash >= PKEY_HASH__LAST || |
221 | !pkey_hash_algo_name[ms.hash]) | 221 | !hash_algo_name[ms.hash]) |
222 | return -ENOPKG; | 222 | return -ENOPKG; |
223 | 223 | ||
224 | key = request_asymmetric_key(sig, ms.signer_len, | 224 | key = request_asymmetric_key(sig, ms.signer_len, |