Marius Vikhammer
cf7bea6dff
idf monitor: fix crash when monitor baudrate argument set
...
Closes IDF-1902
2021-01-15 09:09:49 +00:00
Island
67fb958b8c
Merge branch 'bugfix/ble_mesh_macro_OR_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Fix using wrong | for OR between macros (v4.2)
See merge request espressif/esp-idf!11997
2021-01-15 11:04:47 +08:00
lly
cd1fbfdee1
ble_mesh: stack: Fix using wrong | for OR between macros
2021-01-14 19:03:00 +08:00
Island
8911c29122
Merge branch 'feat/ble_mesh_support_ble_scan_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Add BLE scan callback when mesh is enabled (v4.2)
See merge request espressif/esp-idf!11963
2021-01-14 19:01:05 +08:00
lly
a3fa7dda33
ble_mesh: ci: Add ble & ble mesh coex sdkconfig test files
2021-01-14 07:30:47 +00:00
lly
c8890a40e4
ble_mesh: stack: Support reporting normal ble adv packets
2021-01-14 07:30:47 +00:00
lly
a91addb716
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-14 07:30:47 +00:00
lly
396c6a3bc5
ble_mesh: stack: Move ble scan funcitons to a single file
2021-01-14 07:30:47 +00:00
lly
96182bdc43
ble_mesh: stack: Optimize handling received mesh adv packets
2021-01-14 07:30:47 +00:00
Chinmay Chhajed
4cfece437d
Bluedroid: Do not connect if peer BD_ADDR is same as own BD_ADDR.
2021-01-14 12:22:30 +05:30
Angus Gratton
73023f7ff7
Merge branch 'ci/increase_build_example_parallel_count' into 'release/v4.2'
...
ci: Add 1 parallel count for building example
See merge request espressif/esp-idf!11976
2021-01-14 14:33:26 +08:00
lly
bd0f520a95
ci: Add 1 parallel count for building example
2021-01-13 16:21:15 +08:00
Mahavir Jain
e5553b964d
Merge branch 'fix/esp_tls_add_warning_if_ca_chain_has_invalid_cert_v4.2' into 'release/v4.2'
...
esp_tls: Add warning if the CA chain provided contains invalid cert (v4.2)
See merge request espressif/esp-idf!11939
2021-01-12 23:26:32 +08:00
Supreet Deshpande
7453507d93
Secure boot v2: Fixes the issue of passing the flash calculated digest for ota verification.
2021-01-12 11:16:23 +00:00
Supreet Deshpande
b979dacc6c
Secure Boot v2: Fix the double padding of the image length during flash encryption
...
Fixes https://github.com/espressif/esp-idf/issues/6236
2021-01-12 11:16:23 +00:00
Island
21eac48ea0
Merge branch 'optimize/ble_mesh_miscellaneous_v4.2' into 'release/v4.2'
...
Optimize/ble mesh miscellaneous (v4.2)
See merge request espressif/esp-idf!11948
2021-01-12 19:13:08 +08:00
lly
fe6103c088
ble_mesh: stack: Move bt_mesh_rand to mesh_common.c
2021-01-11 19:26:49 +08:00
lly
f031dc6d29
ble_mesh: stack: Remove useless BT_DBG_ENABLED in a few files
2021-01-11 19:26:49 +08:00
lly
85de3a84e1
ble_mesh: Replace zephyr integer types with C99 types [Zephyr]
2021-01-11 19:26:46 +08:00
lly
3f361cc262
ble_mesh: stack: Update ARRAY_SIZE definition
2021-01-11 19:25:52 +08:00
Island
8f20b9dc8a
Merge branch 'feat/ble_mesh_multiple_nvs_namespace_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Provisioner supports multiple nvs namespaces (v4.2)
See merge request espressif/esp-idf!11935
2021-01-11 18:55:22 +08:00
Aditya Patwardhan
e33cfbaef9
esp_tls: Add warning if the CA chain provided contains one/more invalid
...
cert
2021-01-11 12:02:30 +05:30
Mahavir Jain
60a808372e
Merge branch 'feature/upgrade_mbedtls_to_v4.2' into 'release/v4.2'
...
mbedtls: upgrade to v2.16.9 release (v4.2)
See merge request espressif/esp-idf!11899
2021-01-11 14:01:11 +08:00
lly
3a1018f603
ble_mesh: ci: Add settings sdkconfig test files
2021-01-11 10:08:00 +08:00
lly
c5d9601e69
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:07:55 +08:00
Island
2aafcd9b1f
Merge branch 'feat/ble_mesh_provisioner_recv_hb_support_v4.2' into 'release/v4.2'
...
Feat/ble mesh provisioner recv hb support (v4.2)
See merge request espressif/esp-idf!11913
2021-01-08 18:30:35 +08:00
Morozov-5F
0e4f43ddde
secure boot v2: Fix crash if signature verification fails in app
...
sha_handle is "finished" when verify_secure_boot_signature() returns and
should be nulled out.
Alternative version of fix submitted in https://github.com/espressif/esp-idf/pull/6210
Closes https://github.com/espressif/esp-idf/pull/6210
Signed-off-by: Angus Gratton <angus@espressif.com>
2021-01-08 18:45:49 +11:00
Anton Maklakov
0c3c09e7ef
Merge branch 'bugfix/icmp_echo_test_v4.2' into 'release/v4.2'
...
CI: change icmp example test address to ci.espressif.cn (v4.2)
See merge request espressif/esp-idf!11903
2021-01-08 11:16:15 +08:00
lly
1efa401884
ble_mesh: ci: Add enabling hb recv sdkconfig file
2021-01-08 09:32:23 +08:00
lly
0432d11509
ble_mesh: stack: Provisioner supports receiving heartbeat
2021-01-08 09:32:23 +08:00
Marius Vikhammer
8c4839e9e6
CI: change icmp example test address
...
Use a server that is inside the great firewall of china for CI test.
This avoid issues due to proxies, network configs etc.
2021-01-07 14:49:29 +08:00
Mahavir Jain
ce72deea7f
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:15:42 +05:30
Marius Vikhammer
5e9783f4a6
hal: include pcnt_caps.h
...
Some HAL files depend on x_caps.h, but didnt explicitly include it
Fixes issue where only 4 PCNT (out of 8) could be used on ESP32
Closes https://github.com/espressif/esp-idf/issues/6366
2021-01-07 03:01:55 +00:00
Island
474224d668
Merge branch 'bugfix/ble_mesh_node_id_adv_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Fix Node ID adv with wrong timeout (v4.2)
See merge request espressif/esp-idf!11877
2021-01-06 17:08:21 +08:00
lly
53935d5933
ble_mesh: stack: Fix Node ID adv with wrong timeout
2021-01-06 05:33:41 +00:00
Jiang Jiang Jian
47aa7408f5
Merge branch 'bugfix/fix_tx_issue_after_esp_restart_v4.2' into 'release/v4.2'
...
components/bt: Shutdown Bluetooth before esp_restart. (V4.2)
See merge request espressif/esp-idf!11755
2021-01-06 12:32:33 +08:00
Jiang Jiang Jian
70ecd0e92c
Merge branch 'bugfix/btdm_blufi_send_custom_data_will_congested_after_connection_is_broken_v4.2' into 'release/v4.2'
...
component/bt: fix Blufi sends customer data will congested when connection is broken(backport v4.2)
See merge request espressif/esp-idf!11847
2021-01-06 12:29:44 +08:00
Jiang Jiang Jian
caddd5d9fa
Merge branch 'bugfix/fix_spp_vfs_dynamic_memory_bugs_v4.2' into 'release/v4.2'
...
component_bt/fix spp vfs demo crash when use dynamic memory[backport v4.2]
See merge request espressif/esp-idf!11726
2021-01-06 12:20:22 +08:00
David Cermak
c5b2252e03
esp-netif: Fix PPP netif event posting to include esp_netif data
...
Closes https://github.com/espressif/esp-idf/issues/6009
2021-01-04 16:41:25 +01:00
XieWenxiang
5da8c3f8de
component/bt: fix Blufi sends customer data will congested when connection is broken
2020-12-31 15:38:49 +08:00
Mahavir Jain
248857bf91
Merge branch 'fix/i2c_pm_lock_v4.2' into 'release/v4.2'
...
i2c: Acquire PM lock after acquiring mutex (v4.2)
See merge request espressif/esp-idf!11830
2020-12-31 12:33:36 +08:00
Mahavir Jain
6216f99265
Merge branch 'fix/wolfssl_domain_name_check_v4.2' into 'release/v4.2'
...
esp_tls_wolfssl : Add domain name check (v4.2)
See merge request espressif/esp-idf!11816
2020-12-30 21:48:31 +08:00
Sachin Parekh
14587e7e73
i2c: Acquire PM lock after acquiring mutex
2020-12-30 13:24:38 +05:30
David Cermak
9f9013c8c3
mdns: Allow resolve its own non-strict answers
...
the mDNS responder should not repeat questions when replying, however resolvers
must ignore these questions field if they are present. esp-idf mDNS
library does include questions in answering packets (thus not strictly
following the RFC6762) so the resolver did not correctly resolved
another instance host name.
Closes https://github.com/espressif/esp-idf/issues/6190
2020-12-29 19:05:11 +01:00
Aditya Patwardhan
076ad543fb
esp_tls_wolfssl : Add domain name check
2020-12-29 21:11:08 +05:30
Ivan Grokhotkov
24f98bf80b
Merge branch 'bugfix/crt_bundle_bad_md_v4.2' into 'release/v4.2'
...
esp_crt_bundle: allow weak hash algorithm for trusted certificate (backport v4.2)
See merge request espressif/esp-idf!11655
2020-12-28 22:30:16 +08:00
Ivan Grokhotkov
4360410107
Merge branch 'bugfix/tools_python_subprocess_capture_output_v4.2' into 'release/v4.2'
...
tools: Avoid subprocess.run(capture_output) argument for Python <3.7 compatibility (v4.2)
See merge request espressif/esp-idf!11506
2020-12-28 07:45:51 +08:00
Jiang Jiang Jian
68095a65ac
Merge branch 'bugfix/bt_bluedroid_same_public_key_attack_v4.2' into 'release/v4.2'
...
Bluedroid: Fixes for some Bluetooth vulnerabilities. (v4.2)
See merge request espressif/esp-idf!11763
2020-12-25 23:35:15 +08:00
Chinmay Chhajed
235628355f
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:11 +05:30
baohongde
d694036789
components/bt: Shutdown Bluetooth before esp_restart.
2020-12-25 14:06:22 +08:00