summaryrefslogtreecommitdiffstats
path: root/crypto/asymmetric_keys
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2014-09-16 17:32:55 +0100
committerDavid Howells <dhowells@redhat.com>2014-09-16 17:32:55 +0100
commit1c9c115ccc76d313f1a9232ffb903de325b64943 (patch)
treea0e106355ed4f401be0a33fb115dc675f54a3766 /crypto/asymmetric_keys
parent68c45c7feaf1a8adebc6d9d77aa0a2018d974085 (diff)
parent15155b9a4530f8da42d6594927928e25b2b29875 (diff)
downloadlinux-stable-1c9c115ccc76d313f1a9232ffb903de325b64943.tar.gz
linux-stable-1c9c115ccc76d313f1a9232ffb903de325b64943.tar.bz2
linux-stable-1c9c115ccc76d313f1a9232ffb903de325b64943.zip
Merge tag 'keys-next-fixes-20140916' into keys-next
Merge in keyrings fixes for next: (1) Insert some missing 'static' annotations. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'crypto/asymmetric_keys')
-rw-r--r--crypto/asymmetric_keys/pkcs7_trust.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_trust.c b/crypto/asymmetric_keys/pkcs7_trust.c
index e666eb011a85..fad888ea4fad 100644
--- a/crypto/asymmetric_keys/pkcs7_trust.c
+++ b/crypto/asymmetric_keys/pkcs7_trust.c
@@ -23,9 +23,9 @@
/**
* Check the trust on one PKCS#7 SignedInfo block.
*/
-int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7,
- struct pkcs7_signed_info *sinfo,
- struct key *trust_keyring)
+static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7,
+ struct pkcs7_signed_info *sinfo,
+ struct key *trust_keyring)
{
struct public_key_signature *sig = &sinfo->sig;
struct x509_certificate *x509, *last = NULL, *p;