projects
/
cascardo
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a6926cc
)
KEYS: The PKCS#7 test key type should use the secondary keyring
author
David Howells
<dhowells@redhat.com>
Wed, 11 May 2016 13:31:55 +0000
(14:31 +0100)
committer
David Howells
<dhowells@redhat.com>
Wed, 11 May 2016 13:31:55 +0000
(14:31 +0100)
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>
crypto/asymmetric_keys/pkcs7_key_type.c
patch
|
blob
|
history
diff --git
a/crypto/asymmetric_keys/pkcs7_key_type.c
b/crypto/asymmetric_keys/pkcs7_key_type.c
index
3b92523
..
1063b64
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,
-
NUL
L, usage,
+
(void *)1U
L, usage,
pkcs7_view_content, prep);
}