Commit 653bd456 authored by James Morris's avatar James Morris

Merge tag 'keys-next-20160511' of...

Merge tag 'keys-next-20160511' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus
parents 7639dad9 75aeddd1
...@@ -1945,6 +1945,16 @@ L: platform-driver-x86@vger.kernel.org ...@@ -1945,6 +1945,16 @@ L: platform-driver-x86@vger.kernel.org
S: Maintained S: Maintained
F: drivers/platform/x86/asus-wireless.c F: drivers/platform/x86/asus-wireless.c
ASYMMETRIC KEYS
M: David Howells <dhowells@redhat.com>
L: keyrings@vger.kernel.org
S: Maintained
F: Documentation/crypto/asymmetric-keys.txt
F: include/linux/verification.h
F: include/crypto/public_key.h
F: include/crypto/pkcs7.h
F: crypto/asymmetric_keys/
ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
R: Dan Williams <dan.j.williams@intel.com> R: Dan Williams <dan.j.williams@intel.com>
W: http://sourceforge.net/projects/xscaleiop W: http://sourceforge.net/projects/xscaleiop
...@@ -6433,6 +6443,8 @@ S: Maintained ...@@ -6433,6 +6443,8 @@ S: Maintained
F: Documentation/security/keys.txt F: Documentation/security/keys.txt
F: include/linux/key.h F: include/linux/key.h
F: include/linux/key-type.h F: include/linux/key-type.h
F: include/linux/keyctl.h
F: include/uapi/linux/keyctl.h
F: include/keys/ F: include/keys/
F: security/keys/ F: security/keys/
......
...@@ -62,7 +62,7 @@ static int pkcs7_preparse(struct key_preparsed_payload *prep) ...@@ -62,7 +62,7 @@ static int pkcs7_preparse(struct key_preparsed_payload *prep)
return verify_pkcs7_signature(NULL, 0, return verify_pkcs7_signature(NULL, 0,
prep->data, prep->datalen, prep->data, prep->datalen,
NULL, usage, (void *)1UL, usage,
pkcs7_view_content, prep); pkcs7_view_content, prep);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment