michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Fix controller RPA calling into host with host-based crypto

Browse source 
In a combined build where bt_rand functions is implemented in the host
the RPA module should not use the bluetooth rand function since the RPA
module is common for host and controller.
Having the controller call the the host only to go through HCI back into
the controller would not be a good idea.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-01-30 00:02:25 +01:00 • committed by Carles Cufí
commit ac05ae3d25
1 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

45
subsys/bluetooth/common/rpa.c
View file

@ -14,20 +14,43 @@
#include <stddef.h> #include <stddef.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <sys/atomic.h>
#include <sys/util.h>
#include <sys/byteorder.h>
#include <debug/stack.h>
#include <tinycrypt/constants.h>
#include <tinycrypt/aes.h>
#include <tinycrypt/utils.h>
#include <tinycrypt/cmac_mode.h>
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_RPA) #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_RPA)
#define LOG_MODULE_NAME bt_rpa #define LOG_MODULE_NAME bt_rpa
#include "common/log.h" #include "common/log.h"
#include <bluetooth/crypto.h>
#if defined(CONFIG_BT_CTLR) && defined(CONFIG_BT_HOST_CRYPTO)
#include "../controller/util/util.h"
#include "../controller/hal/ecb.h"
#endif /* defined(CONFIG_BT_CTLR) && defined(CONFIG_BT_HOST_CRYPTO) */
#if defined(CONFIG_BT_PRIVACY) || defined(CONFIG_BT_CTLR_PRIVACY)
static int internal_rand(void *buf, size_t len)
{
/* Force using controller rand function. */
#if defined(CONFIG_BT_CTLR) && defined(CONFIG_BT_HOST_CRYPTO)
return util_rand(buf, len);
#else
return bt_rand(buf, len);
#endif
}
#endif /* defined(CONFIG_BT_PRIVACY) || defined(CONFIG_BT_CTLR_PRIVACY) */
static int internal_encrypt_le(const u8_t key[16], const u8_t plaintext[16],
u8_t enc_data[16])
{
/* Force using controller encrypt function if supported. */
#if defined(CONFIG_BT_CTLR) && defined(CONFIG_BT_HOST_CRYPTO) && \
defined(CONFIG_BT_CTLR_LE_ENC)
ecb_encrypt(key, plaintext, enc_data, NULL);
return 0;
#else
return bt_encrypt_le(key, plaintext, enc_data);
#endif
}
static int ah(const u8_t irk[16], const u8_t r[3], u8_t out[3]) static int ah(const u8_t irk[16], const u8_t r[3], u8_t out[3])
{ {
u8_t res[16]; u8_t res[16];
@ -40,7 +63,7 @@ static int ah(const u8_t irk[16], const u8_t r[3], u8_t out[3])
memcpy(res, r, 3); memcpy(res, r, 3);
(void)memset(res + 3, 0, 13); (void)memset(res + 3, 0, 13);
err = bt_encrypt_le(irk, res, res); err = internal_encrypt_le(irk, res, res);
if (err) { if (err) {
return err; return err;
} }
@ -78,7 +101,7 @@ int bt_rpa_create(const u8_t irk[16], bt_addr_t *rpa)
{ {
int err; int err;
err = bt_rand(rpa->val + 3, 3); err = internal_rand(rpa->val + 3, 3);
if (err) { if (err) {
return err; return err;
} }