Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -1945,6 +1945,16 @@ L: platform-driver-x86@vger.kernel.org 
S:	Maintained

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

R:	Dan Williams <dan.j.williams@intel.com>

W:	http://sourceforge.net/projects/xscaleiop
@@ -6433,6 +6443,8 @@ S: Maintained 
F:	Documentation/security/keys.txt

F:	include/linux/key.h

F:	include/linux/key-type.h

F:	include/linux/keyctl.h

F:	include/uapi/linux/keyctl.h

F:	include/keys/

F:	security/keys/

crypto/asymmetric_keys/pkcs7_key_type.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}