From: Hannes Reinecke <hare@suse.de>
Date: Wed, 28 Feb 2024 07:43:45 +0000 (+0100)
Subject: json: dump TLS key data in PSK interchange format
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=774b0343f97cbc9db644ff4ae5542979bc5fc8ba;p=users%2Fsagi%2Flibnvme.git

json: dump TLS key data in PSK interchange format

Dump the TLS key data in PSK interchange format, too, to be consistent
with all other functions.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/src/nvme/json.c b/src/nvme/json.c
index ec811e5d..c8aa09f2 100644
--- a/src/nvme/json.c
+++ b/src/nvme/json.c
@@ -554,7 +554,13 @@ static void json_dump_ctrl(struct json_object *ctrl_array, nvme_ctrl_t c)
 	JSON_BOOL_OPTION(cfg, ctrl_obj, disable_sqflow);
 	JSON_BOOL_OPTION(cfg, ctrl_obj, hdr_digest);
 	JSON_BOOL_OPTION(cfg, ctrl_obj, data_digest);
-	JSON_BOOL_OPTION(cfg, ctrl_obj, tls);
+	if (!strcmp(transport, "tcp")) {
+		JSON_BOOL_OPTION(cfg, ctrl_obj, tls);
+
+		if (cfg->tls_key)
+			json_export_nvme_tls_key(cfg->keyring, cfg->tls_key,
+						 ctrl_obj);
+	}
 	JSON_BOOL_OPTION(cfg, ctrl_obj, concat);
 	if (nvme_ctrl_is_persistent(c))
 		json_object_object_add(ctrl_obj, "persistent",