diff options
| author | Yannik Sembritzki <yannik@sembritzki.me> | 2018-08-16 14:05:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-09 19:55:54 +0200 |
| commit | f70805bef73eda436ad664deab818b3291cc8407 (patch) | |
| tree | 1a13852f239bbd98f71127c0a2b3ae085d25ab33 /crypto | |
| parent | 9cbb32610233e3531ec74e17b44d702c1ca353f0 (diff) | |
| download | linux-rpi3-f70805bef73eda436ad664deab818b3291cc8407.tar.gz linux-rpi3-f70805bef73eda436ad664deab818b3291cc8407.tar.bz2 linux-rpi3-f70805bef73eda436ad664deab818b3291cc8407.zip | |
Replace magic for trusting the secondary keyring with #define
commit 817aef260037f33ee0f44c17fe341323d3aebd6d upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 1063b644efcd..b2aa925a84bc 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, - (void *)1UL, usage, + VERIFY_USE_SECONDARY_KEYRING, usage, pkcs7_view_content, prep); } |