Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250630160645.3198-2-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>

+6 -6
+6 -6
net/ceph/messenger_v2.c
··· 793 793 return 0; /* auth_x, secure mode */ 794 794 } 795 795 796 - static int hmac_sha256(struct ceph_connection *con, const struct kvec *kvecs, 797 - int kvec_cnt, u8 *hmac) 796 + static int ceph_hmac_sha256(struct ceph_connection *con, 797 + const struct kvec *kvecs, int kvec_cnt, u8 *hmac) 798 798 { 799 799 SHASH_DESC_ON_STACK(desc, con->v2.hmac_tfm); /* tfm arg is ignored */ 800 800 int ret; ··· 1462 1462 if (!buf) 1463 1463 return -ENOMEM; 1464 1464 1465 - ret = hmac_sha256(con, con->v2.in_sign_kvecs, con->v2.in_sign_kvec_cnt, 1466 - CTRL_BODY(buf)); 1465 + ret = ceph_hmac_sha256(con, con->v2.in_sign_kvecs, 1466 + con->v2.in_sign_kvec_cnt, CTRL_BODY(buf)); 1467 1467 if (ret) 1468 1468 return ret; 1469 1469 ··· 2460 2460 return -EINVAL; 2461 2461 } 2462 2462 2463 - ret = hmac_sha256(con, con->v2.out_sign_kvecs, 2464 - con->v2.out_sign_kvec_cnt, hmac); 2463 + ret = ceph_hmac_sha256(con, con->v2.out_sign_kvecs, 2464 + con->v2.out_sign_kvec_cnt, hmac); 2465 2465 if (ret) 2466 2466 return ret; 2467 2467