shared/crypto: Add bt_crypto_rsi
Luiz Augusto von Dentz
maintainerPATCH v2 1/6 shared/crypto: Add bt_crypto_rsi
From: Luiz Augusto von Dentz <[email protected]>
This adds bt_cryptor_rsi which can be used to generate a Resolvable Set Identifier as per CSIS spec:
--- src/shared/crypto.c | 39 +++++++++++++++++++++++++++++++++++++++ src/shared/crypto.h | 2 ++ 2 files changed, 41 insertions(+)
src/shared/crypto.c +39 -0
@@ -788,6 +788,45 @@ bool bt_crypto_sih(struct bt_crypto *crypto, const uint8_t k[16],return bt_crypto_ah (crypto, k, r, hash); } +/* +* The hash is generated by using the RSI hash function sih, with the input +* parameter k set to the device’s SIRK, and the input parameter r set to +* prand: +* +* hash = sih(SIRK, prand) +* +* The prand and hash are concatenated to generate the RSI +* resolvableSetIdentifier in the following manner: +* +* resolvableSetIdentifier = hash || prand +*/ +bool bt_crypto_rsi (struct bt_crypto *crypto,const uint8_t sirk[16 ], +uint8_t rsi[6 ]) +{ +uint8_t prand[3 ]; +uint8_t hash[3 ]; + +/* The random number prand shall meet the following requirements: +* +* - The two most significant bits (MSBs) of prand shall be equal to 0 +* - At least one bit of the random part of prand shall be 0. +* - At least one bit of the random part of prand shall be 1. +*/ +if (!bt_crypto_random_bytes (crypto, prand,3 )) +return false; + + prand[2 ] &=0x3f ; + prand[2 ] |=0x40 ; + +if (!bt_crypto_sih (crypto, sirk, prand, hash)) +return false; + +memcpy (rsi, hash,3 ); +memcpy (rsi +3 , prand,3 ); + +return true; +} +static bool aes_cmac_zero (struct bt_crypto *crypto,const uint8_t *msg,size_t msg_len,uint8_t res[16 ]) {
src/shared/crypto.h +2 -0
@@ -60,3 +60,5 @@ bool bt_crypto_sih(struct bt_crypto *crypto, const uint8_t k[16],bool bt_crypto_sirk (struct bt_crypto *crypto,const char *str,uint16_t vendor,uint16_t product,uint16_t version,uint16_t source,uint8_t sirk[16 ]); +bool bt_crypto_rsi (struct bt_crypto *crypto,const uint8_t sirk[16 ], +uint8_t rsi[6 ]);
Signature · 1 line
2.52.0
Luiz Augusto von Dentz
maintainerPATCH v2 2/6 advertising: Use bt_crypto_rsi to generate RSI
From: Luiz Augusto von Dentz <[email protected]>
This makes use of bt_crypto_rsi to generate a valid RSI.
--- src/advertising.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
src/advertising.c +1 -5
@@ -526,11 +526,7 @@ static bool set_rsi(struct btd_adv_client *client)if (!crypto)return false; - ret =bt_crypto_random_bytes (crypto, data +3 ,sizeof (data) -3 ); -if (!ret) - goto done; - - ret =bt_crypto_sih (crypto, btd_opts.csis.sirk, data +3 , data); + ret =bt_crypto_rsi (crypto, btd_opts.csis.sirk, data);if (!ret) goto done;
Signature · 1 line
2.52.0
Luiz Augusto von Dentz
maintainerPATCH v2 3/6 advtest: Use bt_crypto_rsi to generate RSI
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This makes use of bt_crypto_rsi to generate a valid RSI.
--- tools/advtest.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)
tools/advtest.c +2 -27
@@ -75,37 +75,13 @@ static size_t hex2bin(const char *hexstr, uint8_t *buf, size_t buflen)return len; } -static bool get_random_bytes (void *buf,size_t num_bytes) -{ -ssize_t len; -int fd; - - fd =open ("/dev/urandom" ,O_RDONLY ); -if (fd <0 ) -return false; - - len =read (fd, buf, num_bytes); - -close (fd); - -if (len <0 ) -return false; - -return true; -} -static void generate_rsi (char *val) { -uint8_t sirk[16 ], hash[3 ]; +uint8_t sirk[16 ];uint8_t rsi[6 ] = {0 };hex2bin (val, sirk,sizeof (sirk)); -get_random_bytes (&rsi[3 ],3 ); - - rsi[5 ] &=0x3f ;/* Clear 2 msb */ - rsi[5 ] |=0x40 ;/* Set 2nd msb */ - crypto =bt_crypto_new ();if (!crypto) {fprintf (stderr,"Failed to open crypto interface\n" );
@@ -113,8 +89,7 @@ static void generate_rsi(char *val)return ; } -bt_crypto_ah (crypto, sirk, rsi +3 , hash); -memcpy (rsi, hash,3 ); +bt_crypto_rsi (crypto, sirk, rsi);print_rpa (rsi); }
Signature · 1 line
2.52.0
Luiz Augusto von Dentz
maintainerPATCH v2 4/6 shared/ad: Make bt_ad_has_data return the data
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This makes bt_ad_has_data return the data found rather then true of false.
--- src/device.c | 2 +- src/shared/ad.c | 9 +++++---- src/shared/ad.h | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-)
src/device.c +1 -1
@@ -1616,7 +1616,7 @@ dev_property_advertising_data_exist(const GDBusPropertyTable *property, {struct btd_device *device = data; -return bt_ad_has_data (device->ad,NULL ); +return bt_ad_has_data (device->ad,NULL ) ? TRUE : FALSE; }static bool device_get_wake_support (struct btd_device *device)
src/shared/ad.c +5 -4
@@ -1229,6 +1229,9 @@ static bool data_match(const void *data, const void *user_data)const struct bt_ad_data *d1 = data;const struct bt_ad_data *d2 = user_data; +if (!d2) +return true; +if (d1->type != d2->type)return false;
@@ -1241,14 +1244,12 @@ static bool data_match(const void *data, const void *user_data)return !memcmp (d1->data, d2->data, d1->len); } -bool bt_ad_has_data (struct bt_ad *ad,const struct bt_ad_data *data) +struct bt_ad_data *bt_ad_has_data (struct bt_ad *ad, +const struct bt_ad_data *data) {if (!ad)return false; -if (!data) -return !queue_isempty (ad->data); -return queue_find (ad->data, data_match, data); }
src/shared/ad.h +2 -1
@@ -174,7 +174,8 @@ void bt_ad_clear_flags(struct bt_ad *ad);bool bt_ad_add_data (struct bt_ad *ad,uint8_t type,void *data,size_t len); -bool bt_ad_has_data (struct bt_ad *ad,const struct bt_ad_data *data); +struct bt_ad_data *bt_ad_has_data (struct bt_ad *ad, +const struct bt_ad_data *data);void bt_ad_foreach_data (struct bt_ad *ad,bt_ad_func_t func,void *user_data);
Signature · 1 line
2.52.0
Luiz Augusto von Dentz
maintainerPATCH v2 5/6 advertising: Fix not verifying if RSI set is valid
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
The hash portion of the RSI can be verified if it was set properly.
--- src/advertising.c | 69 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 8 deletions(-)
src/advertising.c +61 -8
@@ -506,11 +506,52 @@ static bool parse_service_data_sr(DBusMessageIter *iter,return parse_service_data (iter, client->scan); } +static bool validate_rsi (const uint8_t *data,uint8_t len) +{ +struct bt_crypto *crypto; +uint8_t zero[16 ] = {}; +uint8_t hash[3 ]; +bool ret; + +if (!data || len !=6 ) +return false; + +/* Check if a valid SIRK has been set */ +if (!memcmp (btd_opts.csis.sirk, zero,sizeof (zero))) +return false; + + crypto =bt_crypto_new (); +if (!crypto) +return false; + +/* Generate a hash using SIRK and prand as input */ + ret =bt_crypto_sih (crypto, btd_opts.csis.sirk, data +3 , hash); +if (!ret) + goto done; + +/* Check if hash matches */ + ret = !(memcmp (hash, data,3 )); +if (!ret) { +error ("RSI set invalid: hash mismatch" ); +printf ("Random: %02x%02x%02x\n" , data[3 ], data[4 ], data[5 ]); +printf ("Hash: %02x%02x%02x\n" , data[0 ], data[1 ], data[2 ]); +printf ("Match: %02x%02x%02x\n" , hash[0 ], hash[1 ], hash[2 ]); + goto done; + } + +DBG ("RSI validated" ); + +done: +bt_crypto_unref (crypto); +return ret; +} +static bool set_rsi (struct btd_adv_client *client) {struct bt_crypto *crypto;uint8_t zero[16 ] = {};struct bt_ad_data rsi = { .type =BT_AD_CSIP_RSI }; +struct bt_ad_data *ad;uint8_t data[6 ];bool ret;
@@ -518,23 +559,28 @@ static bool set_rsi(struct btd_adv_client *client)if (!memcmp (btd_opts.csis.sirk, zero,sizeof (zero)))return false; -/* Check if RSI needs to be set or data already contains RSI data */ -if (!client ||bt_ad_has_data (client->data, &rsi)) +if (!client)return true; +/* Check if RSI needs to be set or data already contains RSI data */ + ad =bt_ad_has_data (client->data, &rsi); +if (ad) { + ret =validate_rsi (ad->data, ad->len); +return ret; + } + crypto =bt_crypto_new ();if (!crypto)return false; ret =bt_crypto_rsi (crypto, btd_opts.csis.sirk, data); -if (!ret) - goto done; - ret =bt_ad_add_data (client->data,BT_AD_CSIP_RSI , data,sizeof (data)); - -done:bt_crypto_unref (crypto); -return ret; + +if (!ret) +return ret; + +return bt_ad_add_data (client->data,BT_AD_CSIP_RSI , data,sizeof (data)); } static struct adv_include {
@@ -753,6 +799,13 @@ static bool parse_data(DBusMessageIter *iter, struct bt_ad *ad)DBG ("Adding Data for type 0x%02x len %u" , type, len); +switch (type) { +case BT_AD_CSIP_RSI : +if (!validate_rsi (data, len)) + goto fail; +break ; + } +if (!bt_ad_add_data (ad, type, data, len)) goto fail;
Signature · 1 line
2.52.0
Luiz Augusto von Dentz
maintainerPATCH v2 6/6 advtest: Fix displaying RSI as a byte array rather then an address
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
RSI should be displayed as an address if the intention is to use big endian format.
--- src/advertising.c | 3 --- tools/advtest.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)
src/advertising.c +0 -3
@@ -533,9 +533,6 @@ static bool validate_rsi(const uint8_t *data, uint8_t len) ret = !(memcmp (hash, data,3 ));if (!ret) {error ("RSI set invalid: hash mismatch" ); -printf ("Random: %02x%02x%02x\n" , data[3 ], data[4 ], data[5 ]); -printf ("Hash: %02x%02x%02x\n" , data[0 ], data[1 ], data[2 ]); -printf ("Match: %02x%02x%02x\n" , hash[0 ], hash[1 ], hash[2 ]); goto done; }
tools/advtest.c +1 -1
@@ -53,7 +53,7 @@ static struct bt_hci *scan_dev;static void print_rpa (const uint8_t addr[6 ]) { -printf (" RSI:\t0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" , +printf (" RSI:\t%02x-%02x-%02x-%02x-%02x-%02x\n" , addr[5 ], addr[4 ], addr[3 ], addr[2 ], addr[1 ], addr[0 ]);printf (" Random: %02x%02x%02x\n" , addr[3 ], addr[4 ], addr[5 ]);
Signature · 1 line
2.52.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1043005
---Test result---
Test Summary:
CheckPatch PENDING 0.47 seconds GitLint PENDING 0.49 seconds BuildEll PASS 20.06 seconds BluezMake PASS 635.18 seconds MakeCheck PASS 18.44 seconds MakeDistcheck PASS 242.58 seconds CheckValgrind PASS 297.31 seconds CheckSmatch WARNING 353.44 seconds bluezmakeextell PASS 183.34 seconds IncrementalBuild PENDING 0.34 seconds ScanBuild PASS 1041.03 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:src/shared/crypto.c:271:21: warning: Variable length array is used.src/shared/crypto.c:272:23: warning: Variable length array is used.src/shared/crypto.c:271:21: warning: Variable length array is used.src/shared/crypto.c:272:23: warning: Variable length array is used.src/shared/crypto.c:271:21: warning: Variable length array is used.src/shared/crypto.c:272:23: warning: Variable length array is used.
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:
---
Regards,
Linux Bluetooth
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Thu, 15 Jan 2026 15:54:02 -0500 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
This adds
bt_cryptor_rsiwhich can be used to generate a Resolvable Set Identifier as per CSIS spec:[...]
Here is the summary with links:
- [BlueZ,v2,1/6] shared/crypto: Add bt_crypto_rsi
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=07bd0d60bcef - [BlueZ,v2,2/6] advertising: Use bt_crypto_rsi to generate RSI https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=4ab2161b5328 - [BlueZ,v2,3/6] advtest: Use bt_crypto_rsi to generate RSI https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=6d79d8a3a643 - [BlueZ,v2,4/6] shared/ad: Make bt_ad_has_data return the data https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=acc0a1d1c4eb - [BlueZ,v2,5/6] advertising: Fix not verifying if RSI set is valid https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=b9daa6718bdd - [BlueZ,v2,6/6] advtest: Fix displaying RSI as a byte array rather then an address https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=62fdc13ed2ef
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html