espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-06-05 21:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nimble/sync_afr_v4.2_to_nimble-1.2.0-idf' into 'nimble-1.2.0-idf-v4.2-afr'

Browse Source 
NimBLE AFR: Update AFR specific branch with latest changes in nimble-1.2.0-idf

See merge request espressif/esp-nimble!92
This commit is contained in:
Rahul Tank
2021-07-09 06:24:39 +00:00
parent eb1e9dacd2 6b3050582b
commit 64a115f728
9 changed files with 730 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/mesh/src/glue.c
+3
View File
@@ -133,13 +133,16 @@ bt_encrypt_be(const uint8_t *key, const uint8_t *plaintext, uint8_t *enc_data)
mbedtls_aes_init(&s);
if (mbedtls_aes_setkey_enc(&s, key, 128) != 0) {
mbedtls_aes_free(&s);
return BLE_HS_EUNKNOWN;
}
if (mbedtls_aes_crypt_ecb(&s, MBEDTLS_AES_ENCRYPT, plaintext, enc_data) != 0) {
mbedtls_aes_free(&s);
return BLE_HS_EUNKNOWN;
}
mbedtls_aes_free(&s);
return 0;
}
nimble/host/src/ble_gap.c
+3 -3
View File
@@ -907,7 +907,7 @@ ble_gap_master_ticks_until_exp(void)
return 0;
}
#if !MYNEWT_VAL(BLE_EXT_ADV)
#if NIMBLE_BLE_ADVERTISE && !MYNEWT_VAL(BLE_EXT_ADV)
static uint32_t
ble_gap_slave_ticks_until_exp(void)
{
@@ -1801,7 +1801,7 @@ ble_gap_master_timer(void)
return BLE_HS_FOREVER;
}
#if !MYNEWT_VAL(BLE_EXT_ADV)
#if NIMBLE_BLE_ADVERTISE && !MYNEWT_VAL(BLE_EXT_ADV)
static int32_t
ble_gap_slave_timer(void)
{
@@ -1900,7 +1900,7 @@ ble_gap_timer(void)
min_ticks = min(master_ticks, update_ticks);
#if !MYNEWT_VAL(BLE_EXT_ADV)
#if NIMBLE_BLE_ADVERTISE && !MYNEWT_VAL(BLE_EXT_ADV)
min_ticks = min(min_ticks, ble_gap_slave_timer());
#endif
nimble/host/src/ble_hs_resolv.c
+1 -1
View File
@@ -96,7 +96,7 @@ ble_rpa_remove_peer_dev_rec(struct ble_hs_dev_records *p_dev_rec)
ble_store_num_peer_dev_rec--;
if ((i != ble_store_num_peer_dev_rec) && (ble_store_num_peer_dev_rec != 0)) {
memmove(&peer_dev_rec[i], &peer_dev_rec[i + 1],
(ble_store_num_peer_dev_rec - i + 1) * sizeof(struct ble_hs_dev_records ));
(ble_store_num_peer_dev_rec - i) * sizeof(struct ble_hs_dev_records ));
}
BLE_HS_LOG(DEBUG, " RPA: removed device at index = %d, no. of peer records"
nimble/host/src/ble_sm_alg.c
+4
View File
@@ -87,14 +87,18 @@ ble_sm_alg_encrypt(uint8_t *key, uint8_t *plaintext, uint8_t *enc_data)
mbedtls_aes_init(&s);
if (mbedtls_aes_setkey_enc(&s, tmp, 128) != 0) {
mbedtls_aes_free(&s);
return BLE_HS_EUNKNOWN;
}
swap_buf(tmp, plaintext, 16);
if (mbedtls_aes_crypt_ecb(&s, MBEDTLS_AES_ENCRYPT, tmp, enc_data) != 0) {
mbedtls_aes_free(&s);
return BLE_HS_EUNKNOWN;
}
mbedtls_aes_free(&s);
#else
struct tc_aes_key_sched_struct s;
nimble/host/src/ble_sm_sc.c
+7
View File
@@ -569,6 +569,13 @@ ble_sm_sc_public_key_rx(uint16_t conn_handle, struct os_mbuf **om,
cmd = (struct ble_sm_public_key *)(*om)->om_data;
BLE_SM_LOG_CMD(0, "public key", conn_handle, ble_sm_public_key_log, cmd);
/* Check if the peer public key is same as our generated public key.
* Return fail if the public keys match. */
if (memcmp(cmd, ble_sm_sc_pub_key, 64) == 0) {
res->enc_cb = 1;
res->sm_err = BLE_SM_ERR_AUTHREQ;
return;
}
ble_hs_lock();
proc = ble_sm_proc_find(conn_handle, BLE_SM_PROC_STATE_PUBLIC_KEY, -1,
nimble/host/store/config/src/ble_store_nvs.c
+4 -2
View File
@@ -212,8 +212,10 @@ get_nvs_db_attribute(int obj_type, bool empty, void *value, int num_value)
if (value) {
#if MYNEWT_VAL(BLE_HOST_BASED_PRIVACY)
if (obj_type == BLE_STORE_OBJ_TYPE_PEER_DEV_REC) {
err = get_nvs_matching_index(&p_dev_rec, value, num_value,
sizeof(struct ble_hs_dev_records));
err = get_nvs_matching_index(&p_dev_rec.peer_sec,
&((struct ble_hs_dev_records *)value)->peer_sec,
num_value,
sizeof(struct ble_hs_peer_sec));
} else
#endif
{
nimble/host/test/src/ble_sm_sc_test.c
+606
View File
@@ -2285,6 +2285,612 @@ TEST_CASE_SELF(ble_sm_sc_us_pk_iio2_rio4_b1_iat0_rat0_ik7_rk5)
ble_hs_test_util_assert_mbufs_freed(NULL);
}
/**
* Secure connections pairing
* Master: us
* Pair algorithm: passkey entry
* Initiator IO capabilities: 2
* Responder IO capabilities: 4
* Bonding: true
* Initiator address type: 0
* Responder address type: 0
* Initiator key distribution: 7
* Responder key distribution: 5
* Peer responds with same public key
*/
TEST_CASE_SELF(ble_sm_sc_us_pk_iio2_rio4_b1_iat0_rat0_ik7_rk5_peer_same_pk) {
struct ble_sm_test_params params;
params = (struct ble_sm_test_params) {
.init_id_addr = {
0x01, 0x01, 0x01, 0x07, 0x08, 0x01,
},
.resp_id_addr = {
0xca, 0x61, 0xa0, 0x67, 0x94, 0xe0,
},
.pair_req = {
.io_cap = 0x02,
.oob_data_flag = 0x00,
.authreq = 0x0d,
.max_enc_key_size = 0x10,
.init_key_dist = 0x07,
.resp_key_dist = 0x07,
},
.pair_rsp = {
.io_cap = 0x04,
.oob_data_flag = 0x00,
.authreq = 0x0d,
.max_enc_key_size = 0x10,
.init_key_dist = 0x07,
.resp_key_dist = 0x05,
},
.our_priv_key = {
0xb1, 0x6b, 0x4f, 0x81, 0xbc, 0xe3, 0x60, 0x9e,
0x00, 0x20, 0xf1, 0x73, 0x3e, 0xfb, 0xcc, 0x6e,
0x8c, 0xb6, 0xd2, 0x51, 0xd9, 0x36, 0x8a, 0x6d,
0xca, 0x8c, 0xd7, 0xbe, 0x96, 0x03, 0xdf, 0xd6,
},
.public_key_req = {
.x = {
0xe5, 0x0f, 0x02, 0x0a, 0x37, 0x90, 0x94, 0x5a,
0x06, 0x21, 0xf7, 0xbc, 0xd5, 0xbe, 0xb9, 0x24,
0x8a, 0x35, 0xfd, 0xf8, 0x5e, 0xe2, 0x70, 0xd5,
0x5a, 0xe8, 0xe7, 0xdd, 0x13, 0x90, 0xeb, 0xd4,
},
.y = {
0x41, 0xc8, 0x51, 0x1a, 0x25, 0x44, 0x01, 0x53,
0x42, 0x74, 0x07, 0x9c, 0x18, 0xe6, 0x3b, 0x8a,
0xce, 0x7a, 0x37, 0x1f, 0x18, 0x5c, 0x02, 0x7c,
0x67, 0x16, 0xf5, 0x30, 0x2b, 0x31, 0xa9, 0xc7,
},
},
.public_key_rsp = {
.x = {
0xe5, 0x0f, 0x02, 0x0a, 0x37, 0x90, 0x94, 0x5a,
0x06, 0x21, 0xf7, 0xbc, 0xd5, 0xbe, 0xb9, 0x24,
0x8a, 0x35, 0xfd, 0xf8, 0x5e, 0xe2, 0x70, 0xd5,
0x5a, 0xe8, 0xe7, 0xdd, 0x13, 0x90, 0xeb, 0xd4,
},
.y = {
0x41, 0xc8, 0x51, 0x1a, 0x25, 0x44, 0x01, 0x53,
0x42, 0x74, 0x07, 0x9c, 0x18, 0xe6, 0x3b, 0x8a,
0xce, 0x7a, 0x37, 0x1f, 0x18, 0x5c, 0x02, 0x7c,
0x67, 0x16, 0xf5, 0x30, 0x2b, 0x31, 0xa9, 0xc7,
},
},
.confirm_req[0] = {
.value = {
0x55, 0x2c, 0xaa, 0x41, 0x59, 0x42, 0x4d, 0xfe,
0x47, 0x74, 0xcd, 0x2b, 0x11, 0xab, 0x21, 0xe6,
},
},
.confirm_rsp[0] = {
.value = {
0x6a, 0x3c, 0x45, 0xf5, 0xb2, 0xe2, 0x04, 0x30,
0xde, 0xd6, 0x3c, 0x6d, 0x85, 0x00, 0x00, 0x2c,
},
},
.random_req[0] = {
.value = {
0x78, 0x06, 0x04, 0x60, 0x76, 0xe9, 0xc4, 0x5a,
0xfb, 0x34, 0x44, 0xae, 0x45, 0xa0, 0x84, 0xde,
},
},
.random_rsp[0] = {
.value = {
0x91, 0xc8, 0xfd, 0x1b, 0xb2, 0x85, 0x08, 0x76,
0xd3, 0xf1, 0xc4, 0xa0, 0xfa, 0x92, 0x8c, 0x94,
},
},
.confirm_req[1] = {
.value = {
0xb1, 0x2f, 0x68, 0x35, 0xa1, 0xa5, 0x84, 0xb1,
0x4f, 0x1a, 0xb1, 0xb5, 0xf0, 0xb2, 0xbe, 0x61,
},
},
.confirm_rsp[1] = {
.value = {
0x07, 0xd8, 0x43, 0x74, 0xe8, 0x42, 0xf3, 0xf1,
0x87, 0x3d, 0x9e, 0x92, 0xea, 0x33, 0xe8, 0x54,
},
},
.random_req[1] = {
.value = {
0x4c, 0xb7, 0xcc, 0x6d, 0x90, 0x9f, 0x1e, 0x2d,
0x9d, 0x1e, 0x52, 0xa7, 0xe0, 0x0c, 0x7b, 0xf7,
},
},
.random_rsp[1] = {
.value = {
0x5c, 0x32, 0x82, 0xc8, 0x76, 0x17, 0x3b, 0x18,
0x66, 0xda, 0xbf, 0xc3, 0x13, 0x49, 0x05, 0xfb,
},
},
.confirm_req[2] = {
.value = {
0x27, 0x61, 0x4d, 0x04, 0x64, 0xa9, 0x58, 0xf1,
0xe0, 0xf9, 0xe5, 0x78, 0x0b, 0x54, 0x89, 0x0a,
},
},
.confirm_rsp[2] = {
.value = {
0xe4, 0x8f, 0xdb, 0xc8, 0x35, 0xed, 0x4e, 0x7d,
0xbc, 0x92, 0x7f, 0x58, 0x02, 0xaa, 0xbf, 0x6b,
},
},
.random_req[2] = {
.value = {
0xfe, 0x85, 0x08, 0xe0, 0x35, 0x90, 0x13, 0xa9,
0xd3, 0xcf, 0xb6, 0x6d, 0x36, 0xaf, 0xbd, 0x59,
},
},
.random_rsp[2] = {
.value = {
0x47, 0x40, 0x8e, 0x97, 0xe3, 0xfe, 0x8f, 0x52,
0x29, 0x5e, 0x6b, 0x44, 0xdf, 0x0d, 0x60, 0xf4,
},
},
.confirm_req[3] = {
.value = {
0xac, 0xab, 0x13, 0x7c, 0x1a, 0x6e, 0x7a, 0xdb,
0xf6, 0xe8, 0x72, 0x9f, 0xc5, 0xc3, 0x99, 0x1b,
},
},
.confirm_rsp[3] = {
.value = {
0x79, 0xf2, 0xd1, 0x89, 0x5e, 0xa5, 0xa2, 0x90,
0xee, 0x25, 0x36, 0x81, 0x5a, 0x87, 0x20, 0x82,
},
},
.random_req[3] = {
.value = {
0xd4, 0x46, 0xa0, 0xc4, 0x3d, 0xae, 0x22, 0x06,
0xaf, 0x5d, 0x93, 0x96, 0xb7, 0x06, 0xc3, 0x61,
},
},
.random_rsp[3] = {
.value = {
0x5f, 0x81, 0x97, 0x8b, 0x52, 0x87, 0x1c, 0x67,
0xe0, 0x04, 0xcc, 0x50, 0xd9, 0x2b, 0x16, 0xb5,
},
},
.confirm_req[4] = {
.value = {
0x6c, 0x51, 0xc3, 0x61, 0x77, 0x7f, 0xf1, 0x05,
0x9e, 0x0f, 0xba, 0xfd, 0x32, 0x02, 0x09, 0x45,
},
},
.confirm_rsp[4] = {
.value = {
0x54, 0xe5, 0x24, 0x81, 0x62, 0x68, 0xe2, 0x45,
0x86, 0x2c, 0x11, 0x28, 0x15, 0xa8, 0x8e, 0x5b,
},
},
.random_req[4] = {
.value = {
0xbb, 0x29, 0x3a, 0xba, 0xe6, 0x4f, 0x06, 0xcf,
0xa3, 0x13, 0x27, 0xf2, 0xcb, 0xe4, 0xd2, 0xe6,
},
},
.random_rsp[4] = {
.value = {
0x50, 0xba, 0xd0, 0x0e, 0x26, 0xab, 0x04, 0xf8,
0xa2, 0x03, 0x1e, 0x63, 0x9a, 0xf7, 0x15, 0xdc,
},
},
.confirm_req[5] = {
.value = {
0x12, 0x3e, 0xfe, 0x5a, 0xb1, 0x09, 0x6f, 0x17,
0xb7, 0x77, 0x7e, 0x65, 0x88, 0xd4, 0x95, 0x56,
},
},
.confirm_rsp[5] = {
.value = {
0xc6, 0x9b, 0xac, 0xde, 0x7e, 0x03, 0x7a, 0xd3,
0xf1, 0xff, 0x3c, 0x4f, 0x4a, 0x85, 0xba, 0x73,
},
},
.random_req[5] = {
.value = {
0x17, 0xd5, 0x5e, 0x69, 0x30, 0x2c, 0x1f, 0x01,
0x87, 0x9c, 0xd6, 0xd2, 0xe4, 0x48, 0x8c, 0x84,
},
},
.random_rsp[5] = {
.value = {
0x9d, 0x54, 0x83, 0x4a, 0xcd, 0x93, 0x7c, 0x1e,
0x5b, 0xaf, 0xd2, 0x66, 0x8c, 0x2d, 0xaa, 0xc3,
},
},
.confirm_req[6] = {
.value = {
0xdc, 0x24, 0x69, 0xa8, 0xd3, 0xa9, 0x17, 0x11,
0x08, 0x37, 0x1a, 0x1e, 0x92, 0x03, 0xee, 0x36,
},
},
.confirm_rsp[6] = {
.value = {
0x98, 0xf8, 0x72, 0x71, 0x99, 0xa0, 0xbd, 0xcd,
0xb1, 0x97, 0x4c, 0x8a, 0xb8, 0xa8, 0x1a, 0x52,
},
},
.random_req[6] = {
.value = {
0xbf, 0xb1, 0x8e, 0xa5, 0x14, 0xe3, 0xeb, 0x9e,
0x29, 0x27, 0xe0, 0x19, 0xb1, 0xb2, 0x5c, 0xfe,
},
},
.random_rsp[6] = {
.value = {
0xae, 0x8a, 0x92, 0x78, 0x53, 0x7b, 0xdb, 0x8c,
0xec, 0x3a, 0x99, 0x2b, 0x94, 0xf1, 0x17, 0xfe,
},
},
.confirm_req[7] = {
.value = {
0xcf, 0xaf, 0x70, 0x73, 0x53, 0x65, 0x89, 0x57,
0x36, 0x98, 0xd2, 0x28, 0x86, 0x79, 0xfe, 0x85,
},
},
.confirm_rsp[7] = {
.value = {
0x0d, 0x2d, 0x77, 0x8a, 0x21, 0x11, 0xd9, 0x61,
0x9f, 0x80, 0x32, 0x8a, 0x32, 0x09, 0x42, 0x42,
},
},
.random_req[7] = {
.value = {
0x8b, 0xd2, 0x53, 0xcd, 0x96, 0xd1, 0x14, 0xb5,
0xea, 0x17, 0xb1, 0xa3, 0xa8, 0xfc, 0x3c, 0x2b,
},
},
.random_rsp[7] = {
.value = {
0xc2, 0x4f, 0x84, 0x60, 0x54, 0x79, 0x16, 0xed,
0x1a, 0x6e, 0x78, 0xa0, 0x99, 0x58, 0xf2, 0x94,
},
},
.confirm_req[8] = {
.value = {
0x9a, 0x4c, 0xbc, 0x9c, 0x55, 0x15, 0xa2, 0x4f,
0xa2, 0x5d, 0x3b, 0xa7, 0x43, 0xb3, 0x9c, 0x63,
},
},
.confirm_rsp[8] = {
.value = {
0xa3, 0xb1, 0x88, 0xa5, 0x70, 0xca, 0xa3, 0xa9,
0x67, 0x2a, 0xac, 0x99, 0x5e, 0x61, 0x68, 0xa0,
},
},
.random_req[8] = {
.value = {
0xcf, 0xcf, 0x5b, 0x94, 0xe0, 0xb2, 0x9d, 0x5a,
0x86, 0x71, 0x45, 0xce, 0xd9, 0xce, 0x13, 0xba,
},
},
.random_rsp[8] = {
.value = {
0x10, 0x96, 0x8a, 0x50, 0xa4, 0xd0, 0xaa, 0x5f,
0xd6, 0x32, 0xdb, 0x09, 0x7e, 0x22, 0x96, 0x42,
},
},
.confirm_req[9] = {
.value = {
0xf0, 0x90, 0x61, 0x25, 0x04, 0x29, 0x4f, 0xb6,
0x8b, 0xd5, 0x73, 0x49, 0xbd, 0xf7, 0x9b, 0xe7,
},
},
.confirm_rsp[9] = {
.value = {
0x5b, 0xe6, 0xb4, 0x3f, 0x1b, 0x77, 0x12, 0x75,
0x84, 0x94, 0xc6, 0x07, 0xfa, 0xa1, 0x41, 0x94,
},
},
.random_req[9] = {
.value = {
0x3d, 0x1a, 0xa3, 0x95, 0xec, 0x72, 0x84, 0xf4,
0xc5, 0xcd, 0xaa, 0x48, 0xe9, 0x0c, 0x0f, 0xe3,
},
},
.random_rsp[9] = {
.value = {
0x8a, 0x5a, 0x53, 0xfc, 0x07, 0x52, 0x01, 0xb9,
0xe9, 0x2d, 0xe7, 0x9d, 0x8c, 0x7c, 0xc7, 0xb3,
},
},
.confirm_req[10] = {
.value = {
0xe7, 0x8e, 0xc5, 0x08, 0x7f, 0x7e, 0xb8, 0xdc,
0x05, 0x88, 0x3a, 0x92, 0x5a, 0xf5, 0x9b, 0xa9,
},
},
.confirm_rsp[10] = {
.value = {
0xf7, 0xa2, 0xb6, 0xec, 0xcd, 0xef, 0xcb, 0xb7,
0x6f, 0xc3, 0xac, 0x17, 0xe2, 0xfd, 0xfa, 0x42,
},
},
.random_req[10] = {
.value = {
0x0d, 0xd1, 0xa2, 0x1d, 0xff, 0x74, 0xc5, 0x99,
0xe0, 0x67, 0x07, 0x99, 0x95, 0x75, 0x39, 0x76,
},
},
.random_rsp[10] = {
.value = {
0x2f, 0x13, 0xd1, 0x59, 0xfe, 0x20, 0x60, 0xf0,
0x02, 0x0c, 0xea, 0x79, 0xd7, 0x40, 0x86, 0x85,
},
},
.confirm_req[11] = {
.value = {
0x8b, 0x57, 0x87, 0xdd, 0xb1, 0xcc, 0x2d, 0x65,
0xc1, 0xba, 0xac, 0x88, 0x48, 0x23, 0xda, 0xe7,
},
},
.confirm_rsp[11] = {
.value = {
0xb3, 0xc4, 0x2e, 0xea, 0x33, 0xaf, 0x12, 0x9c,
0xb5, 0xab, 0xa1, 0x95, 0x30, 0xca, 0x46, 0x48,
},
},
.random_req[11] = {
.value = {
0x35, 0x57, 0xcd, 0xd5, 0xd2, 0xf8, 0xd7, 0xf2,
0x7b, 0xe3, 0xd7, 0xba, 0x31, 0xa5, 0xca, 0xfd,
},
},
.random_rsp[11] = {
.value = {
0xe2, 0x3b, 0x20, 0xbe, 0xec, 0xa5, 0x34, 0x3b,
0x76, 0x23, 0x53, 0x28, 0x36, 0xc4, 0x60, 0x13,
},
},
.confirm_req[12] = {
.value = {
0xc9, 0xfe, 0x03, 0x49, 0xe4, 0xff, 0x7e, 0xf7,
0x00, 0xd1, 0x2b, 0x13, 0xb1, 0x15, 0x6e, 0x92,
},
},
.confirm_rsp[12] = {
.value = {
0xbc, 0xa2, 0xf2, 0x03, 0x5c, 0xfd, 0x20, 0x7b,
0xd0, 0x1f, 0xd6, 0x50, 0xec, 0xc6, 0x7b, 0x31,
},
},
.random_req[12] = {
.value = {
0x04, 0x50, 0xea, 0xb8, 0xca, 0x36, 0x1a, 0x61,
0x92, 0xed, 0xa0, 0x67, 0x78, 0x15, 0x10, 0xb5,
},
},
.random_rsp[12] = {
.value = {
0x0c, 0x8e, 0x9d, 0x7b, 0x9d, 0x7e, 0xda, 0x23,
0xbb, 0x61, 0xd9, 0xff, 0x46, 0x77, 0x33, 0x1b,
},
},
.confirm_req[13] = {
.value = {
0x9a, 0xff, 0xd6, 0xe5, 0x1a, 0xc3, 0xd3, 0x37,
0x34, 0xeb, 0x3e, 0x3a, 0x8e, 0x0b, 0x86, 0xb4,
},
},
.confirm_rsp[13] = {
.value = {
0xf6, 0x32, 0x19, 0xb4, 0x08, 0x6b, 0x8a, 0x0f,
0xc9, 0x9c, 0x1b, 0x68, 0xb8, 0xa0, 0xd0, 0xc9,
},
},
.random_req[13] = {
.value = {
0x86, 0xeb, 0x5c, 0xf9, 0x33, 0x54, 0x7d, 0xe4,
0xa4, 0xe2, 0xe1, 0xf6, 0x6b, 0xea, 0x34, 0xed,
},
},
.random_rsp[13] = {
.value = {
0xad, 0x53, 0xa0, 0x6e, 0xde, 0x1d, 0xda, 0x99,
0x31, 0x45, 0xe5, 0x3a, 0x73, 0xa1, 0x5e, 0xe1,
},
},
.confirm_req[14] = {
.value = {
0x93, 0xd4, 0xe0, 0xaa, 0x0c, 0x91, 0xba, 0xde,
0xc9, 0x5c, 0x68, 0xb0, 0xce, 0xb6, 0x84, 0xcd,
},
},
.confirm_rsp[14] = {
.value = {
0x85, 0xc7, 0x05, 0x02, 0x21, 0x9d, 0x4c, 0x4c,
0x16, 0xf7, 0x8f, 0x7b, 0xaa, 0xb4, 0x8f, 0x37,
},
},
.random_req[14] = {
.value = {
0x84, 0xfd, 0xf1, 0x39, 0x1a, 0x9a, 0xa5, 0xb8,
0x49, 0xc0, 0x66, 0xdc, 0x33, 0x71, 0x32, 0x87,
},
},
.random_rsp[14] = {
.value = {
0x5d, 0xaf, 0x38, 0xcd, 0xb5, 0x83, 0xaa, 0xa0,
0xab, 0x30, 0x82, 0xed, 0x6f, 0xd2, 0x75, 0xe7,
},
},
.confirm_req[15] = {
.value = {
0x88, 0x12, 0xe8, 0x89, 0xd4, 0x52, 0x6d, 0xac,
0x61, 0x2a, 0x85, 0x85, 0x1e, 0x9c, 0x82, 0x21,
},
},
.confirm_rsp[15] = {
.value = {
0xc1, 0xe9, 0xcd, 0x21, 0x29, 0x6a, 0x78, 0xe4,
0x7b, 0x7d, 0x73, 0x25, 0x9e, 0x9b, 0x95, 0x8b,
},
},
.random_req[15] = {
.value = {
0x95, 0x87, 0x9d, 0x5a, 0x10, 0x14, 0xa0, 0xdf,
0x5e, 0x02, 0x22, 0x39, 0x23, 0xc9, 0xbc, 0xba,
},
},
.random_rsp[15] = {
.value = {
0x1b, 0x91, 0xe2, 0xdf, 0xca, 0xfe, 0x2b, 0x61,
0x33, 0x8c, 0x83, 0xbf, 0xcf, 0xc3, 0x72, 0xcc,
},
},
.confirm_req[16] = {
.value = {
0xce, 0xc9, 0x68, 0xf7, 0xea, 0x41, 0x18, 0x5c,
0x16, 0x6a, 0x98, 0x13, 0x0c, 0x10, 0xc2, 0xa3,
},
},
.confirm_rsp[16] = {
.value = {
0x97, 0x73, 0xc9, 0x72, 0x68, 0x99, 0x63, 0xed,
0x81, 0x3b, 0x5c, 0xee, 0x37, 0xfc, 0xca, 0xae,
},
},
.random_req[16] = {
.value = {
0x5b, 0x85, 0xb0, 0x1b, 0xc3, 0xde, 0x18, 0xba,
0xc1, 0xc7, 0x89, 0x99, 0xfe, 0xcd, 0xdb, 0x6a,
},
},
.random_rsp[16] = {
.value = {
0x5e, 0x1a, 0xcb, 0xbc, 0xda, 0x41, 0x06, 0x5a,
0x14, 0x34, 0x3a, 0xb1, 0xa1, 0x6f, 0xb2, 0xd8,
},
},
.confirm_req[17] = {
.value = {
0x1d, 0x59, 0x8a, 0xb0, 0x19, 0xe5, 0xff, 0x45,
0xb6, 0xc3, 0x33, 0x64, 0xd1, 0x6e, 0xee, 0xdd,
},
},
.confirm_rsp[17] = {
.value = {
0x4c, 0x9b, 0xe8, 0x68, 0x52, 0x34, 0xef, 0xe1,
0x84, 0xbd, 0x37, 0x85, 0x53, 0x0d, 0xd5, 0xc1,
},
},
.random_req[17] = {
.value = {
0xa6, 0xf7, 0x97, 0x18, 0x9a, 0x3e, 0x9d, 0xcf,
0x91, 0xa3, 0xa3, 0x8e, 0xda, 0x8f, 0x8f, 0x90,
},
},
.random_rsp[17] = {
.value = {
0x94, 0x10, 0x19, 0x17, 0x8d, 0x0a, 0x72, 0xfd,
0x24, 0x9d, 0xfd, 0x37, 0x4e, 0xdf, 0x4c, 0x30,
},
},
.confirm_req[18] = {
.value = {
0xfc, 0x64, 0x8a, 0x8b, 0x37, 0x17, 0x90, 0x6d,
0x25, 0x0e, 0xc6, 0x18, 0xc9, 0xc9, 0xc2, 0x2a,
},
},
.confirm_rsp[18] = {
.value = {
0x50, 0x98, 0x86, 0xf5, 0xc0, 0xda, 0x45, 0x2d,
0xea, 0xc8, 0x9d, 0x28, 0x04, 0xd8, 0x73, 0x6f,
},
},
.random_req[18] = {
.value = {
0x13, 0x10, 0x38, 0xe8, 0x17, 0x6d, 0x72, 0xd5,
0x94, 0xaf, 0xed, 0x4f, 0x23, 0xa0, 0x41, 0xfc,
},
},
.random_rsp[18] = {
.value = {
0xdf, 0xed, 0xf7, 0x08, 0xce, 0x64, 0xbc, 0x11,
0x41, 0x7a, 0xd9, 0xf7, 0x4a, 0xd9, 0x4a, 0x15,
},
},
.confirm_req[19] = {
.value = {
0xae, 0x24, 0x8f, 0xdf, 0xb0, 0x57, 0xc4, 0x9c,
0xe6, 0xae, 0x9b, 0xc2, 0x4d, 0x3d, 0x1c, 0xcb,
},
},
.confirm_rsp[19] = {
.value = {
0xcc, 0x5c, 0xa3, 0xbe, 0xd7, 0x83, 0xee, 0x60,
0x80, 0xff, 0x5f, 0x1a, 0x07, 0xbf, 0x4c, 0x33,
},
},
.random_req[19] = {
.value = {
0x93, 0xc3, 0x62, 0x06, 0xcb, 0xe5, 0xb0, 0x01,
0x02, 0x18, 0xa2, 0x50, 0x4c, 0x73, 0xa2, 0x27,
},
},
.random_rsp[19] = {
.value = {
0x11, 0x2a, 0xd3, 0x06, 0x28, 0x9c, 0xdf, 0x73,
0xa5, 0xa4, 0xe5, 0x1e, 0x07, 0xcf, 0xee, 0x71,
},
},
.dhkey_check_req = {
.value = {
0x73, 0xa0, 0x40, 0x58, 0x78, 0x20, 0x5f, 0x2c,
0xf4, 0x19, 0x23, 0xa8, 0x74, 0xbd, 0xc2, 0x3e,
},
},
.dhkey_check_rsp = {
.value = {
0x5a, 0x30, 0xbc, 0xce, 0xec, 0xdf, 0xf0, 0x32,
0x3c, 0x18, 0xa3, 0xd3, 0x3f, 0x20, 0x87, 0x10,
},
},
.sign_info_req = {
.sig_key = {
0x2e, 0x81, 0x09, 0xde, 0x32, 0xc5, 0x28, 0x34,
0xe1, 0x45, 0x4a, 0x35, 0x49, 0xef, 0xa2, 0xed,
},
},
.id_info_rsp = {
.irk = {
0xef, 0x8d, 0xe2, 0x16, 0x4f, 0xec, 0x43, 0x0d,
0xbf, 0x5b, 0xdd, 0x34, 0xc0, 0x53, 0x1e, 0xb8,
},
},
.id_addr_info_rsp = {
.addr_type = 0,
.bd_addr = {
0x01, 0x01, 0x01, 0x07, 0x08, 0x01,
},
},
.sign_info_rsp = {
.sig_key = {
0x90, 0x3d, 0x26, 0x65, 0xc1, 0xd1, 0x5a, 0x9d,
0xda, 0xab, 0x0d, 0x00, 0x05, 0x0e, 0x6c, 0x5d,
},
},
.ltk = {
0xf1, 0x41, 0x1a, 0x5b, 0x60, 0xc1, 0x43, 0xc6,
0x80, 0x34, 0x5e, 0x7f, 0xd8, 0x0c, 0x75, 0xdc,
},
.pair_alg = BLE_SM_PAIR_ALG_PASSKEY,
.authenticated = 1,
.passkey_info = {
.passkey = {
.action = BLE_SM_IOACT_INPUT,
.passkey = 516645,
},
},
};
ble_sm_test_util_us_sc_bad(&params);
ble_hs_test_util_assert_mbufs_freed(NULL);
}
/**
* Secure connections pairing
* Master: us
nimble/host/test/src/ble_sm_test_util.c
+101 -5
View File
@@ -837,6 +837,35 @@ ble_sm_test_util_rx_public_key(uint16_t conn_handle,
TEST_ASSERT_FATAL(rc == 0);
}
static void
ble_sm_test_util_rx_public_key_bad(uint16_t conn_handle,
struct ble_sm_public_key *cmd)
{
struct hci_data_hdr hci_hdr;
struct os_mbuf *om;
void *v;
int payload_len;
int rc;
hci_hdr = BLE_SM_TEST_UTIL_HCI_HDR(
2, BLE_HCI_PB_FIRST_FLUSH,
BLE_L2CAP_HDR_SZ + sizeof(struct ble_sm_hdr) + sizeof(struct ble_sm_public_key));
om = ble_hs_mbuf_l2cap_pkt();
TEST_ASSERT_FATAL(om != NULL);
payload_len = sizeof(struct ble_sm_hdr) + sizeof(struct ble_sm_public_key);
v = os_mbuf_extend(om, payload_len);
TEST_ASSERT_FATAL(v != NULL);
ble_sm_public_key_write(v, payload_len, cmd);
rc = ble_hs_test_util_l2cap_rx_first_frag(conn_handle, BLE_L2CAP_CID_SM,
&hci_hdr, om);
TEST_ASSERT_FATAL(rc != 0);
}
static void
ble_sm_test_util_rx_dhkey_check(uint16_t conn_handle,
struct ble_sm_dhkey_check *cmd,
@@ -2560,6 +2589,52 @@ ble_sm_test_util_us_sc_good_once_no_init(
ble_hs_test_util_conn_disconnect(2);
}
static void
ble_sm_test_util_us_sc_bad_once_no_init(struct ble_sm_test_params *params,
struct ble_hs_conn *conn,
struct ble_sm_test_util_entity *our_entity,
struct ble_sm_test_util_entity *peer_entity)
{
int rc;
TEST_ASSERT(!conn->bhc_sec_state.encrypted);
TEST_ASSERT(ble_sm_num_procs() == 0);
ble_hs_test_util_hci_ack_set(
ble_hs_hci_util_opcode_join(BLE_HCI_OGF_LE,
BLE_HCI_OCF_LE_START_ENCRYPT), 0);
if (params->sec_req.authreq != 0) {
ble_sm_test_util_rx_sec_req(2, &params->sec_req, 0);
} else {
/* Initiate the pairing procedure. */
rc = ble_gap_security_initiate(2);
TEST_ASSERT_FATAL(rc == 0);
}
/* Ensure we sent the expected pair request. */
ble_sm_test_util_verify_tx_pair_req(our_entity->pair_cmd);
TEST_ASSERT(!conn->bhc_sec_state.encrypted);
TEST_ASSERT(ble_sm_num_procs() == 1);
ble_sm_test_util_io_inject_bad(2, params->passkey_info.passkey.action);
/* Receive a pair response from the peer. */
ble_sm_test_util_rx_pair_rsp(2, peer_entity->pair_cmd, 0);
TEST_ASSERT(!conn->bhc_sec_state.encrypted);
TEST_ASSERT(ble_sm_num_procs() == 1);
ble_sm_test_util_io_inject_bad(2, params->passkey_info.passkey.action);
/* Ensure we sent the expected public key. */
ble_sm_test_util_verify_tx_public_key(our_entity->public_key);
TEST_ASSERT(!conn->bhc_sec_state.encrypted);
TEST_ASSERT(ble_sm_num_procs() == 1);
ble_sm_test_util_io_inject_bad(2, params->passkey_info.passkey.action);
/* Receive a wrong public key from the peer. */
ble_sm_test_util_rx_public_key_bad(2, peer_entity->public_key);
TEST_ASSERT(!conn->bhc_sec_state.encrypted);
TEST_ASSERT(ble_sm_num_procs() == 1);
}
static void
ble_sm_test_util_us_sc_good_once(struct ble_sm_test_params *params)
{
@@ -2572,6 +2647,17 @@ ble_sm_test_util_us_sc_good_once(struct ble_sm_test_params *params)
params, conn, &our_entity, &peer_entity);
}
static void
ble_sm_test_util_us_sc_bad_once(struct ble_sm_test_params *params)
{
struct ble_sm_test_util_entity peer_entity;
struct ble_sm_test_util_entity our_entity;
struct ble_hs_conn *conn;
ble_sm_test_util_init_good(params, 1, &conn, &our_entity, &peer_entity);
ble_sm_test_util_us_sc_bad_once_no_init(
params, conn, &our_entity, &peer_entity);
}
void
ble_sm_test_util_us_sc_good(struct ble_sm_test_params *params)
{
@@ -2603,12 +2689,22 @@ ble_sm_test_util_us_sc_good(struct ble_sm_test_params *params)
TEST_ASSERT(ble_hs_test_util_num_peer_secs() == 0);
}
void
ble_sm_test_util_us_sc_bad(struct ble_sm_test_params *params)
{
/*** We are master. */
/* We initiate pairing. */
params->passkey_info.io_before_rx = 0;
params->sec_req.authreq = 0;
ble_sm_test_util_us_sc_bad_once(params);
}
static void
ble_sm_test_util_peer_sc_good_once_no_init(
struct ble_sm_test_params *params,
struct ble_hs_conn *conn,
struct ble_sm_test_util_entity *our_entity,
struct ble_sm_test_util_entity *peer_entity)
ble_sm_test_util_peer_sc_good_once_no_init(struct ble_sm_test_params *params,
struct ble_hs_conn *conn,
struct ble_sm_test_util_entity *our_entity,
struct ble_sm_test_util_entity *peer_entity)
{
int num_iters;
int rc;
nimble/host/test/src/ble_sm_test_util.h
+1
View File
@@ -119,6 +119,7 @@ void ble_sm_test_util_peer_lgcy_good(struct ble_sm_test_params *params);
void ble_sm_test_util_peer_bonding_bad(uint16_t ediv, uint64_t rand_num);
void ble_sm_test_util_peer_sc_good(struct ble_sm_test_params *params);
void ble_sm_test_util_us_sc_good(struct ble_sm_test_params *params);
void ble_sm_test_util_us_sc_bad(struct ble_sm_test_params *params);
void ble_sm_test_util_us_fail_inval(struct ble_sm_test_params *params);
#ifdef __cplusplus