[Bluez,62/62] android: Inclusive language in storing LTK

Message ID	20210813201256.Bluez.62.I33f4d8c79045f07d4ec17d084d973cf727485eda@changeid
State	New
Headers	show Return-Path: <linux-bluetooth-owner@kernel.org> Date: Fri, 13 Aug 2021 20:18:47 +0800 In-Reply-To: <20210813121848.3686029-1-apusaka@google.com> Message-Id: <20210813201256.Bluez.62.I33f4d8c79045f07d4ec17d084d973cf727485eda@changeid> Mime-Version: 1.0 References: <20210813121848.3686029-1-apusaka@google.com> Subject: [Bluez PATCH 62/62] android: Inclusive language in storing LTK From: Archie Pusaka <apusaka@google.com> To: linux-bluetooth <linux-bluetooth@vger.kernel.org>, Luiz Augusto von Dentz <luiz.dentz@gmail.com> Cc: CrosBT Upstreaming <chromeos-bluetooth-upstreaming@chromium.org>, Archie Pusaka <apusaka@chromium.org> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	Inclusive language changes \| expand [Bluez,00/62] Inclusive language changes [Bluez,01/62] lib: Inclusive language in HCI commands and events [Bluez,02/62] lib: Inclusive language in consts and strings [Bluez,03/62] tools/hciconfig: Inclusive language update [Bluez,04/62] core: Inclusive language for l2cap [Bluez,05/62] core: Inclusive language for rfcomm [Bluez,06/62] lib: Inclusive language for filtering devices [Bluez,07/62] lib/mgmt: Inclusive language for LTK [Bluez,08/62] doc/mgmt: Inclusive language update [Bluez,09/62] btio: Inclusive language changes [Bluez,10/62] shared/ad: Inclusive language changes [Bluez,11/62] shared/hfp: Inclusive language changes [Bluez,12/62] monitor: Inclusive language in struct member [Bluez,13/62] monitor: Inclusive language in SMP related things [Bluez,14/62] monitor: Inclusive language in LE states [Bluez,15/62] monitor: Inclusive language in LL feature [Bluez,16/62] monitor: Inclusive language in link key transaction [Bluez,17/62] monitor: Inclusive language in peripheral broadcast [Bluez,18/62] monitor: Inclusive language in peripheral page response timeout [Bluez,19/62] monitor: Inclusive language in consts and strings [Bluez,20/62] monitor: Inclusive language in filtering devices [Bluez,21/62] emulator: Inclusive language in naming [Bluez,22/62] emulator: Inclusive language in strings [Bluez,23/62] emulator: Inclusive language in filtering device [Bluez,24/62] tools: Inclusive language in referring the central address [Bluez,25/62] tools/parser/hci: Inclusive language changes [Bluez,26/62] tools/parser/smp: Inclusive language changes [Bluez,27/62] tools/3dsp: Inclusive language changes [Bluez,28/62] tools/mgmt-tester: Inclusive language changes [Bluez,29/62] tools/bdaddr: Inclusive language changes [Bluez,30/62] tools/hciconfig: Inclusive language changes [Bluez,31/62] tools/meshctl: Inclusive language changes [Bluez,32/62] tools/mgmt-tester: Inclusive language changes [Bluez,33/62] tools/parser: Inclusive language in struct member [Bluez,34/62] tools/parser/lmp: Inclusive language changes [Bluez,35/62] tools/parser/avdtp: Inclusive language changes [Bluez,36/62] tools/parser/csr: Inclusive language changes [Bluez,37/62] tools/btpclientctl: Inclusive language changes [Bluez,38/62] tools/l2cap-tester: Inclusive language changes [Bluez,39/62] tools/hci-tester: Inclusive language changes [Bluez,40/62] tools/btiotest: Inclusive language changes [Bluez,41/62] tools/hcitool: Inclusive language changes, central peripheral [Bluez,42/62] tools/hcitool: Inclusive language changes, accept list [Bluez,43/62] tools/l2test: Inclusive language changes [Bluez,44/62] tools/rctest: Inclusive language changes [Bluez,45/62] tools/rfcomm: Inclusive language changes [Bluez,46/62] plugins/sixaxis: Inclusive language changes [Bluez,47/62] profiles/audio: Inclusive language changes [Bluez,48/62] profiles/health: Inclusive language changes [Bluez,49/62] sdp: Inclusive language changes [Bluez,50/62] adapter: Inclusive language for central and peripheral [Bluez,51/62] adapter: Inclusive language for storing LTK [Bluez,52/62] adapter: Inclusive language for device filtering [Bluez,53/62] client: Inclusive language changes [Bluez,54/62] mesh: Inclusive language changes [Bluez,55/62] tools/mesh: Inclusive language changes [Bluez,56/62] tools/mesh-gatt: Inclusive language changes [Bluez,57/62] unit/mesh: Inclusive language changes [Bluez,58/62] doc/mesh: Inclusive language changes [Bluez,59/62] android: Inclusive language for volume control [Bluez,60/62] android: Inclusive language for describing relation [Bluez,61/62] android: Inclusive language for filtering devices [Bluez,62/62] android: Inclusive language in storing LTK

Message ID

20210813201256.Bluez.62.I33f4d8c79045f07d4ec17d084d973cf727485eda@changeid

State

New

Headers

Date: Fri, 13 Aug 2021 20:18:47 +0800
In-Reply-To: <20210813121848.3686029-1-apusaka@google.com>
Message-Id: <20210813201256.Bluez.62.I33f4d8c79045f07d4ec17d084d973cf727485eda@changeid>
Mime-Version: 1.0
References: <20210813121848.3686029-1-apusaka@google.com>
Subject: [Bluez PATCH 62/62] android: Inclusive language in storing LTK
From: Archie Pusaka <apusaka@google.com>
To: linux-bluetooth <linux-bluetooth@vger.kernel.org>,
	Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: CrosBT Upstreaming <chromeos-bluetooth-upstreaming@chromium.org>,
	Archie Pusaka <apusaka@chromium.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Series

Inclusive language changes | expand

Commit Message

Archie Pusaka Aug. 13, 2021, 12:18 p.m. UTC

From: Archie Pusaka <apusaka@chromium.org>

"peripheral" is preferred, as reflected in the BT core spec v5.3.
---

 android/bluetooth.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/android/bluetooth.c b/android/bluetooth.c
index 611b717379..bf26a307b5 100644
--- a/android/bluetooth.c
+++ b/android/bluetooth.c
@@ -2218,11 +2218,12 @@  static void store_ltk(const bdaddr_t *dst, uint8_t bdaddr_type, bool central,
 
 	ba2str(dst, addr);
 
-	key_s = central ? "LongTermKey" : "SlaveLongTermKey";
-	keytype_s = central ? "LongTermKeyType" : "SlaveLongTermKeyType";
-	encsize_s = central ? "LongTermKeyEncSize" : "SlaveLongTermKeyEncSize";
-	ediv_s = central ? "LongTermKeyEDiv" : "SlaveLongTermKeyEDiv";
-	rand_s = central ? "LongTermKeyRand" : "SlaveLongTermKeyRand";
+	key_s = central ? "LongTermKey" : "PeripheralLongTermKey";
+	keytype_s = central ? "LongTermKeyType" : "PeripheralLongTermKeyType";
+	encsize_s = central ?
+			"LongTermKeyEncSize" : "PeripheralLongTermKeyEncSize";
+	ediv_s = central ? "LongTermKeyEDiv" : "PeripheralLongTermKeyEDiv";
+	rand_s = central ? "LongTermKeyRand" : "PeripheralLongTermKeyRand";
 
 	for (i = 0; i < 16; i++)
 		sprintf(key_str + (i * 2), "%2.2X", key[i]);
@@ -3066,11 +3067,12 @@  static struct mgmt_ltk_info *get_ltk_info(GKeyFile *key_file, const char *peer,
 	char *key;
 	unsigned int i;
 
-	key_s = central ? "LongTermKey" : "SlaveLongTermKey";
-	keytype_s = central ? "LongTermKeyType" : "SlaveLongTermKeyType";
-	encsize_s = central ? "LongTermKeyEncSize" : "SlaveLongTermKeyEncSize";
-	ediv_s = central ? "LongTermKeyEDiv" : "SlaveLongTermKeyEDiv";
-	rand_s = central ? "LongTermKeyRand" : "SlaveLongTermKeyRand";
+	key_s = central ? "LongTermKey" : "PeripheralLongTermKey";
+	keytype_s = central ? "LongTermKeyType" : "PeripheralLongTermKeyType";
+	encsize_s = central ?
+			"LongTermKeyEncSize" : "PeripheralLongTermKeyEncSize";
+	ediv_s = central ? "LongTermKeyEDiv" : "PeripheralLongTermKeyEDiv";
+	rand_s = central ? "LongTermKeyRand" : "PeripheralLongTermKeyRand";
 
 	key = g_key_file_get_string(key_file, peer, key_s, NULL);
 	if (!key || strlen(key) != 32)

[Bluez,62/62] android: Inclusive language in storing LTK

Commit Message

Patch