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

Commit 6db2304a authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: uninline ceph_crypto_key_destroy() 



Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarSage Weil <sage@redhat.com>
parent 2b1e1a7c

net/ceph/crypto.c

+8 −0
Original line number Diff line number Diff line
@@ -80,6 +80,14 @@ int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *inkey) 
	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)

{

	return crypto_alloc_skcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);

net/ceph/crypto.h

+1 −8
Original line number Diff line number Diff line
@@ -14,19 +14,12 @@ struct ceph_crypto_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,

			  const struct ceph_crypto_key *src);

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_unarmor(struct ceph_crypto_key *key, const char *in);

void ceph_crypto_key_destroy(struct ceph_crypto_key *key);



/* crypto.c */

int ceph_crypt(const struct ceph_crypto_key *key, bool encrypt,