Merge tag 'keys-next-20160511' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...

diff --git a/MAINTAINERS b/MAINTAINERS
index 5f83015ff01691c003d85c90b6635f87a69ac3f3..3084c75828632399b328dc142f3f4da8d8c9bcb3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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/
 

diff --git a/crypto/asymmetric_keys/pkcs7_key_type.c b/crypto/asymmetric_keys/pkcs7_key_type.c
index 3b92523882e5821f933c33d82071b9ec6086c046..1063b644efcdb3b2cbde33483207b7fc06e4eb5b 100644 (file)
--- 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);
 }