diff options
| author | Archie Pusaka <apusaka@chromium.org> | 2021-11-03 17:02:55 +0800 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2021-11-03 17:35:45 -0700 |
| commit | 8d502bb4f8cf3b9b7300c5195ce5a72c5bc0fd7d (patch) | |
| tree | 84de0ccb41b9fb0af3365e78b7361e0f95d71b70 /src/adapter.c | |
| parent | 7b5a4abea2870b68f2d8a82ae38b34834cf6da70 (diff) | |
| download | bluez-8d502bb4f8cf3b9b7300c5195ce5a72c5bc0fd7d.tar.gz | |
adapter: Remove "Master" entry from LTK storage
The entry has been deprecated since 2014 and it's time to remove them
altogether.
Diffstat (limited to 'src/adapter.c')
| -rw-r--r-- | src/adapter.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/adapter.c b/src/adapter.c index 114ae84c1..508917e58 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -3779,8 +3779,6 @@ static struct smp_ltk_info *get_ltk(GKeyFile *key_file, const char *peer, uint8_t peer_type, const char *group) { struct smp_ltk_info *ltk = NULL; - GError *gerr = NULL; - bool central; char *key; char *rand = NULL; @@ -3836,12 +3834,6 @@ 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); - if (gerr) - g_error_free(gerr); - else - ltk->central = central; - ltk->is_blocked = is_blocked_key(HCI_BLOCKED_KEY_TYPE_LTK, ltk->val); @@ -5907,7 +5899,6 @@ 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", "EncSize", enc_size); g_key_file_set_integer(key_file, "LongTermKey", "EDiv", ediv); @@ -8448,9 +8439,6 @@ static void store_ltk_group(struct btd_adapter *adapter, const bdaddr_t *peer, g_error_free(gerr); } - /* Old files may contain this so remove it in case it exists */ - g_key_file_remove_key(key_file, "LongTermKey", "Master", NULL); - for (i = 0; i < 16; i++) sprintf(key_str + (i * 2), "%2.2X", key[i]); |