summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorYannik Sembritzki <yannik@sembritzki.me>2018-08-16 14:05:10 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-16 09:57:20 -0700
commit817aef260037f33ee0f44c17fe341323d3aebd6d (patch)
tree8f193bce3aa82797c09874cb7ea8274f9dc2e79c /crypto
parent4e31843f681c34f7185e7d169fe627c9d891ce2c (diff)
downloadlinux-stable-817aef260037f33ee0f44c17fe341323d3aebd6d.tar.gz
linux-stable-817aef260037f33ee0f44c17fe341323d3aebd6d.tar.bz2
linux-stable-817aef260037f33ee0f44c17fe341323d3aebd6d.zip
Replace magic for trusting the secondary keyring with #define
Replace the use of a magic number that indicates that verify_*_signature() should use the secondary keyring with a symbol. Signed-off-by: Yannik Sembritzki <yannik@sembritzki.me> Signed-off-by: David Howells <dhowells@redhat.com> Cc: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/asymmetric_keys/pkcs7_key_type.c2
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 e284d9cb9237..5b2f6a2b5585 100644
--- a/crypto/asymmetric_keys/pkcs7_key_type.c
+++ b/crypto/asymmetric_keys/pkcs7_key_type.c
@@ -63,7 +63,7 @@ static int pkcs7_preparse(struct key_preparsed_payload *prep)
return verify_pkcs7_signature(NULL, 0,
prep->data, prep->datalen,
- (void *)1UL, usage,
+ VERIFY_USE_SECONDARY_KEYRING, usage,
pkcs7_view_content, prep);
}