diff options
| author | David Howells <dhowells@redhat.com> | 2014-09-16 17:32:55 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-09-16 17:32:55 +0100 |
| commit | 1c9c115ccc76d313f1a9232ffb903de325b64943 (patch) | |
| tree | a0e106355ed4f401be0a33fb115dc675f54a3766 | |
| parent | 68c45c7feaf1a8adebc6d9d77aa0a2018d974085 (diff) | |
| parent | 15155b9a4530f8da42d6594927928e25b2b29875 (diff) | |
| download | linux-1c9c115ccc76d313f1a9232ffb903de325b64943.tar.bz2 | |
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>
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_trust.c | 6 | ||||
| -rw-r--r-- | security/keys/request_key_auth.c | 4 |
2 files changed, 5 insertions, 5 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; diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index 842e6f410d50..739e7455d388 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c @@ -44,12 +44,12 @@ struct key_type key_type_request_key_auth = { .read = request_key_auth_read, }; -int request_key_auth_preparse(struct key_preparsed_payload *prep) +static int request_key_auth_preparse(struct key_preparsed_payload *prep) { return 0; } -void request_key_auth_free_preparse(struct key_preparsed_payload *prep) +static void request_key_auth_free_preparse(struct key_preparsed_payload *prep) { } |