From: Daniel Wagner <dwagner@suse.de>
Date: Thu, 24 Oct 2024 13:21:42 +0000 (+0200)
Subject: nvme: export tls keys honoring version and hmac
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dc5fec5b65a160733f08e97aae0d812a1fedd7ac;p=users%2Fsagi%2Fnvme-cli.git

nvme: export tls keys honoring version and hmac

Export the keys with the correct encoding scheme.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---

diff --git a/nvme.c b/nvme.c
index 5559a8b9..9ba59bdd 100644
--- a/nvme.c
+++ b/nvme.c
@@ -9411,11 +9411,18 @@ static void __scan_tls_key(long keyring_id, long key_id,
 	_cleanup_free_ const unsigned char *key_data = NULL;
 	_cleanup_free_ char *encoded_key = NULL;
 	int key_len;
+	int ver, hmac;
+	char type;
 
 	key_data = nvme_read_key(keyring_id, key_id, &key_len);
 	if (!key_data)
 		return;
-	encoded_key = nvme_export_tls_key(key_data, key_len);
+
+	if (sscanf(desc, "NVMe%01d%c%02d %*s", &ver, &type, &hmac) != 3)
+		return;
+
+	encoded_key = nvme_export_tls_key_versioned(ver, hmac,
+						    key_data, key_len);
 	if (!encoded_key)
 		return;
 	fprintf(fd, "%s %s\n", desc, encoded_key);