From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DEC3F2591 for ; Wed, 29 Mar 2023 13:59:57 +0000 (UTC) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id BE0541FDDF; Wed, 29 Mar 2023 13:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1680098389; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zIlKBCvZnnFSpLxdtSMe21cs7oxaIKNwHC0FhDvCxgM=; b=MQLgKsOXCRoKiYcE6kVujeEIuyQ6YPFEoOLFH5MOgFxgWLIChP25RkqFrq528gb/dmc8L/ 7wFEBoIaMT+kyGZugZNRgy6CDZj6hRym4+M7H+jkKWBC4bk+EHGkSqxt0yNGbAZGZwh3wn TPg9B66xJFakXsGfRtn6vPEf+Yq8/CU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1680098389; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zIlKBCvZnnFSpLxdtSMe21cs7oxaIKNwHC0FhDvCxgM=; b=Zpmyuse0XwYv4T/D0b9OEVKhfqTvSd1RXVdLCyvNhNln6gQ00wyd2dJLN1unPzLCIjjhGw Qp+Hhr9WBQ1Wi9Dg== Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id A94FA2C177; Wed, 29 Mar 2023 13:59:49 +0000 (UTC) Received: by adalid.arch.suse.de (Postfix, from userid 16045) id A340851BF380; Wed, 29 Mar 2023 15:59:49 +0200 (CEST) From: Hannes Reinecke To: Christoph Hellwig Cc: Sagi Grimberg , Keith Busch , linux-nvme@lists.infradead.org, Chuck Lever , kernel-tls-handshake@lists.linux.dev, Hannes Reinecke Subject: [PATCH 07/18] nvme-keyring: implement nvme_tls_psk_default() Date: Wed, 29 Mar 2023 15:59:27 +0200 Message-Id: <20230329135938.46905-8-hare@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230329135938.46905-1-hare@suse.de> References: <20230329135938.46905-1-hare@suse.de> Precedence: bulk X-Mailing-List: kernel-tls-handshake@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Implement a function to select the 'best' PSK for TLS. Signed-off-by: Hannes Reinecke --- drivers/nvme/common/keyring.c | 47 +++++++++++++++++++++++++++++++++++ include/linux/nvme-keyring.h | 2 ++ 2 files changed, 49 insertions(+) diff --git a/drivers/nvme/common/keyring.c b/drivers/nvme/common/keyring.c index 4ac33538f839..ca36a061bd48 100644 --- a/drivers/nvme/common/keyring.c +++ b/drivers/nvme/common/keyring.c @@ -103,6 +103,53 @@ struct key *nvme_tls_psk_lookup(struct key *keyring, } EXPORT_SYMBOL_GPL(nvme_tls_psk_lookup); +/* + * NVMe PSK priority list + * + * 'Retained' PSKs (ie 'generated == false') + * should be preferred to 'generated' PSKs, + * and SHA-384 should be preferred to SHA-256. + */ +struct nvme_psk_priority_list { + bool generated; + enum nvme_tcp_tls_cipher cipher; +} nvme_psk_prio[] = { + { .generated = false, + .cipher = NVME_TCP_TLS_CIPHER_SHA384, }, + { .generated = false, + .cipher = NVME_TCP_TLS_CIPHER_SHA256, }, + { .generated = true, + .cipher = NVME_TCP_TLS_CIPHER_SHA384, }, + { .generated = true, + .cipher = NVME_TCP_TLS_CIPHER_SHA256, }, +}; + +/* + * nvme_tls_psk_default - Return 'best' PSK to use for TLS ClientHello + */ +key_serial_t nvme_tls_psk_default(struct key *keyring, + const char *hostnqn, const char *subnqn) +{ + struct key *tls_key; + key_serial_t tls_key_id; + int prio; + + for (prio = 0; prio < ARRAY_SIZE(nvme_psk_prio); prio++) { + bool generated = nvme_psk_prio[prio].generated; + enum nvme_tcp_tls_cipher cipher = nvme_psk_prio[prio].cipher; + + tls_key = nvme_tls_psk_lookup(keyring, hostnqn, subnqn, + cipher, generated); + if (!IS_ERR(tls_key)) { + tls_key_id = tls_key->serial; + key_put(tls_key); + return tls_key_id; + } + } + return 0; +} +EXPORT_SYMBOL_GPL(nvme_tls_psk_default); + int nvme_keyring_init(void) { int err; diff --git a/include/linux/nvme-keyring.h b/include/linux/nvme-keyring.h index 5be60485ddfa..5293e0a90167 100644 --- a/include/linux/nvme-keyring.h +++ b/include/linux/nvme-keyring.h @@ -9,6 +9,8 @@ struct key *nvme_tls_psk_lookup(struct key *keyring, const char *hostnqn, const char *subnqn, int hmac, bool generated); +key_serial_t nvme_tls_psk_default(struct key *keyring, + const char *hostnqn, const char *subnqn); key_serial_t nvme_keyring_id(void); -- 2.35.3