diff options
| author | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
| commit | ed8b19a674c67e1007990991d4e02c02da07c952 (patch) | |
| tree | 230d118992bfd9ac76f80822d34c2f4ea9819a44 /crypto/asymmetric_keys/pkcs7_verify.c | |
| parent | 5da64d0814134dc3542fb314a66dcdf74e8553bd (diff) | |
| parent | f349a25c7c6b753176540d10e6c243047faefa3a (diff) | |
| download | linux-crypto-ed8b19a674c67e1007990991d4e02c02da07c952.tar.gz linux-crypto-ed8b19a674c67e1007990991d4e02c02da07c952.zip | |
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_verify.c')
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_verify.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_verify.c b/crypto/asymmetric_keys/pkcs7_verify.c index 325575ca..50be2a15 100644 --- a/crypto/asymmetric_keys/pkcs7_verify.c +++ b/crypto/asymmetric_keys/pkcs7_verify.c @@ -16,7 +16,7 @@ #include <linux/err.h> #include <linux/asn1.h> #include <crypto/hash.h> -#include "public_key.h" +#include <crypto/public_key.h> #include "pkcs7_parser.h" /* @@ -31,17 +31,15 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, void *digest; int ret; - kenter(",%u,%u", sinfo->index, sinfo->sig.pkey_hash_algo); + kenter(",%u,%s", sinfo->index, sinfo->sig.hash_algo); - if (sinfo->sig.pkey_hash_algo >= PKEY_HASH__LAST || - !hash_algo_name[sinfo->sig.pkey_hash_algo]) + if (!sinfo->sig.hash_algo) return -ENOPKG; /* Allocate the hashing algorithm we're going to need and find out how * big the hash operational data will be. */ - tfm = crypto_alloc_shash(hash_algo_name[sinfo->sig.pkey_hash_algo], - 0, 0); + tfm = crypto_alloc_shash(sinfo->sig.hash_algo, 0, 0); if (IS_ERR(tfm)) return (PTR_ERR(tfm) == -ENOENT) ? -ENOPKG : PTR_ERR(tfm); |