linux: do not return w/o OpenSSL support enabled

igaw · igaw · commit 1144da55c034 · 2024-11-08T11:35:25.000+01:00
__nvme_import_keys_from_config is helper to import the TLS keys. When we
don't have OpenSSL builds enabled, this should be a no op. Thus don't
return an error in this case.

Signed-off-by: Daniel Wagner &lt;wagi@kernel.org&gt;
diff --git a/src/nvme/linux.c b/src/nvme/linux.c
@@ -1681,7 +1681,10 @@ long nvme_revoke_tls_key(const char *keyring, const char *key_type,
 int __nvme_import_keys_from_config(nvme_host_t h, nvme_ctrl_t c,
 				   long *keyring_id, long *key_id)
 {
-	return -ENOTSUP;
+	*keyring_id = 0;
+	*key_id = 0;
+
+	return 0;
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -1681,7 +1681,10 @@ long nvme_revoke_tls_key(const char keyring, const char key_type,`
`1681`	`1681`	`int __nvme_import_keys_from_config(nvme_host_t h, nvme_ctrl_t c,`
`1682`	`1682`	`long keyring_id, long key_id)`
`1683`	`1683`	`{`
`1684`		`- return -ENOTSUP;`
	`1684`	`+ *keyring_id = 0;`
	`1685`	`+ *key_id = 0;`
	`1686`	`+`
	`1687`	`+ return 0;`
`1685`	`1688`	`}`
`1686`	`1689`	`#endif`
`1687`	`1690`