diff options
| author | David Howells <dhowells@redhat.com> | 2016-05-11 15:31:55 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-05-11 15:31:55 +0200 |
| commit | 3c8f2278716dc862c420d3d256a83ce30fd12e74 (patch) | |
| tree | be0a9954d0fdd11607aca9aca075150971e1adba /crypto | |
| parent | Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux in... (diff) | |
| download | linux-3c8f2278716dc862c420d3d256a83ce30fd12e74.tar.xz linux-3c8f2278716dc862c420d3d256a83ce30fd12e74.zip | |
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>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_key_type.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |