Skip to content

Commit bedfebd

Browse files
martin-gpyigaw
authored andcommitted
fabrics: permit bi-auth with secure concat TLS
Turns out it is not just uni-auth that is supported with secure channel concat TLS but bi-auth as well. Earlier interpretation of the NVMe spec on this topic was wrong as discussed recently in the NVMe upstream mailing list at https://lore.kernel.org/linux-nvme/[email protected]/T/#t. So permit the same now in userspace. Fixes: 5fdc131 ("fabrics: add error if dhchap-ctrl-secret is specified with --concat") Signed-off-by: Martin George <[email protected]>
1 parent f4554ba commit bedfebd

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

libnvme/src/nvme/fabrics.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -726,11 +726,6 @@ static int build_options(nvme_host_t h, nvme_ctrl_t c, char **argstr)
726726
return -ENVME_CONNECT_INVAL;
727727
}
728728

729-
if (cfg->concat && ctrlkey) {
730-
nvme_msg(h->ctx, LOG_ERR, "cannot specify [--dhchap-ctrl-secret | -C] with --concat\n");
731-
return -ENVME_CONNECT_INVAL;
732-
}
733-
734729
if (cfg->tls) {
735730
ret = __nvme_import_keys_from_config(h, c,
736731
&keyring_id, &key_id);

0 commit comments

Comments
 (0)