]> www.infradead.org Git - users/sagi/libnvme.git/commitdiff
json: dump TLS key data in PSK interchange format
authorHannes Reinecke <hare@suse.de>
Wed, 28 Feb 2024 07:43:45 +0000 (08:43 +0100)
committerDaniel Wagner <wagi@monom.org>
Thu, 7 Mar 2024 13:49:46 +0000 (14:49 +0100)
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>
src/nvme/json.c

index ec811e5d2b3e16822e66b6052d93bfdcc43759d8..c8aa09f2bfe7aa86a87c51cf9b608ab4705f2f43 100644 (file)
@@ -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",