Skip to content

Commit 97c4170

Browse files
hreineckeigaw
authored andcommitted
linux: rename __nvme_insert_tls_key_versioned() to __nvme_insert_tls_key()
Rename to shorten the function name for better readability. Signed-off-by: Hannes Reinecke <[email protected]>
1 parent 48f5d07 commit 97c4170

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

src/nvme/linux.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,10 +1344,10 @@ int nvme_scan_tls_keys(const char *keyring, nvme_scan_tls_keys_cb_t cb,
13441344
return ret;
13451345
}
13461346

1347-
static long __nvme_insert_tls_key_versioned(key_serial_t keyring_id, const char *key_type,
1348-
const char *hostnqn, const char *subsysnqn,
1349-
int version, int hmac,
1350-
unsigned char *configured_key, int key_len)
1347+
static long __nvme_insert_tls_key(key_serial_t keyring_id, const char *key_type,
1348+
const char *hostnqn, const char *subsysnqn,
1349+
int version, int hmac,
1350+
unsigned char *configured_key, int key_len)
13511351
{
13521352
_cleanup_free_ unsigned char *psk = NULL;
13531353
_cleanup_free_ char *identity = NULL;
@@ -1401,10 +1401,10 @@ long nvme_insert_tls_key_versioned(const char *keyring, const char *key_type,
14011401
ret = nvme_set_keyring(keyring_id);
14021402
if (ret < 0)
14031403
return 0;
1404-
return __nvme_insert_tls_key_versioned(keyring_id, key_type,
1405-
hostnqn, subsysnqn,
1406-
version, hmac,
1407-
configured_key, key_len);
1404+
return __nvme_insert_tls_key(keyring_id, key_type,
1405+
hostnqn, subsysnqn,
1406+
version, hmac,
1407+
configured_key, key_len);
14081408
}
14091409

14101410
long nvme_revoke_tls_key(const char *keyring, const char *key_type,
@@ -1447,10 +1447,10 @@ static long __nvme_import_tls_key(long keyring_id,
14471447
* configured key. Derive a new key and load the newly
14481448
* created key into the keystore.
14491449
*/
1450-
return __nvme_insert_tls_key_versioned(keyring_id, "psk",
1451-
hostnqn, subsysnqn,
1452-
version, hmac,
1453-
key_data, key_len);
1450+
return __nvme_insert_tls_key(keyring_id, "psk",
1451+
hostnqn, subsysnqn,
1452+
version, hmac,
1453+
key_data, key_len);
14541454
}
14551455

14561456
return nvme_update_key(keyring_id, "psk", identity,

0 commit comments

Comments
 (0)