Island
8ef0b66a3b
Merge branch 'bugfix/ble_mesh_compile_error_o2' into 'master'
...
ble_mesh: Fix compile error when -O2 (performance) is chosen
Closes BLEMESH-187
See merge request espressif/esp-idf!8217
2020-04-28 17:29:09 +08:00
Jiang Jiang Jian
1b5c42b9b0
Merge branch 'bugfix/supplicant_log_enable_issue' into 'master'
...
wpa_supplicant: Minor bugfix with wpa_supplicant debug logs.
See merge request espressif/esp-idf!8397
2020-04-28 16:29:19 +08:00
Jiang Jiang Jian
528edf85cd
Merge branch 'bugfix/pmf_cert_fixes' into 'master'
...
esp_wifi: Update wifi lib
Closes WIFI-2251
See merge request espressif/esp-idf!8468
2020-04-28 14:41:12 +08:00
Jiang Jiang Jian
2dc4bfe782
Merge branch 'bugfix/supplicant_disable_tls_v1.2' into 'master'
...
wpa_supplicant: Disable TLSv1.2 by default
See merge request espressif/esp-idf!8534
2020-04-28 14:18:35 +08:00
Nachiket Kukade
59e8e407a0
wpa_supplicant: Disable TLSv1.2 by default
...
Some Enterprise Authentication Servers do not support TLS v1.2.
Move this option to Menuconfig and disable by default.
2020-04-28 10:05:35 +05:30
Jiang Jiang Jian
df5cead7e6
Merge branch 'fixbug/tcp_kill_state_assert' into 'master'
...
lw-ip:fixbug for tcp kill state assert
Closes WIFI-2195
See merge request espressif/esp-idf!8449
2020-04-28 11:43:29 +08:00
Mahavir Jain
4a558131ea
Merge branch 'bugfix/http_client_read' into 'master'
...
Fix error handling in esp_http_client_read and esp_https_ota_perform
Closes IDFGH-2916 and IDF-1516
See merge request espressif/esp-idf!8166
2020-04-28 06:07:15 +08:00
Nachiket Kukade
f9970b8e29
esp_wifi: Update wifi lib
...
PMF Certification fixes -
1. Check return status of decrypt operation. Fixes 5.3.3.1.
2. Allow PMF negotiation for WPA2-Enterprise. Fixes 5.3.3.2, 5.3.3.4.
3. Add NULL check on key before encrypting PMF, fixes crash.
Closes WIFI-2251
2020-04-27 13:32:09 +00:00
Krzysztof Budzynski
c5c026557e
Merge branch 'doc/hmac_S2' into 'master'
...
Doc: Documentation for HMAC module
See merge request espressif/esp-idf!8383
2020-04-27 19:03:01 +08:00
Jiang Jiang Jian
17d7f3cb17
Merge branch 'fixbug/set_dhcp_time_fail' into 'master'
...
lw-ip:fixbug for set dhcp time fail
Closes WIFI-2152
See merge request espressif/esp-idf!8374
2020-04-27 16:48:34 +08:00
Anton Maklakov
3029ab343b
Merge branch 'test/ci_disable_ut_s2_wo_label' into 'master'
...
ci: disable the UT for S2 when label is not used
See merge request espressif/esp-idf!8480
2020-04-27 16:35:45 +08:00
Jiang Jiang Jian
a559bf51ff
Merge branch 'bugfix/ble_mesh_time_scene_wrong_name' into 'master'
...
ble_mesh: Fix time scene wrong macro name
See merge request espressif/esp-idf!8331
2020-04-27 16:19:49 +08:00
lly
fab9b944a4
ble_mesh: Add length check for some mesh operations
2020-04-27 14:24:07 +08:00
lly
c77b7394ed
ble_mesh: Fix compile error when -O2 (performance) is chosen
2020-04-27 14:24:07 +08:00
Angus Gratton
9300615a13
Merge branch 'bugfix/heap_psram_fill' into 'master'
...
heap: Only fill new heaps with FREE_FILL_PATTERN if Comprehensive poisoning is on
See merge request espressif/esp-idf!8210
2020-04-27 14:20:41 +08:00
Shubham Kulkarni
21c2019973
esp_https_ota.c: Add fix to return failure if (-1) is returned from esp_http_client_read
...
Closes https://github.com/espressif/esp-idf/issues/4960
2020-04-27 05:17:04 +00:00
Shubham Kulkarni
4c166085fb
esp_http_client.c: In esp_http_client_read, add fix to return (-1) if esp_transport_read fails
2020-04-27 05:17:04 +00:00
Angus Gratton
3845b002b8
Merge branch 'bugfix/esp32s2_iram_dram_disable_tests' into 'master'
...
esp32s2: disable memprot for all CI tests (temporary)
See merge request espressif/esp-idf!8484
2020-04-27 13:16:44 +08:00
Michael (XIAO Xufeng)
9d98111652
Merge branch 'bugfix/spi_bus_lock_missing_semphrstatic' into 'master'
...
spi: fix config break and reduce overhead of the bus lock on SPI1
Closes IDFGH-3017
See merge request espressif/esp-idf!8221
2020-04-27 12:57:19 +08:00
Jakob Hasse
2da7e65646
Doc: S2 HMAC documentation
2020-04-27 12:25:46 +08:00
lly
75cf2d7a17
ble_mesh: Fix time scene wrong macro name
2020-04-27 04:17:04 +00:00
Island
feb7f9683c
Merge branch 'bugfix/ble_mesh_add_missing_cpp' into 'master'
...
ble_mesh: Add missing #ifdef __cplusplus
Closes BLEMESH-194
See merge request espressif/esp-idf!8310
2020-04-27 11:47:44 +08:00
Island
1e12673b3c
Merge branch 'feat/ble_mesh_sensor_model_example' into 'master'
...
ble_mesh: Add ble mesh sensor model examples
Closes BLEMESH-190
See merge request espressif/esp-idf!8253
2020-04-27 11:47:06 +08:00
Island
71dc5eb276
Merge branch 'doc/ble_mesh_fixes' into 'master'
...
doc: Fix some ble mesh description
Closes BLEMESH-189
See merge request espressif/esp-idf!8240
2020-04-27 11:43:48 +08:00
Island
32cfcc77ed
Merge branch 'bugfix/ble_mesh_use_sdkconfig_ci' into 'master'
...
ble_mesh: Add bluedroid and nimble example configurations
See merge request espressif/esp-idf!8172
2020-04-27 11:41:26 +08:00
Island
043a54c24e
Merge branch 'bugfix/ble_mesh_rpl_list_size' into 'master'
...
ble_mesh: Associate replay protection list size with nodes count
See merge request espressif/esp-idf!8014
2020-04-27 11:35:36 +08:00
Martin Vychodil
c9d2ad0ce5
esp32s2: disable memprot for all CI tests (temporary)
2020-04-26 22:38:53 +02:00
Michael (XIAO Xufeng)
ac63760ded
ci: disable the UT for S2 when label is not used
2020-04-26 16:29:49 +08:00
lly
91d70cd128
ble_mesh: Add missing #ifdef __cplusplus
2020-04-26 06:50:35 +00:00
lly
77bb7806a0
ble_mesh: Fix client local parameters not initialized
2020-04-26 06:25:08 +00:00
lly
713581ae87
ble_mesh: Continue node info restore even if failure happens
...
During BLE Mesh Provisioner initialization, the stack will restore
the nodes information if settings storage is enabled.
Previously when a failure happens (e.g. found the same uuid) during
the restore procedure, the information of the following nodes will
not be restored and error will be directly returned.
But this will introduce some problem with user experience, because
some newly provisioned nodes information will not be restored and
Provisioner will not be able to control those nodes.
So we change the operation here, when a failure happens during the
restore procedure, Provisioner will only ignore the information of
the current node and continue restoring other nodes information.
2020-04-26 06:25:08 +00:00
lly
73804ef4d3
ble_mesh: Remove some redundant functions
2020-04-26 06:25:08 +00:00
lly
f37bc1a515
ble_mesh: Notify unprovisioned device beacon to application layer
...
With this change, if a Provisioner has provisioned the maximum
number of nodes, it can still report the unprovisioned device
beacon from other nodes to the application layer. And this will
be more reasonable compared with the previous implementation.
Previously when the node array of Provisioner is full, no beacon
from unprovisioned devices will be reported, only some warning
logs will be given.
2020-04-26 06:25:08 +00:00
lly
88b0cd918a
ble_mesh: Check if assigned node address is duplicated
...
Previously only check the node address when it is assigned by the
application layer. Here we also check the address when the address
is allocated internally. And this will be useful when some mesh
internal tests are performed.
2020-04-26 06:25:08 +00:00
lly
7486616382
ble_mesh: Update next alloc address when node info is added
2020-04-26 06:25:08 +00:00
lly
a4d9259912
ble_mesh: Fix Provisioner provisioning deadlock
2020-04-26 06:25:08 +00:00
lly
8d57ebf57d
ble_mesh: Remove BLE_MESH_MAX_STORED_NODES option
...
Previously the BLE_MESH_MAX_STORED_NODES option is added for
internal mesh test, which will be a little confusing for the
users to understand.
Here we remove this option, instead the BLE_MESH_MAX_PROV_NODES
will be used for all the cases. For mesh internal test, when
the test function is called to add some nodes info, the info
will be stored in the array of provisioned nodes directly.
2020-04-26 06:25:08 +00:00
lly
ec2324edbe
ble_mesh: Associate replay protection list size with nodes count
...
The replay protection list of Provisioner should be at least equal
to the number of nodes with the precondition that each node contains
only one element.
The help information of replay protection list is updated, and the
maximum number of nodes for Provisioner is adjusted based on the
replay protection list size.
2020-04-26 06:25:08 +00:00
lly
2f6a4140fa
doc: Fix some ble mesh description
2020-04-26 06:22:33 +00:00
lly
fa40a1a0c7
ble_mesh: Add bluedroid and nimble example configurations
2020-04-26 06:12:22 +00:00
lly
2f28c97f06
ble_mesh: Add ble mesh sensor model examples
2020-04-26 06:08:44 +00:00
lly
e8c5f5dc03
ble_mesh: Add some common macros for sensor model
2020-04-26 06:08:44 +00:00
lly
361dd8b29c
ble_mesh: Allow empty sensor series column value
2020-04-26 06:08:44 +00:00
lly
561191d50f
ble_mesh: Check if same sensor (settings) property id exists
2020-04-26 06:08:44 +00:00
lly
3862f0e784
ble_mesh: Allow empty sensor settings exist
2020-04-26 06:08:44 +00:00
Angus Gratton
017f07cda7
Merge branch 'feature/flash_encryption_esp32s2' into 'master'
...
feature/flash_encryption_esp32s2: Enable flash encryption mechanism to esp32s2 chips
Closes IDF-804
See merge request espressif/esp-idf!8109
2020-04-25 12:28:21 +08:00
Angus Gratton
bb0a95b17c
spi_flash s2: Fix encrypted writes when legacy implementation disabled
...
ROM function didn't use correct Addr bitlen if legacy was disabled on ESP32-S2
2020-04-24 12:43:47 -03:00
Angus Gratton
dbdce93d23
spi_flash: Use per-chip flash_ops files for legacy API
...
Looks like when ESP32-S2 Beta support was merged, the separate files
were dropped by accident.
2020-04-24 12:43:47 -03:00
Felipe Neves
95bc186846
flash_encryption: Fix next spi boot crypt counter value after a plaintext flash
2020-04-24 12:43:47 -03:00
Felipe Neves
f7ccc081a5
flash_encryption: replace spi crypt count efuse burning function by a esp_efuse_API
...
flash_encryption: modify additional efuses burning method to fix them are not being written
flass_encryption: burn efuse to disable boot from RAM space
flash_encryption: added better checking for key generation state plus set read and write protect for them
soc esp32s2: Add register-level bit definitions for read & wrote protect bits
esp32s2: Fixes for flash encryption
- Write efuses in a batch
- Fix some detection of whether existing efuse blocks are read/write protected
2020-04-24 12:43:47 -03:00