From d57675fc67455faf7c68d4003a1ce884779e2c7c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 3 Apr 2023 10:17:38 +0200
Subject: Merging upstream version 2.4+really2.3.

This reverts commit f42531334c05b7f49ae43c0a27e347a487fb2667.
---
 Documentation/nvme-check-tls-key.txt | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

(limited to 'Documentation/nvme-check-tls-key.txt')

diff --git a/Documentation/nvme-check-tls-key.txt b/Documentation/nvme-check-tls-key.txt
index a676f04..9ef6679 100644
--- a/Documentation/nvme-check-tls-key.txt
+++ b/Documentation/nvme-check-tls-key.txt
@@ -8,42 +8,18 @@ nvme-check-tls-key - Check a generated NVMe TLS PSK
 SYNOPSIS
 --------
 [verse]
-'nvme check-tls-key' [--keyring=<name>  | -k <name> ]
-		     [--keytype=<type>  | -t <type> ]
-		     [--hostnqn=<nqn>   | -n <nqn>  ]
-		     [--subsysnqn=<nqn> | -c <nqn>  ]
-		     [--keydata=<key>   | -d <key>  ]
+'nvme check-tls-key' [--key=<key> ]
 
 DESCRIPTION
 -----------
 Checks if the key is a valid NVMe TLS PSK in the PSK interchange format
-'NVMeTLSkey-1:01:<base64-encoded data>:', and stores the derived 'retained'
-TLS key in the keyring if the subsystem NQN is specified.
+NVMeTLSkey-1:01:VRLbtnN9AQb2WXW3c9+wEf/DRLz0QuLdbYvEhwtdWwNf9LrZ:
+
 
 OPTIONS
 -------
--k <name>::
---keyring=<name>::
-	Name of the keyring into which the 'retained' TLS key should be
-	stored. Default is '.nvme'.
-
--t <type>::
---keytype=<type>::
-	Type of the key for resulting TLS key.
-	Default is 'psk'.
-
--n <nqn>::
---hostnqn=<nqn>::
-	Host NVMe Qualified Name (NQN) to be used to derive the
-	'retained' TLS key
-
--c <nqn>::
---subsysnqn=<nqn>::
-	Subsystem NVMe Qualified Name (NQN) to be used to derive the
-	'retained' TLS key
-
--d <key>::
---keydata=<key>::
+-k <key>::
+--key=<key>::
 	Key to be checked.
 
 EXAMPLES
-- 
cgit v1.2.3