Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-16 05:26:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge tag 'keys-next-20160511' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus

Browse Source
This commit is contained in:
James Morris 2016-05-23 21:23:47 +10:00
commit 653bd4568b
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MAINTAINERS
View File

@ -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
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/

2
crypto/asymmetric_keys/pkcs7_key_type.c
View File

@ -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);
} }