diff options
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r-- | fs/ecryptfs/keystore.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index e9cda7afe6be..a6cbfc16d8a4 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c | |||
@@ -1009,7 +1009,7 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, | |||
1009 | { | 1009 | { |
1010 | struct scatterlist dst_sg; | 1010 | struct scatterlist dst_sg; |
1011 | struct scatterlist src_sg; | 1011 | struct scatterlist src_sg; |
1012 | struct mutex *tfm_mutex = NULL; | 1012 | struct mutex *tfm_mutex; |
1013 | struct blkcipher_desc desc = { | 1013 | struct blkcipher_desc desc = { |
1014 | .flags = CRYPTO_TFM_REQ_MAY_SLEEP | 1014 | .flags = CRYPTO_TFM_REQ_MAY_SLEEP |
1015 | }; | 1015 | }; |
@@ -1123,8 +1123,8 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat, | |||
1123 | size_t found_auth_tok; | 1123 | size_t found_auth_tok; |
1124 | size_t next_packet_is_auth_tok_packet; | 1124 | size_t next_packet_is_auth_tok_packet; |
1125 | struct list_head auth_tok_list; | 1125 | struct list_head auth_tok_list; |
1126 | struct ecryptfs_auth_tok *matching_auth_tok = NULL; | 1126 | struct ecryptfs_auth_tok *matching_auth_tok; |
1127 | struct ecryptfs_auth_tok *candidate_auth_tok = NULL; | 1127 | struct ecryptfs_auth_tok *candidate_auth_tok; |
1128 | char *candidate_auth_tok_sig; | 1128 | char *candidate_auth_tok_sig; |
1129 | size_t packet_size; | 1129 | size_t packet_size; |
1130 | struct ecryptfs_auth_tok *new_auth_tok; | 1130 | struct ecryptfs_auth_tok *new_auth_tok; |