SiLeader
d7c8dd270f
fix compiler warning: comparison of integer expressions of different signedness: 'int' and 'unsigned int'
...
Merges https://github.com/espressif/esp-idf/pull/5687
Equivalent fix to https://github.com/espressif/esp-idf/issues/6120 for v4.0 branch
2021-01-19 09:15:52 +11:00
Island
3a56233a4d
Merge branch 'bugfix/bluedroid_avoid_same_bdaddr_conn_v4.0' into 'release/v4.0'
...
Bluedroid: Do not connect if peer BD_ADDR is same as own BD_ADDR. (v4.0)
See merge request espressif/esp-idf!11992
2021-01-18 14:01:19 +08:00
Island
5718652952
Merge branch 'bugfix/ble_mesh_macro_OR_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Fix using wrong | for OR between macros (v4.0)
See merge request espressif/esp-idf!11995
2021-01-14 19:01:15 +08:00
lly
4902b2745b
ble_mesh: stack: Fix using wrong | for OR between macros
2021-01-14 15:59:46 +08:00
Island
a47099b028
Merge branch 'feat/ble_mesh_support_ble_scan_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Add BLE scan callback when mesh is enabled (v4.0)
See merge request espressif/esp-idf!11965
2021-01-14 15:47:52 +08:00
Chinmay Chhajed
c4fe4dbf67
Bluedroid: Do not connect if peer BD_ADDR is same as own BD_ADDR.
2021-01-14 12:23:04 +05:30
Jiang Jiang Jian
f2038b959a
Merge branch 'bugfix/fix_spp_vfs_dynamic_memory_bugs_v4.0' into 'release/v4.0'
...
component_bt/fix spp vfs demo crash when use dynamic memory[backport v4.0]
See merge request espressif/esp-idf!11729
2021-01-14 11:19:34 +08:00
Mahavir Jain
5a64638848
Merge branch 'fix/esp_tls_add_warning_if_ca_chain_has_invalid_cert_v4.0' into 'release/v4.0'
...
esp_tls: Add warning if the CA chain provided contains one/more invalid cert
See merge request espressif/esp-idf!11943
2021-01-12 23:26:55 +08:00
lly
024017e3f2
ble_mesh: ci: Add ble & ble mesh coex sdkconfig test files
2021-01-12 19:15:36 +08:00
lly
f9b53a909b
ble_mesh: stack: Support reporting normal ble adv packets
2021-01-12 19:15:36 +08:00
lly
34b5c1cf72
ble_mesh: stack: Add a btc file for ble coex functions
...
Previously if starting/stopping BLE advertising when BLE Mesh
is enabled, the corresponding events will be notified through
the callback registered by esp_ble_mesh_register_prov_callback().
With this commit, the func esp_ble_mesh_register_ble_callback()
needs to be invoked for resgitering the callback used for BLE
coexistence related functionalities (i.e. ADV/SCAN).
2021-01-12 19:15:36 +08:00
lly
88b550ba75
ble_mesh: stack: Move ble scan funcitons to a single file
2021-01-12 19:15:35 +08:00
lly
d1553311a2
ble_mesh: stack: Optimize handling received mesh adv packets
2021-01-12 19:15:35 +08:00
Island
725f882897
Merge branch 'optimize/ble_mesh_miscellaneous_v4.0' into 'release/v4.0'
...
Optimize/ble mesh miscellaneous (v4.0)
See merge request espressif/esp-idf!11949
2021-01-12 19:13:10 +08:00
lly
73dee43e55
ble_mesh: stack: Move bt_mesh_rand to mesh_common.c
2021-01-11 19:28:36 +08:00
lly
decd6956f3
ble_mesh: stack: Remove useless BT_DBG_ENABLED in a few files
2021-01-11 19:28:31 +08:00
lly
93991bda4a
ble_mesh: Replace zephyr integer types with C99 types [Zephyr]
2021-01-11 19:28:25 +08:00
lly
866b6b439c
ble_mesh: stack: Update ARRAY_SIZE definition
2021-01-11 19:27:55 +08:00
Island
9172fcaa77
Merge branch 'feat/ble_mesh_multiple_nvs_namespace_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Provisioner supports multiple nvs namespaces (v4.0)
See merge request espressif/esp-idf!11936
2021-01-11 18:55:37 +08:00
Aditya Patwardhan
238ac2293b
esp_tls: Add warning if the CA chain provided contains one/more invalid cert
2021-01-11 12:41:07 +05:30
Mahavir Jain
0be9d54b90
Merge branch 'feature/upgrade_mbedtls_to_v4.0' into 'release/v4.0'
...
mbedtls: upgrade to v2.16.9 release (v4.0)
See merge request espressif/esp-idf!11901
2021-01-11 14:01:14 +08:00
lly
63adf8503f
ble_mesh: ci: Add settings sdkconfig test files
2021-01-11 10:08:33 +08:00
lly
8c883fd410
ble_mesh: stack: Provisioner supports multiple nvs namespaces
...
Now Provisioner can use different NVS namespaces to store
different instances of mesh information, for example, for
different user accounts.
2021-01-11 10:08:23 +08:00
Island
c97fc5ef8c
Merge branch 'feat/ble_mesh_provisioner_recv_hb_support_v4.0' into 'release/v4.0'
...
Feat/ble mesh provisioner recv hb support (v4.0)
See merge request espressif/esp-idf!11915
2021-01-08 18:30:28 +08:00
lly
f9f29b779c
ble_mesh: ci: Add enabling hb recv sdkconfig file
2021-01-08 09:33:04 +08:00
lly
f0af8858da
ble_mesh: stack: Provisioner supports receiving heartbeat
2021-01-08 09:33:04 +08:00
Mahavir Jain
2d7eb60491
mbedtls: upgrade to v2.16.9 release
...
For details release notes please refer to:
https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.9
2021-01-07 11:20:30 +05:30
Island
b4261e53d9
Merge branch 'bugfix/ble_mesh_node_id_adv_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Fix Node ID adv with wrong timeout (v4.0)
See merge request espressif/esp-idf!11879
2021-01-06 17:08:51 +08:00
lly
726225c5f3
ble_mesh: stack: Fix Node ID adv with wrong timeout
2021-01-05 20:15:16 +08:00
Jiang Jiang Jian
d56cca3413
Merge branch 'bugfix/fix_ping_specify_length_issue_v4.0' into 'release/v4.0'
...
bugfix: fix ICMP specify length issue (backport v4.0)
See merge request espressif/esp-idf!11838
2021-01-05 10:45:16 +08:00
Mahavir Jain
43c9d9c1cd
Merge branch 'fix/i2c_pm_lock_v4.0' into 'release/v4.0'
...
i2c: Acquire PM lock after acquiring mutex (v4.0)
See merge request espressif/esp-idf!11832
2020-12-31 12:33:50 +08:00
ronghulin
4985b77fff
bugfix: fix ICMP specify length issue
2020-12-30 18:01:01 +08:00
Sachin Parekh
e78721db05
i2c: Acquire PM lock after acquiring mutex
2020-12-30 13:25:21 +05:30
Jiang Jiang Jian
37317d1f2f
Merge branch 'bugfix/bt_bluedroid_same_public_key_attack_v4.0' into 'release/v4.0'
...
Bluedroid: Fixes for some Bluetooth vulnerabilities. (v4.0)
See merge request espressif/esp-idf!11765
2020-12-28 11:41:14 +08:00
Chinmay Chhajed
b3d5ed3a03
Bluedroid: Fixes for some vulnerabilities.
...
This commit fixes 'Impersonation in Passkey entry protocol'
(CVE-2020-26558) and suggests fixes for other vulnerabilites like
'Impersonation in the Pin Pairing Protocol' (CVE-2020-26555) and
'Authentication of the LE Legacy Pairing Protocol'
CVE-2020-26558 can be easily implemented if the peer device can
impersonate our public key. This commit adds a check by comparing our
and received public key and returns failed pairing if keys are same.
This commit also adds comments suggesting to use secure connection when
supported by all devices.
2020-12-25 16:01:47 +05:30
Jiang Jiang Jian
5a069ea324
Merge branch 'bugfix/fix_wps_examples_issue_v4.0' into 'release/v4.0'
...
esp_wifi: Fix WPS examples issue (v4.0)
See merge request espressif/esp-idf!11730
2020-12-24 12:34:39 +08:00
zhangyanjiao
e4bd2bebb5
esp_wifi: Add WPS Reason code in all failures
2020-12-23 17:35:06 +08:00
xiehang
41a4da16d3
esp_wifi: Fix WPS examples issue
2020-12-23 15:43:19 +08:00
liqigan
d64a19b73c
fix spp vfs demo crash when use dynamic memory
2020-12-23 15:26:58 +08:00
Jiang Jiang Jian
64dfa78eed
Merge branch 'bugfix/collection_bugfix_backport_for_4_0' into 'release/v4.0'
...
Bugfix/collection bugfix backport for 4 0
See merge request espressif/esp-idf!11710
2020-12-23 13:55:01 +08:00
baohongde
711184762b
components/bt: Fix waking up fail while sleeping
2020-12-22 21:28:44 +08:00
baohongde
998a1f9ebb
components/bt: Make sleep avaliable in hli(for future use)
2020-12-22 21:23:09 +08:00
wangcheng
b9f79249b8
components/bt: backport need commit to release/v4.0
2020-12-22 19:54:53 +08:00
wangcheng
0f4592eea0
components/bt: fixed memory damage caused by bluetooth memory release
2020-12-22 19:54:53 +08:00
gengyuchao
16ff064f68
btdm: Add comments to clarify the two different device names of GAP and ADV in the ble_spp_server_demo example, as the old example might confuse users.
2020-12-22 19:54:53 +08:00
weitianhua
ca66b50481
collection of bugfix backport for release/v4.0
2020-12-22 19:54:53 +08:00
wangcheng
e11820cd5b
components/bt: Fixed the problem of early release of pointer(p_ccb) in funcion
2020-12-22 19:54:53 +08:00
Jiang Jiang Jian
5a1a21ed2f
Merge branch 'bugfix/revert_wifi_iram_optimization_v4.0' into 'release/v4.0'
...
esp_wifi: revert wifi iram optimization(v4.0)
See merge request espressif/esp-idf!11514
2020-12-22 19:03:01 +08:00
Jiang Jiang Jian
90e4363f7a
Merge branch 'fixbug/baidu_tcp_recv_assert_for_4.0' into 'release/v4.0'
...
lw-ip:fix bug for tcp recv assert(backport 4.0)
See merge request espressif/esp-idf!11603
2020-12-22 16:19:05 +08:00
Jiang Jiang Jian
ef7aca1a66
Merge branch 'nimble/fix_misc_coverity_issue_v4.0' into 'release/v4.0'
...
Nimble: Fix misc issues in NimBLE NVS, `ble_eddystone`, recursive call and L2CAP CoC (v4.0)
See merge request espressif/esp-idf!11392
2020-12-22 15:01:25 +08:00