Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libceph: uninline ceph_crypto_key_destroy()

Browse Source 
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Ilya Dryomov 2016-12-02 16:35:08 +01:00
parent 2b1e1a7cd0
commit 6db2304aab
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ceph/crypto.c
View File

@ -80,6 +80,14 @@ int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *inkey)
return 0; return 0;
} }
void ceph_crypto_key_destroy(struct ceph_crypto_key *key)
{
if (key) {
kfree(key->key);
key->key = NULL;
}
}
static struct crypto_skcipher *ceph_crypto_alloc_cipher(void) static struct crypto_skcipher *ceph_crypto_alloc_cipher(void)
{ {
return crypto_alloc_skcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC); return crypto_alloc_skcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);

9
net/ceph/crypto.h
View File

@ -14,19 +14,12 @@ struct ceph_crypto_key {
void *key; void *key;
}; };
static inline void ceph_crypto_key_destroy(struct ceph_crypto_key *key)
{
if (key) {
kfree(key->key);
key->key = NULL;
}
}
int ceph_crypto_key_clone(struct ceph_crypto_key *dst, int ceph_crypto_key_clone(struct ceph_crypto_key *dst,
const struct ceph_crypto_key *src); const struct ceph_crypto_key *src);
int ceph_crypto_key_encode(struct ceph_crypto_key *key, void **p, void *end); int ceph_crypto_key_encode(struct ceph_crypto_key *key, void **p, void *end);
int ceph_crypto_key_decode(struct ceph_crypto_key *key, void **p, void *end); int ceph_crypto_key_decode(struct ceph_crypto_key *key, void **p, void *end);
int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *in); int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *in);
void ceph_crypto_key_destroy(struct ceph_crypto_key *key);
/* crypto.c */ /* crypto.c */
int ceph_crypt(const struct ceph_crypto_key *key, bool encrypt, int ceph_crypt(const struct ceph_crypto_key *key, bool encrypt,