summaryrefslogtreecommitdiffstats
path: root/include/crypto/pkcs7.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2016-04-06 17:14:24 +0200
committerDavid Howells <dhowells@redhat.com>2016-04-06 17:14:24 +0200
commitbda850cd214e90b1be0cc25bc48c4f6ac53eb543 (patch)
treeacb936239ac766592c557295aec265ec9a2d04fb /include/crypto/pkcs7.h
parentKEYS: Generalise system_verify_data() to provide access to internal content (diff)
downloadlinux-bda850cd214e90b1be0cc25bc48c4f6ac53eb543.tar.xz
linux-bda850cd214e90b1be0cc25bc48c4f6ac53eb543.zip
PKCS#7: Make trust determination dependent on contents of trust keyring
Make the determination of the trustworthiness of a key dependent on whether a key that can verify it is present in the supplied ring of trusted keys rather than whether or not the verifying key has KEY_FLAG_TRUSTED set. verify_pkcs7_signature() will return -ENOKEY if the PKCS#7 message trust chain cannot be verified. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/crypto/pkcs7.h')
-rw-r--r--include/crypto/pkcs7.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/crypto/pkcs7.h b/include/crypto/pkcs7.h
index 8323e3e57131..583f199400a3 100644
--- a/include/crypto/pkcs7.h
+++ b/include/crypto/pkcs7.h
@@ -33,8 +33,7 @@ extern int pkcs7_get_content_data(const struct pkcs7_message *pkcs7,
* pkcs7_trust.c
*/
extern int pkcs7_validate_trust(struct pkcs7_message *pkcs7,
- struct key *trust_keyring,
- bool *_trusted);
+ struct key *trust_keyring);
/*
* pkcs7_verify.c