Commit 844d950b authored by Eric Biggers's avatar Eric Biggers Committed by Keith Busch
Browse files

nvme-auth: common: remove nvme_auth_digest_name() 



Since nvme_auth_digest_name() is no longer used, remove it and the
associated data from the hash_map array.

Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 16977e77

drivers/nvme/common/auth.c

+0 −12
Original line number Diff line number Diff line
@@ -89,22 +89,18 @@ EXPORT_SYMBOL_GPL(nvme_auth_dhgroup_id); 
static const struct nvme_dhchap_hash_map {

	int len;

	char hmac[15];

	char digest[8];

} hash_map[] = {

	[NVME_AUTH_HASH_SHA256] = {

		.len = 32,

		.hmac = "hmac(sha256)",

		.digest = "sha256",

	},

	[NVME_AUTH_HASH_SHA384] = {

		.len = 48,

		.hmac = "hmac(sha384)",

		.digest = "sha384",

	},

	[NVME_AUTH_HASH_SHA512] = {

		.len = 64,

		.hmac = "hmac(sha512)",

		.digest = "sha512",

	},

};
@@ -116,14 +112,6 @@ const char *nvme_auth_hmac_name(u8 hmac_id) 
}

EXPORT_SYMBOL_GPL(nvme_auth_hmac_name);



const char *nvme_auth_digest_name(u8 hmac_id)

{

	if (hmac_id >= ARRAY_SIZE(hash_map))

		return NULL;

	return hash_map[hmac_id].digest;

}

EXPORT_SYMBOL_GPL(nvme_auth_digest_name);



u8 nvme_auth_hmac_id(const char *hmac_name)

{

	int i;

include/linux/nvme-auth.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ const char *nvme_auth_dhgroup_kpp(u8 dhgroup_id); 
u8 nvme_auth_dhgroup_id(const char *dhgroup_name);



const char *nvme_auth_hmac_name(u8 hmac_id);

const char *nvme_auth_digest_name(u8 hmac_id);

size_t nvme_auth_hmac_hash_len(u8 hmac_id);

u8 nvme_auth_hmac_id(const char *hmac_name);

struct nvme_auth_hmac_ctx {