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 ED41BC47DDB for ; Sat, 27 Jan 2024 09:31:16 +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=bUWvYi9j//hPhGAWWlEXtVQdGvqnPoERBN2UD4Pwsvs=; b=1feacLLtHvLhoSGqn0Wy2q2yGP PeKNYRLhzASJpQJWJjJaAuRugxrhV39ZazxntN0q1WZ4RKV6rjbz9sCYZTijtftGSkrb9p2zsbhqf ne61w6GeTImwpWAT1nTtGqaBzzc7rbEGdePgbZlw9jrBeUfzk64bAynIdx0jHRvtQa5XQaZirGUjE uhRDG19NH+xVqtobM9TAWacXUIRDBJ9InVECro6DUH3V4jjds43NdCKkFHQwBX35UtWVZBdUC/THk bvIOcHCZdd9r1VVAKBKy7MTKcZGRTQ3vOWFqwpfjplqseh8KCzF6ifTYuZI52WY5NYk0EyOnPUad5 Dfao4MDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTf1w-00000007FUs-1YEJ; Sat, 27 Jan 2024 09:31:16 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTf1p-00000007FR5-0ugJ for linux-nvme@lists.infradead.org; Sat, 27 Jan 2024 09:31:11 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 6500DCE3857; Sat, 27 Jan 2024 09:31:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 392A3C433C7; Sat, 27 Jan 2024 09:31:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706347866; bh=WqePyrCsR2oaA8bf+Htsi2jBiM74zNRHOkRKrtVga5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UeuiLme0T+6Oj/Ff7U8Af2T/TtAdaD+f7BZuRZUOO8zKVK2chE/BFOxK1VNNWFocP b1FU3ZEybkjDZrwsh+vWWEjccjZKVlpEHxDwg0a9DV2ydwRTK68dUbA2dh036ZfTiL PymphMQd/KiBYoqQdk91gLzEffptQgKZIrtNJBiDAz72V+JxPi0sxvnrmnpvi0O2XM PJPeIeVzq6XLtGh7J8FI/u+4QaLmhDmw1t0YWU7UOgMUk3OKbKx6Ues+rB5ckxn1e1 byP2OaOYpY+tB9MXy3RRi4CliqrhhGT1kFRAt7nPr/SYxCJpFchnctmh5lzg88dHzt 1UjySituqOSeA== From: hare@kernel.org To: Christoph Hellwig Cc: Keith Busch , Sagi Grimberg , linux-nvme@lists.infradead.org, Hannes Reinecke Subject: [PATCH 02/13] nvme: add nvme_auth_generate_psk() Date: Sat, 27 Jan 2024 10:30:47 +0100 Message-Id: <20240127093058.15699-3-hare@kernel.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240127093058.15699-1-hare@kernel.org> References: <20240127093058.15699-1-hare@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240127_013109_636167_897CB791 X-CRM114-Status: GOOD ( 12.51 ) 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 From: Hannes Reinecke Add a function to generate a NVMe PSK from the shared credentials negotiated by DH-HMAC-CHAP. Signed-off-by: Hannes Reinecke --- drivers/nvme/common/auth.c | 76 ++++++++++++++++++++++++++++++++++++++ include/linux/nvme-auth.h | 2 + 2 files changed, 78 insertions(+) diff --git a/drivers/nvme/common/auth.c b/drivers/nvme/common/auth.c index a23ab5c968b9..9ee459a9400e 100644 --- a/drivers/nvme/common/auth.c +++ b/drivers/nvme/common/auth.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -471,4 +472,79 @@ int nvme_auth_generate_key(u8 *secret, struct nvme_dhchap_key **ret_key) } EXPORT_SYMBOL_GPL(nvme_auth_generate_key); +u8 *nvme_auth_generate_psk(u8 hmac_id, u8 *skey, size_t skey_len, + u8 *c1, u8 *c2, size_t hash_len, size_t *ret_len) +{ + struct crypto_shash *tfm; + struct shash_desc *shash; + u8 *psk; + const char *hmac_name; + int ret, psk_len; + + if (!c1 || !c2) { + pr_warn("%s: invalid parameter\n", __func__); + return ERR_PTR(-EINVAL); + } + + hmac_name = nvme_auth_hmac_name(hmac_id); + if (!hmac_name) { + pr_warn("%s: invalid hash algoritm %d\n", + __func__, hmac_id); + return ERR_PTR(-EINVAL); + } + + tfm = crypto_alloc_shash(hmac_name, 0, 0); + if (IS_ERR(tfm)) + return (u8 *)tfm; + + psk_len = crypto_shash_digestsize(tfm); + psk = kzalloc(psk_len, GFP_KERNEL); + if (!psk) { + ret = -ENOMEM; + goto out_free_tfm; + } + + shash = kmalloc(sizeof(struct shash_desc) + + crypto_shash_descsize(tfm), + GFP_KERNEL); + if (!shash) { + ret = -ENOMEM; + goto out_free_psk; + } + + shash->tfm = tfm; + ret = crypto_shash_setkey(tfm, skey, skey_len); + if (ret) + goto out_free_shash; + + ret = crypto_shash_init(shash); + if (ret) + goto out_free_shash; + + ret = crypto_shash_update(shash, c1, hash_len); + if (ret) + goto out_free_shash; + + ret = crypto_shash_update(shash, c2, hash_len); + if (ret) + goto out_free_shash; + + ret = crypto_shash_final(shash, psk); + if (!ret) + *ret_len = psk_len; + +out_free_shash: + kfree_sensitive(shash); +out_free_psk: + if (ret) { + kfree_sensitive(psk); + psk = NULL; + } +out_free_tfm: + crypto_free_shash(tfm); + + return ret ? ERR_PTR(ret) : psk; +} +EXPORT_SYMBOL_GPL(nvme_auth_generate_psk); + MODULE_LICENSE("GPL v2"); diff --git a/include/linux/nvme-auth.h b/include/linux/nvme-auth.h index c1d0bc5d9624..31dc1db2d4d6 100644 --- a/include/linux/nvme-auth.h +++ b/include/linux/nvme-auth.h @@ -40,5 +40,7 @@ int nvme_auth_gen_pubkey(struct crypto_kpp *dh_tfm, int nvme_auth_gen_shared_secret(struct crypto_kpp *dh_tfm, u8 *ctrl_key, size_t ctrl_key_len, u8 *sess_key, size_t sess_key_len); +u8 *nvme_auth_generate_psk(u8 hmac_id, u8 *skey, size_t skey_len, + u8 *c1, u8 *c2, size_t hash_len, size_t *ret_len); #endif /* _NVME_AUTH_H */ -- 2.35.3