diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-05-23 21:23:47 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-05-23 21:23:47 +1000 |
| commit | 653bd4568ba083dfd5a06a83de3f0dc1e53dd42b (patch) | |
| tree | 3378a957889156e4a8f122758d4aa8fe52632a6a /crypto | |
| parent | 7639dad93a5564579987abded4ec05e3db13659d (diff) | |
| parent | 75aeddd12f205d07b36ed76db3426e974b8f2a21 (diff) | |
| download | linux-stable-653bd4568ba083dfd5a06a83de3f0dc1e53dd42b.tar.gz linux-stable-653bd4568ba083dfd5a06a83de3f0dc1e53dd42b.tar.bz2 linux-stable-653bd4568ba083dfd5a06a83de3f0dc1e53dd42b.zip | |
Merge tag 'keys-next-20160511' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_key_type.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_key_type.c b/crypto/asymmetric_keys/pkcs7_key_type.c index 3b92523882e5..1063b644efcd 100644 --- a/crypto/asymmetric_keys/pkcs7_key_type.c +++ b/crypto/asymmetric_keys/pkcs7_key_type.c @@ -62,7 +62,7 @@ static int pkcs7_preparse(struct key_preparsed_payload *prep) return verify_pkcs7_signature(NULL, 0, prep->data, prep->datalen, - NULL, usage, + (void *)1UL, usage, pkcs7_view_content, prep); } |