[Bluez PATCH v2 13/13] adapter: Inclusive language for storing LTK
From: Archie Pusaka <hidden>
Date: 2021-09-02 04:08:32
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Archie Pusaka <redacted> BT core spec 5.3 promotes the usage of inclusive languages. This CL replaces some terms with the more appropriate counterparts, such as "central" and "peripheral" --- (no changes since v1) doc/settings-storage.txt | 4 ++-- src/adapter.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/settings-storage.txt b/doc/settings-storage.txt
index 1d96cd66d9..3c637c3521 100644
--- a/doc/settings-storage.txt
+++ b/doc/settings-storage.txt@@ -314,9 +314,9 @@ Long term key) related to a remote device. Rand Integer Randomizer -[SlaveLongTermKey] group contains: +[PeripheralLongTermKey] group contains: - Same as the [LongTermKey] group, except for slave keys. + Same as the [LongTermKey] group, except for peripheral keys. [ConnectionParameters] group contains:
diff --git a/src/adapter.c b/src/adapter.c
index 4ad53a3a24..8528e2b6e0 100644
--- a/src/adapter.c
+++ b/src/adapter.c@@ -3745,7 +3745,7 @@ static struct smp_ltk_info *get_ltk(GKeyFile *key_file, const char *peer, NULL); ltk->ediv = g_key_file_get_integer(key_file, group, "EDiv", NULL); - central = g_key_file_get_boolean(key_file, group, "Master", &gerr); + central = g_key_file_get_boolean(key_file, group, "Central", &gerr); if (gerr) g_error_free(gerr); else
@@ -3777,7 +3777,7 @@ static struct smp_ltk_info *get_peripheral_ltk_info(GKeyFile *key_file, DBG("%s", peer); - ltk = get_ltk(key_file, peer, bdaddr_type, "SlaveLongTermKey"); + ltk = get_ltk(key_file, peer, bdaddr_type, "PeripheralLongTermKey"); if (ltk) ltk->central = false;
@@ -5780,7 +5780,7 @@ static void convert_ltk_entry(GKeyFile *key_file, void *value) g_free(str); g_key_file_set_integer(key_file, "LongTermKey", "Authenticated", auth); - g_key_file_set_integer(key_file, "LongTermKey", "Master", central); + g_key_file_set_integer(key_file, "LongTermKey", "Central", central); g_key_file_set_integer(key_file, "LongTermKey", "EncSize", enc_size); g_key_file_set_integer(key_file, "LongTermKey", "EDiv", ediv);
@@ -8211,7 +8211,7 @@ static void store_longtermkey(struct btd_adapter *adapter, const bdaddr_t *peer, uint8_t enc_size, uint16_t ediv, uint64_t rand) { - const char *group = central ? "LongTermKey" : "SlaveLongTermKey"; + const char *group = central ? "LongTermKey" : "PeripheralLongTermKey"; char device_addr[18]; char filename[PATH_MAX]; GKeyFile *key_file;
@@ -8233,7 +8233,7 @@ static void store_longtermkey(struct btd_adapter *adapter, const bdaddr_t *peer, g_key_file_load_from_file(key_file, filename, 0, NULL); /* Old files may contain this so remove it in case it exists */ - g_key_file_remove_key(key_file, "LongTermKey", "Master", NULL); + g_key_file_remove_key(key_file, "LongTermKey", "Central", NULL); for (i = 0; i < 16; i++) sprintf(key_str + (i * 2), "%2.2X", key[i]);
--
2.33.0.259.gc128427fd7-goog