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

Commit cd9d67df authored by Michael Halcrow's avatar Michael Halcrow Committed by Linus Torvalds
Browse files

eCryptfs: make needlessly global symbols static 



Andrew Morton wrote:
> Please check that all the newly-added global symbols do indeed need
> to be global.

Change symbols in keystore.c and crypto.o to static if they do not
need to be global.

Signed-off-by: default avatarMichael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dd8e2902

fs/ecryptfs/crypto.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ static int ecryptfs_calculate_md5(char *dst, 
	return rc;

	return rc;

}

}





int ecryptfs_crypto_api_algify_cipher_name(char **algified_name,

static int ecryptfs_crypto_api_algify_cipher_name(char **algified_name,

						  char *cipher_name,

						  char *cipher_name,

						  char *chaining_modifier)

						  char *chaining_modifier)

{

{
@@ -1859,7 +1859,7 @@ ecryptfs_decode_filename(struct ecryptfs_crypt_stat *crypt_stat, 
 * should be released by other functions, such as on a superblock put

 * should be released by other functions, such as on a superblock put

 * event, regardless of whether this function succeeds for fails.

 * event, regardless of whether this function succeeds for fails.

 */

 */

int

static int

ecryptfs_process_key_cipher(struct crypto_blkcipher **key_tfm,

ecryptfs_process_key_cipher(struct crypto_blkcipher **key_tfm,

			    char *cipher_name, size_t *key_size)

			    char *cipher_name, size_t *key_size)

{

{

fs/ecryptfs/ecryptfs_kernel.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -156,7 +156,6 @@ struct ecryptfs_auth_tok { 
	} token;

	} token;

} __attribute__ ((packed));

} __attribute__ ((packed));





int ecryptfs_get_auth_tok_sig(char **sig, struct ecryptfs_auth_tok *auth_tok);

void ecryptfs_dump_auth_tok(struct ecryptfs_auth_tok *auth_tok);

void ecryptfs_dump_auth_tok(struct ecryptfs_auth_tok *auth_tok);

extern void ecryptfs_to_hex(char *dst, char *src, size_t src_size);

extern void ecryptfs_to_hex(char *dst, char *src, size_t src_size);

extern void ecryptfs_from_hex(char *dst, char *src, int dst_size);

extern void ecryptfs_from_hex(char *dst, char *src, int dst_size);
@@ -536,9 +535,6 @@ void ecryptfs_destroy_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat); 
void ecryptfs_destroy_mount_crypt_stat(

void ecryptfs_destroy_mount_crypt_stat(

	struct ecryptfs_mount_crypt_stat *mount_crypt_stat);

	struct ecryptfs_mount_crypt_stat *mount_crypt_stat);

int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat);

int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat);

int ecryptfs_crypto_api_algify_cipher_name(char **algified_name,

					   char *cipher_name,

					   char *chaining_modifier);

#define ECRYPTFS_LOWER_I_MUTEX_NOT_HELD 0

#define ECRYPTFS_LOWER_I_MUTEX_NOT_HELD 0

#define ECRYPTFS_LOWER_I_MUTEX_HELD 1

#define ECRYPTFS_LOWER_I_MUTEX_HELD 1

int ecryptfs_write_inode_size_to_metadata(struct file *lower_file,

int ecryptfs_write_inode_size_to_metadata(struct file *lower_file,
@@ -579,13 +575,10 @@ int ecryptfs_generate_key_packet_set(char *dest_base, 
				     struct ecryptfs_crypt_stat *crypt_stat,

				     struct ecryptfs_crypt_stat *crypt_stat,

				     struct dentry *ecryptfs_dentry,

				     struct dentry *ecryptfs_dentry,

				     size_t *len, size_t max);

				     size_t *len, size_t max);

int process_request_key_err(long err_code);

int

int

ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat,

ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat,

			  unsigned char *src, struct dentry *ecryptfs_dentry);

			  unsigned char *src, struct dentry *ecryptfs_dentry);

int ecryptfs_truncate(struct dentry *dentry, loff_t new_length);

int ecryptfs_truncate(struct dentry *dentry, loff_t new_length);

int ecryptfs_process_key_cipher(struct crypto_blkcipher **key_tfm,

				char *cipher_name, size_t *key_size);

int ecryptfs_inode_test(struct inode *inode, void *candidate_lower_inode);

int ecryptfs_inode_test(struct inode *inode, void *candidate_lower_inode);

int ecryptfs_inode_set(struct inode *inode, void *lower_inode);

int ecryptfs_inode_set(struct inode *inode, void *lower_inode);

void ecryptfs_init_inode(struct inode *inode, struct inode *lower_inode);

void ecryptfs_init_inode(struct inode *inode, struct inode *lower_inode);

fs/ecryptfs/keystore.c

+22 −21
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ 
 * determine the type of error, make appropriate log entries, and

 * determine the type of error, make appropriate log entries, and

 * return an error code.

 * return an error code.

 */

 */

int process_request_key_err(long err_code)

static int process_request_key_err(long err_code)

{

{

	int rc = 0;

	int rc = 0;
@@ -396,6 +396,27 @@ parse_tag_67_packet(struct ecryptfs_key_record *key_rec, 
	return rc;

	return rc;

}

}





static int

ecryptfs_get_auth_tok_sig(char **sig, struct ecryptfs_auth_tok *auth_tok)

{

	int rc = 0;



	(*sig) = NULL;

	switch (auth_tok->token_type) {

	case ECRYPTFS_PASSWORD:

		(*sig) = auth_tok->token.password.signature;

		break;

	case ECRYPTFS_PRIVATE_KEY:

		(*sig) = auth_tok->token.private_key.signature;

		break;

	default:

		printk(KERN_ERR "Cannot get sig for auth_tok of type [%d]\n",

		       auth_tok->token_type);

		rc = -EINVAL;

	}

	return rc;

}



/**

/**

 * decrypt_pki_encrypted_session_key - Decrypt the session key with the given auth_tok.

 * decrypt_pki_encrypted_session_key - Decrypt the session key with the given auth_tok.

 * @auth_tok: The key authentication token used to decrypt the session key

 * @auth_tok: The key authentication token used to decrypt the session key
@@ -1082,26 +1103,6 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, 
	return rc;

	return rc;

}

}





int ecryptfs_get_auth_tok_sig(char **sig, struct ecryptfs_auth_tok *auth_tok)

{

	int rc = 0;



	(*sig) = NULL;

	switch (auth_tok->token_type) {

	case ECRYPTFS_PASSWORD:

		(*sig) = auth_tok->token.password.signature;

		break;

	case ECRYPTFS_PRIVATE_KEY:

		(*sig) = auth_tok->token.private_key.signature;

		break;

	default:

		printk(KERN_ERR "Cannot get sig for auth_tok of type [%d]\n",

		       auth_tok->token_type);

		rc = -EINVAL;

	}

	return rc;

}



/**

/**

 * ecryptfs_parse_packet_set

 * ecryptfs_parse_packet_set

 * @crypt_stat: The cryptographic context

 * @crypt_stat: The cryptographic context