From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C3A5D58E7B for ; Mon, 2 Mar 2026 08:01:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+z8850V/hArx9RnUErCQOG+8JFXY/oWYFbqDbIaJRSg=; b=q0l5F9pKTZKqL6K0BeQ3fth7kS 4rey/9AXyW4+Vjy90O/2MiefTYTo2yYy5jk4cCHu3x2oAlFuPRZqojFS1IJ+6dWPqrD3k0dr9hUFC yCzUEPRAaAMOSQtZHlfeQpU/IbICJp44IxTOkLHIrHmlZp6AFVpr9gGlxHHXDGES0W10+xNypXA3k N1POPF1f/NtDmrZmO0PT5F1CeJdXSADjDzAeeptSEgkbhViettLBvvxA1bfAu0R7T1uai0XDCg/8q DGdRL0ocU3Ahw1WSPbnxTtW9u3vVBKLFb9kLXeuIUt38Lj1jMHTEpROQnPwxHTRvAfSqrOavW5jpO ACUGbZLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vwyDV-0000000CSay-1awW; Mon, 02 Mar 2026 08:01:25 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vwyDS-0000000CSYI-2aU2 for linux-nvme@lists.infradead.org; Mon, 02 Mar 2026 08:01:22 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 0699760131; Mon, 2 Mar 2026 08:01:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 804DDC2BCAF; Mon, 2 Mar 2026 08:01:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772438481; bh=+MgGltZuKruBJzReBKBPlONks/5vv3TFbWQGTFvSRBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BBr3Iw6KTkjVsnBQ9Jm7dDZ/wH0gbW8979lLCv8uEOcXMRP635RLiHaPsb8yhvsQ0 p7GCVQg2EYaEhshHTHRUrPhrD2GCQYVHnl/FStaMZIU55v6aFnxD7uT5rTtD//AZ6g cHBis7heIpSYzfiZbHqU2us0APDUV6Yy5T7Lev+mYcJLvG6v6so/P3vJ79qniN80Vl VcWeFUZv4WtHwkljxfjlcq8GAol+SzKPHMAxYLDiE4Tqf9mF4DwC2Svvbc2AHe6AaK OPtJxENXIHoNewuWYOcz1CW7uKlwclShzU9ZhgFJez5Z9ldwfFVffkeH72Zgnq6AV9 +DX74xNeaH12Q== From: Eric Biggers To: linux-nvme@lists.infradead.org, Chaitanya Kulkarni , Sagi Grimberg , Christoph Hellwig , Hannes Reinecke Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Ard Biesheuvel , "Jason A . Donenfeld" , Herbert Xu , Eric Biggers Subject: [PATCH 05/21] nvme-auth: rename nvme_auth_generate_key() to nvme_auth_parse_key() Date: Sun, 1 Mar 2026 23:59:43 -0800 Message-ID: <20260302075959.338638-6-ebiggers@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302075959.338638-1-ebiggers@kernel.org> References: <20260302075959.338638-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org This function does not generate a key. It parses the key from the string that the caller passes in. Signed-off-by: Eric Biggers --- drivers/nvme/common/auth.c | 4 ++-- drivers/nvme/host/auth.c | 7 +++---- drivers/nvme/host/sysfs.c | 4 ++-- include/linux/nvme-auth.h | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/nvme/common/auth.c b/drivers/nvme/common/auth.c index d35523d0a017b..2f83c9ddea5ec 100644 --- a/drivers/nvme/common/auth.c +++ b/drivers/nvme/common/auth.c @@ -434,11 +434,11 @@ int nvme_auth_gen_shared_secret(struct crypto_kpp *dh_tfm, kpp_request_free(req); return ret; } 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; if (!secret) { @@ -457,11 +457,11 @@ 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 * @hmac_id: Hash function identifier * @skey: Session key diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c index d0d0a9d5a8717..47a1525e876e0 100644 --- a/drivers/nvme/host/auth.c +++ b/drivers/nvme/host/auth.c @@ -1070,16 +1070,15 @@ int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl) mutex_init(&ctrl->dhchap_auth_mutex); 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; if (!ctrl->opts->dhchap_secret && !ctrl->opts->dhchap_ctrl_secret) return 0; diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c index 29430949ce2f0..e3b5c75d2ebb7 100644 --- a/drivers/nvme/host/sysfs.c +++ b/drivers/nvme/host/sysfs.c @@ -634,11 +634,11 @@ static ssize_t nvme_ctrl_dhchap_secret_store(struct device *dev, nvme_auth_stop(ctrl); if (strcmp(dhchap_secret, opts->dhchap_secret)) { 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; } kfree(opts->dhchap_secret); @@ -692,11 +692,11 @@ static ssize_t nvme_ctrl_dhchap_ctrl_secret_store(struct device *dev, nvme_auth_stop(ctrl); if (strcmp(dhchap_secret, opts->dhchap_ctrl_secret)) { 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; } kfree(opts->dhchap_ctrl_secret); diff --git a/include/linux/nvme-auth.h b/include/linux/nvme-auth.h index a4b248c24ccf6..02ca9a7162565 100644 --- a/include/linux/nvme-auth.h +++ b/include/linux/nvme-auth.h @@ -28,11 +28,11 @@ u32 nvme_auth_key_struct_size(u32 key_len); struct nvme_dhchap_key *nvme_auth_extract_key(const char *secret, u8 key_hash); 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); int nvme_auth_gen_pubkey(struct crypto_kpp *dh_tfm, u8 *host_key, size_t host_key_len); -- 2.53.0