Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions fabrics.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,11 @@ static int create_common_context(struct nvme_global_ctx *ctx,
if (err)
goto err;

err = nvmf_context_set_crypto(fctx, fa->hostkey, fa->ctrlkey,
fa->keyring, fa->tls_key, fa->tls_key_identity);
if (err)
goto err;

err = nvmf_context_set_persistent(fctx, persistent);
if (err)
goto err;
Expand Down
2 changes: 1 addition & 1 deletion libnvme/src/nvme/linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -1813,7 +1813,7 @@ int __nvme_import_keys_from_config(nvme_host_t h, nvme_ctrl_t c,
identity = nvme_ctrl_get_tls_key_identity(c);
if (identity) {
ret = nvme_lookup_key("psk", identity, &id);
if (ret) {
if (ret && !(ret == -ENOKEY || ret == -EKEYREVOKED)) {
nvme_msg(h->ctx, LOG_ERR,
"Failed to lookup key for identity %s, error %d\n",
identity, ret);
Expand Down