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 | 6ce64d9b0c0f26181ed4e58df59e5b9062ea4c27 (patch) | |
| tree | 1754249ff46f09ad79b31cd872a8cd825a7c0017 | |
| parent | b396cd78fad2888012645e596c389f56303d2d78 (diff) | |
| parent | a772d1c7e49f5e84a102b46ae0543ba5b0f31566 (diff) | |
| download | linux-crypto-6ce64d9b0c0f26181ed4e58df59e5b9062ea4c27.tar.gz linux-crypto-6ce64d9b0c0f26181ed4e58df59e5b9062ea4c27.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 '')
| -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 3b925238..1063b644 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); } |