From patchwork Mon Mar 4 15:58:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= X-Patchwork-Id: 778375 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23D0647F64 for ; Mon, 4 Mar 2024 15:58:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709567930; cv=none; b=NAoyPeniRUO+aecNbrfwYi6vp8nKKoi4WU3huiBBOUyz09tazHVGUfsYYTk3g28pwEO94LieF3IG6Ovqrqh8dRaZGp4ib/4zPFHQsGC4hf5USJR3nVsv7sGJ4C21lYnI+/RlMbOOsRQxljok1bDC+QeRUSP0sdwURDTmycEznyw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709567930; c=relaxed/simple; bh=2TyzOGSAM6b2SP26c0bsFfwSU3qXY8n2ZLOwzqfQKNM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=oZJNYluH6PYmFbssybpvnRKl//WC2rOwpwPMaTCShM5OvKa4WeC1pWqB52AqFPlm0c5vKWGUP6wsQjJ0SVql+jUCLZrN2bR5k30fszpd/QTMwhTiCt4VWtbbtcNwF+9F3CUHxH1VGwNPl6znFqnK6ciEcfKMkrI3wruK0y1lnwc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=FnSTZst5; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="FnSTZst5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1709567926; bh=2TyzOGSAM6b2SP26c0bsFfwSU3qXY8n2ZLOwzqfQKNM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=FnSTZst5RvxIhtWSTs1rjrbjILPvBuJmpSSDPrO9euugkQKlZ2Ood3HNx9HdJIpfF 0AJvkHD3ddQxhgCu1pMCcz/le8KsmjxNZf4nDAdE8bYOjebxa/eAgFblQEPDDIXjNl prfqSqAUWnmDDquua2u+YYP2UF6/0epA7GimKI8wl40Nfko1kYZUorB+0dipc0FAna jlGmVwK43HbJH5VgdYXT3Mj6XpM1zVd4MSIqFE4/xADUzQ5S4jU6AksVntfNMf12OF Vempa4EgAFqfzxGmf/cz+XmzDl/YV/OSLVflACw0eDlK3AKKYKvCDwDtTTzp3832dA YLzZPecEUB+4w== Received: from fdanis-XPS-13-9370.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: fdanis) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 264CA37820CB for ; Mon, 4 Mar 2024 15:58:46 +0000 (UTC) From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= To: linux-bluetooth@vger.kernel.org Subject: [RESEND PATCH BlueZ v2 2/2] device: Update local and remote CSRK on management event Date: Mon, 4 Mar 2024 16:58:39 +0100 Message-Id: <20240304155839.48888-3-frederic.danis@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240304155839.48888-1-frederic.danis@collabora.com> References: <20240304155839.48888-1-frederic.danis@collabora.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently the local and remote CSRK keys are only loaded to device object from storage during start. Those keys are updated on MGMT_EV_NEW_CSRK event only in adapter object, but saved both in adapter and device objects. Those keys should be updated on management event to be able to perform signed write for GAP/SEC/CSIGN/BV-01-C and GAP/SEC/CSIGN/BV-02-C. This commits updates the keys on management event in the device object and move their storage to device object only. --- v1 -> v2: Move CSRK keys storage to device object only --- src/adapter.c | 77 +-------------------------------------------------- src/device.c | 48 ++++++++++++++++++++++++++++++++ src/device.h | 3 ++ 3 files changed, 52 insertions(+), 76 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index ef1e66e4b..4bcc464de 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -8785,75 +8785,6 @@ static void new_long_term_key_callback(uint16_t index, uint16_t length, bonding_complete(adapter, &addr->bdaddr, addr->type, 0); } -static void store_csrk(struct btd_adapter *adapter, const bdaddr_t *peer, - uint8_t bdaddr_type, const unsigned char *key, - uint32_t counter, uint8_t type) -{ - const char *group; - char device_addr[18]; - char filename[PATH_MAX]; - GKeyFile *key_file; - GError *gerr = NULL; - char key_str[33]; - gsize length = 0; - gboolean auth; - char *str; - int i; - - switch (type) { - case 0x00: - group = "LocalSignatureKey"; - auth = FALSE; - break; - case 0x01: - group = "RemoteSignatureKey"; - auth = FALSE; - break; - case 0x02: - group = "LocalSignatureKey"; - auth = TRUE; - break; - case 0x03: - group = "RemoteSignatureKey"; - auth = TRUE; - break; - default: - warn("Unsupported CSRK type %u", type); - return; - } - - ba2str(peer, device_addr); - - create_filename(filename, PATH_MAX, "/%s/%s/info", - btd_adapter_get_storage_dir(adapter), device_addr); - - key_file = g_key_file_new(); - if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) { - error("Unable to load key file from %s: (%s)", filename, - gerr->message); - g_clear_error(&gerr); - } - - for (i = 0; i < 16; i++) - sprintf(key_str + (i * 2), "%2.2X", key[i]); - - g_key_file_set_string(key_file, group, "Key", key_str); - g_key_file_set_integer(key_file, group, "Counter", counter); - g_key_file_set_boolean(key_file, group, "Authenticated", auth); - - create_file(filename, 0600); - - str = g_key_file_to_data(key_file, &length, NULL); - if (!g_file_set_contents(filename, str, length, &gerr)) { - error("Unable set contents for %s: (%s)", filename, - gerr->message); - g_error_free(gerr); - } - g_free(str); - - g_key_file_free(key_file); -} - static void new_csrk_callback(uint16_t index, uint16_t length, const void *param, void *user_data) { @@ -8881,13 +8812,7 @@ static void new_csrk_callback(uint16_t index, uint16_t length, return; } - if (!ev->store_hint) - return; - - store_csrk(adapter, &key->addr.bdaddr, key->addr.type, key->val, 0, - key->type); - - btd_device_set_temporary(device, false); + device_set_csrk(device, key->val, 0, key->type, ev->store_hint); } static void store_irk(struct btd_adapter *adapter, const bdaddr_t *peer, diff --git a/src/device.c b/src/device.c index e5191cabe..aecceb100 100644 --- a/src/device.c +++ b/src/device.c @@ -169,6 +169,7 @@ struct ltk_info { struct csrk_info { uint8_t key[16]; uint32_t counter; + bool auth; }; struct sirk_info { @@ -400,6 +401,7 @@ static void store_csrk(struct csrk_info *csrk, GKeyFile *key_file, g_key_file_set_string(key_file, group, "Key", key); g_key_file_set_integer(key_file, group, "Counter", csrk->counter); + g_key_file_set_boolean(key_file, group, "Authenticated", csrk->auth); } static void store_sirk(struct sirk_info *sirk, GKeyFile *key_file, @@ -1955,6 +1957,52 @@ bool btd_device_get_ltk(struct btd_device *device, uint8_t key[16], return true; } +void device_set_csrk(struct btd_device *device, const uint8_t val[16], + uint32_t counter, uint8_t type, + bool store_hint) +{ + struct csrk_info **handle; + struct csrk_info *csrk; + bool auth; + + switch (type) { + case 0x00: + handle = &device->local_csrk; + auth = FALSE; + break; + case 0x01: + handle = &device->remote_csrk; + auth = FALSE; + break; + case 0x02: + handle = &device->local_csrk; + auth = TRUE; + break; + case 0x03: + handle = &device->remote_csrk; + auth = TRUE; + break; + default: + warn("Unsupported CSRK type %u", type); + return; + } + + if (!*handle) + *handle = g_new0(struct csrk_info, 1); + + csrk = *handle; + memcpy(csrk->key, val, sizeof(csrk->key)); + csrk->counter = counter; + csrk->auth = auth; + + if (!store_hint) + return; + + store_device_info(device); + + btd_device_set_temporary(device, false); +} + static bool match_sirk(const void *data, const void *match_data) { const struct sirk_info *sirk = data; diff --git a/src/device.h b/src/device.h index 96f41d479..d4e70b7ef 100644 --- a/src/device.h +++ b/src/device.h @@ -135,6 +135,9 @@ void device_set_ltk(struct btd_device *device, const uint8_t val[16], bool central, uint8_t enc_size); bool btd_device_get_ltk(struct btd_device *device, uint8_t val[16], bool *central, uint8_t *enc_size); +void device_set_csrk(struct btd_device *device, const uint8_t val[16], + uint32_t counter, uint8_t type, + bool store_hint); bool btd_device_add_set(struct btd_device *device, bool encrypted, uint8_t sirk[16], uint8_t size, uint8_t rank); void device_store_svc_chng_ccc(struct btd_device *device, uint8_t bdaddr_type,