From: David Howells <dhowells@redhat.com>
Date: Wed, 11 May 2016 13:31:55 +0000 (+0100)
Subject: KEYS: The PKCS#7 test key type should use the secondary keyring
X-Git-Tag: v4.7-rc1~76^2^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3c8f2278716dc862c420d3d256a83ce30fd12e74;p=karo-tx-linux.git

KEYS: The PKCS#7 test key type should use the secondary keyring

The PKCS#7 test key type should use the secondary keyring instead of the
built-in keyring if available as the source of trustworthy keys.

Signed-off-by: David Howells <dhowells@redhat.com>
---

diff --git a/crypto/asymmetric_keys/pkcs7_key_type.c b/crypto/asymmetric_keys/pkcs7_key_type.c
index 3b92523882e5..1063b644efcd 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);
 }