Commit 1cf5cdf8 authored by Eric Biggers's avatar Eric Biggers
Browse files

libceph: Rename hmac_sha256() to ceph_hmac_sha256() 



Rename hmac_sha256() to ceph_hmac_sha256(), to avoid a naming conflict
with the upcoming hmac_sha256() library function.

This code will be able to use the HMAC-SHA256 library, but that's left
for a later commit.

Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250630160645.3198-2-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
parent 22375ada

net/ceph/messenger_v2.c

+6 −6
Original line number Diff line number Diff line
@@ -793,8 +793,8 @@ static int setup_crypto(struct ceph_connection *con, 
	return 0;  /* auth_x, secure mode */

}



static int hmac_sha256(struct ceph_connection *con, const struct kvec *kvecs,

		       int kvec_cnt, u8 *hmac)

static int ceph_hmac_sha256(struct ceph_connection *con,

			    const struct kvec *kvecs, int kvec_cnt, u8 *hmac)

{

	SHASH_DESC_ON_STACK(desc, con->v2.hmac_tfm);  /* tfm arg is ignored */

	int ret;
@@ -1462,8 +1462,8 @@ static int prepare_auth_signature(struct ceph_connection *con) 
	if (!buf)

		return -ENOMEM;



	ret = hmac_sha256(con, con->v2.in_sign_kvecs, con->v2.in_sign_kvec_cnt,

			  CTRL_BODY(buf));

	ret = ceph_hmac_sha256(con, con->v2.in_sign_kvecs,

			       con->v2.in_sign_kvec_cnt, CTRL_BODY(buf));

	if (ret)

		return ret;
@@ -2460,7 +2460,7 @@ static int process_auth_signature(struct ceph_connection *con, 
		return -EINVAL;

	}



	ret = hmac_sha256(con, con->v2.out_sign_kvecs,

	ret = ceph_hmac_sha256(con, con->v2.out_sign_kvecs,

			       con->v2.out_sign_kvec_cnt, hmac);

	if (ret)

		return ret;