Skip to content

Commit 1a08580

Browse files
committed
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 51e6257 commit 1a08580

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
@@ -1337,10 +1337,10 @@ int nvme_scan_tls_keys(const char *keyring, nvme_scan_tls_keys_cb_t cb,
13371337
return ret;
13381338
}
13391339

1340-
static long __nvme_insert_tls_key_versioned(key_serial_t keyring_id, const char *key_type,
1341-
const char *hostnqn, const char *subsysnqn,
1342-
int version, int hmac,
1343-
unsigned char *configured_key, int key_len)
1340+
static long __nvme_insert_tls_key(key_serial_t keyring_id, const char *key_type,
1341+
const char *hostnqn, const char *subsysnqn,
1342+
int version, int hmac,
1343+
unsigned char *configured_key, int key_len)
13441344
{
13451345
_cleanup_free_ unsigned char *psk = NULL;
13461346
_cleanup_free_ char *identity = NULL;
@@ -1394,10 +1394,10 @@ long nvme_insert_tls_key_versioned(const char *keyring, const char *key_type,
13941394
ret = nvme_set_keyring(keyring_id);
13951395
if (ret < 0)
13961396
return 0;
1397-
return __nvme_insert_tls_key_versioned(keyring_id, key_type,
1398-
hostnqn, subsysnqn,
1399-
version, hmac,
1400-
configured_key, key_len);
1397+
return __nvme_insert_tls_key(keyring_id, key_type,
1398+
hostnqn, subsysnqn,
1399+
version, hmac,
1400+
configured_key, key_len);
14011401
}
14021402

14031403
long nvme_revoke_tls_key(const char *keyring, const char *key_type,
@@ -1440,10 +1440,10 @@ static long __nvme_import_tls_key(long keyring_id,
14401440
* configured key. Derive a new key and load the newly
14411441
* created key into the keystore.
14421442
*/
1443-
return __nvme_insert_tls_key_versioned(keyring_id, "psk",
1444-
hostnqn, subsysnqn,
1445-
version, hmac,
1446-
key_data, key_len);
1443+
return __nvme_insert_tls_key(keyring_id, "psk",
1444+
hostnqn, subsysnqn,
1445+
version, hmac,
1446+
key_data, key_len);
14471447
}
14481448

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

0 commit comments

Comments
 (0)