Skip to content

Commit 2d92c35

Browse files
committed
fabrics: do not attempt to import keys if tls is not enabled
There is no point in trying to import a key if the TLS option is not enabled. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 21f5e86 commit 2d92c35

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

src/nvme/fabrics.c

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -627,17 +627,19 @@ static int build_options(nvme_host_t h, nvme_ctrl_t c, char **argstr)
627627

628628
ctrlkey = nvme_ctrl_get_dhchap_key(c);
629629

630-
ret = __nvme_import_keys_from_config(h, c, &keyring_id, &key_id);
631-
if (ret) {
632-
errno = -ret;
633-
return -1;
634-
}
630+
if (cfg->tls) {
631+
ret = __nvme_import_keys_from_config(h, c, &keyring_id, &key_id);
632+
if (ret) {
633+
errno = -ret;
634+
return -1;
635+
}
635636

636-
if (key_id == 0) {
637-
if (cfg->tls_configured_key)
638-
key_id = cfg->tls_configured_key;
639-
else
640-
key_id = cfg->tls_key;
637+
if (key_id == 0) {
638+
if (cfg->tls_configured_key)
639+
key_id = cfg->tls_configured_key;
640+
else
641+
key_id = cfg->tls_key;
642+
}
641643
}
642644

643645
if (add_argument(r, argstr, transport, transport) ||

0 commit comments

Comments
 (0)