Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c9c115c authored by David Howells's avatar David Howells
Browse files

Merge tag 'keys-next-fixes-20140916' into keys-next 



Merge in keyrings fixes for next:

 (1) Insert some missing 'static' annotations.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parents 68c45c7f 15155b9a

crypto/asymmetric_keys/pkcs7_trust.c

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
/**

 * Check the trust on one PKCS#7 SignedInfo block.

 */

int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7,

static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7,

				    struct pkcs7_signed_info *sinfo,

				    struct key *trust_keyring)

{

security/keys/request_key_auth.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{

}