nvme-auth: rename nvme_auth_generate_key() to nvme_auth_parse_key()

This function does not generate a key.  It parses the key from the
string that the caller passes in.

Acked-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/common/auth.c b/drivers/nvme/common/auth.c
index d35523d0a017bad28b07c85cd6d0adab00a4b8cb..2f83c9ddea5ec687d34c6be3edc632072e44d5e7 100644 (file)
--- a/drivers/nvme/common/auth.c
+++ b/drivers/nvme/common/auth.c
@@ -436,7 +436,7 @@ int nvme_auth_gen_shared_secret(struct crypto_kpp *dh_tfm,
 }
 EXPORT_SYMBOL_GPL(nvme_auth_gen_shared_secret);
 
-int nvme_auth_generate_key(const char *secret, struct nvme_dhchap_key **ret_key)
+int nvme_auth_parse_key(const char *secret, struct nvme_dhchap_key **ret_key)
 {
        struct nvme_dhchap_key *key;
        u8 key_hash;
@@ -459,7 +459,7 @@ int nvme_auth_generate_key(const char *secret, struct nvme_dhchap_key **ret_key)
        *ret_key = key;
        return 0;
 }
-EXPORT_SYMBOL_GPL(nvme_auth_generate_key);
+EXPORT_SYMBOL_GPL(nvme_auth_parse_key);
 
 /**
  * nvme_auth_generate_psk - Generate a PSK for TLS

diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
index d0d0a9d5a8717b6e69f1acd625d516b9a2981b37..47a1525e876e0ae70c28b56127a6f0becf439576 100644 (file)
--- a/drivers/nvme/host/auth.c
+++ b/drivers/nvme/host/auth.c
@@ -1072,12 +1072,11 @@ int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl)
        INIT_WORK(&ctrl->dhchap_auth_work, nvme_ctrl_auth_work);
        if (!ctrl->opts)
                return 0;
-       ret = nvme_auth_generate_key(ctrl->opts->dhchap_secret,
-                       &ctrl->host_key);
+       ret = nvme_auth_parse_key(ctrl->opts->dhchap_secret, &ctrl->host_key);
        if (ret)
                return ret;
-       ret = nvme_auth_generate_key(ctrl->opts->dhchap_ctrl_secret,
-                       &ctrl->ctrl_key);
+       ret = nvme_auth_parse_key(ctrl->opts->dhchap_ctrl_secret,
+                                 &ctrl->ctrl_key);
        if (ret)
                goto err_free_dhchap_secret;
 

diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c
index 16c6fea4b2db6306a6982aec8598f8a450941d4e..45422d4274de4e84b58a72ff98ec33075f86b883 100644 (file)
--- a/drivers/nvme/host/sysfs.c
+++ b/drivers/nvme/host/sysfs.c
@@ -658,7 +658,7 @@ static ssize_t nvme_ctrl_dhchap_secret_store(struct device *dev,
                struct nvme_dhchap_key *key, *host_key;
                int ret;
 
-               ret = nvme_auth_generate_key(dhchap_secret, &key);
+               ret = nvme_auth_parse_key(dhchap_secret, &key);
                if (ret) {
                        kfree(dhchap_secret);
                        return ret;
@@ -716,7 +716,7 @@ static ssize_t nvme_ctrl_dhchap_ctrl_secret_store(struct device *dev,
                struct nvme_dhchap_key *key, *ctrl_key;
                int ret;
 
-               ret = nvme_auth_generate_key(dhchap_secret, &key);
+               ret = nvme_auth_parse_key(dhchap_secret, &key);
                if (ret) {
                        kfree(dhchap_secret);
                        return ret;

diff --git a/include/linux/nvme-auth.h b/include/linux/nvme-auth.h
index a4b248c24ccf68bc1a8a829452d21560604f4ae1..02ca9a716256512a9e66e1f2e6fd0799732b3523 100644 (file)
--- a/include/linux/nvme-auth.h
+++ b/include/linux/nvme-auth.h
@@ -30,7 +30,7 @@ void nvme_auth_free_key(struct nvme_dhchap_key *key);
 struct nvme_dhchap_key *nvme_auth_alloc_key(u32 len, u8 hash);
 struct nvme_dhchap_key *nvme_auth_transform_key(
                const struct nvme_dhchap_key *key, const char *nqn);
-int nvme_auth_generate_key(const char *secret, struct nvme_dhchap_key **ret_key);
+int nvme_auth_parse_key(const char *secret, struct nvme_dhchap_key **ret_key);
 int nvme_auth_augmented_challenge(u8 hmac_id, const u8 *skey, size_t skey_len,
                                  const u8 *challenge, u8 *aug, size_t hlen);
 int nvme_auth_gen_privkey(struct crypto_kpp *dh_tfm, u8 dh_gid);