Commit graph

6774 commits

Author SHA1 Message Date
Angus Gratton
42739580e4 Merge branch 'feature/add_psram_workaround_option_3.1' into 'release/v3.1'
make psram workaround depend on chip revison (v3.1)

See merge request espressif/esp-idf!6210
2019-10-10 11:00:56 +08:00
Jiang Jiang Jian
35f3554109 Merge branch 'feature/bluedroid_min_encr_key_size_backport_v3.1' into 'release/v3.1'
BT/Bluedroid : Add support to set min encryption key requirement (Backport v3.1)

See merge request espressif/esp-idf!6258
2019-10-09 16:15:47 +08:00
Prasad Alatkar
882dfb5f97 BT/Bluedroid : Add support to set min encryption key requirement (Backport v3.1)
- Backport(v3.1) of IDF MR!6122
- Modifies `smp_utils.c` to add check on encryption key size received from
  peer.
- Modifies `esp_ble_gap_set_security_param` API to add minimum encryption key
  size requirement.
2019-10-09 16:15:47 +08:00
Jiang Jiang Jian
f5b9366999 Merge branch 'bugfix/multi_heap_printf_backport_v3.1' into 'release/v3.1'
heap: Fix printf usage in heap poisoning (backport v3.1)

See merge request espressif/esp-idf!6089
2019-09-29 16:17:29 +08:00
Jiang Jiang Jian
704e2f4a8c Merge branch 'bugfix/btdm_a2dp_sink_media_suspend_cmd_unack_for_v3.1' into 'release/v3.1'
bugfix/btdm_a2dp_sink_media_suspend_cmd_unack_for_v3.1(backport v3.1)

See merge request espressif/esp-idf!5938
2019-09-29 16:17:05 +08:00
Jiang Jiang Jian
7a7f2c9110 Merge branch 'bugfix/btdm_backports_v3.1_0903' into 'release/v3.1'
components/bt: backports release/v3.1 0903

See merge request espressif/esp-idf!5989
2019-09-29 16:16:43 +08:00
Jiang Jiang Jian
1387ecef6c Merge branch 'bugfix/fix_cache_disable_access_psram_v3.1' into 'release/v3.1'
esp_wifi: Put g_promis_buf to IRAM (backport v3.1)

See merge request espressif/esp-idf!6164
2019-09-29 10:35:22 +08:00
suda-morris
b64bda7e4e make psram workaround depend on chip revison
Since ESP32 revision 3, the PSRAM workaround is not needed.
2019-09-26 17:32:20 +08:00
Jiang Jiang Jian
83458426ac Merge branch 'bugfix/fix_the_for_smartconfig_send_broadcast_to_phone_v3.1' into 'release/v3.1'
fix the bugs in smartconfig_ack (backport v3.1)

See merge request espressif/esp-idf!6075
2019-09-25 12:00:41 +08:00
baohongde
f48dbc09ae components/bt: backports release/v3.1 0903
Remove xtensa/xruntime.h
Fix sending Lmp_feature_req_ext in a loop
Fix 2 bugs in r_ld_fm_sket_isr
fix memory leak when set tx power
fix data loss and send same pkt twice sometimes
fix adv data error in air sometimes
fix adv start/stop crash sometimes
bugfix btdm sleep twice after wakeup request
Fix connect fail with some speakers
clear BT/BLE interruots after controller disable
2019-09-23 17:41:58 +08:00
Angus Gratton
abf766af80 Merge branch 'feature/add_chip_min_revision_3.1' into 'release/v3.1'
support esp32 eco revision 2 and 3 (v3.1)

See merge request espressif/esp-idf!6138
2019-09-20 18:22:32 +08:00
xiehang
e07f7c4456 esp_wifi: Put g_promis_buf to IRAM 2019-09-19 20:37:07 +08:00
suda-morris
c0a5cb07cd support esp32 eco revision 2 and 3 2019-09-19 17:09:37 +08:00
Angus Gratton
d6e333f014 Merge branch 'bugfix/bootloader_factory_reset_with_wake_up_from_deep_sleep_v3.1' into 'release/v3.1'
bootloader: Blocking the Factory reset during wake up from deep sleep (v3.1)

See merge request espressif/esp-idf!6025
2019-09-16 15:10:50 +08:00
Angus Gratton
06a453e18a Merge branch 'bugfix/use_local_kconfiglib_v3.1' into 'release/v3.1'
Use kconfiglib from $IDF_PATH/tools/kconfig_new (v3.1)

See merge request espressif/esp-idf!6082
2019-09-13 14:48:16 +08:00
Angus Gratton
f8798d686d Merge branch 'bugfix/add_flash_config_in_app_startup_v3.1' into 'release/v3.1'
bugfix(flash): add flash config in app startup (backport v3.1)

See merge request espressif/esp-idf!5925
2019-09-13 14:32:02 +08:00
KonstantinKondrashov
01d17d8694 bootloader: Factory reset not for deep sleep
Closes: https://github.com/espressif/esp-idf/issues/3800

Closes: IDFGH-1536
2019-09-12 22:12:25 +08:00
Darian Leung
4b05708daf heap: Fix printf usage in heap poisoning
This commit fixes the bug where printf() is used in
verify_allocated_region() when ets_printf() should be used.
2019-09-12 19:27:19 +08:00
Jiang Jiang Jian
2c780ab1cc Merge branch 'bugfix/coex_bb_reset_lock_v3.1' into 'release/v3.1'
fix bug that wifi start/stop may cause crash

See merge request espressif/esp-idf!6033
2019-09-12 10:46:31 +08:00
Roland Dobai
b7529b8a85 Use kconfiglib from $IDF_PATH/tools/kconfig_new 2019-09-11 14:42:05 +02:00
Tian Hao
a815e3ede2 fix bug that wifi start/stop may cause crash
1. fix bug bb reset lock flag to avoid bb reset lock unhandle,
   may cause assert in vPortCPUReleaseMutexIntsDisabledInternal.
2. fix bug wifi reset mac cause task watch dog timeout
3. fix bug wifi reset mac position
2019-09-11 20:34:02 +08:00
chenjianqiang
9eb8a740a3 esp32: cpu_start: read binary image header via cache
When flash encryption is enabled, reading via cache also decrypts the
data, whereas spi_flash_read does not.
2019-09-11 15:53:46 +08:00
chenjianqiang
7904cae9c1 bugfix(flash): add flash config in app startup
We fixed some flash bugs in bootloader, but for the users used the old
vrsion bootloader, they can not fix these bugs via OTA, the solution is
add these updates in app startup.

These updates include:
1. SPI flash gpio matrix and drive strength configuration
2. SPI flash clock configuration
3. SPI flash read dummy configuration
4. SPI flash cs timing configuration
5. Update flash id of g_rom_flashchip
2019-09-11 15:37:18 +08:00
zhangyanjiao
8af11f1f89 smartconfig_ack.c:
1. fix the bug that ESP32 sends broadcast to phone after smartconfig is done
2. fix the declaration of remote_ip in sc_ack_send_task()
2019-09-11 14:20:26 +08:00
Angus Gratton
7648859a27 Merge branch 'bugfix/flash_encryption_disable_plaintext_v3.1' into 'release/v3.1'
flash encryption: Add config option to disable any plaintext reflashes (3.1)

See merge request espressif/esp-idf!6049
2019-09-11 12:10:18 +08:00
Angus Gratton
a4ce828d40 flash encryption: Add config option to disable any plaintext reflashes
Enabled by default when Secure Boot is on, so Flash Encryption protection
is always available in case of a Secure Boot bypass.
2019-09-10 14:29:20 +10:00
Jiang Jiang Jian
a80ec4787e Merge branch 'bugfix/fix_the_bug_for_WPA_WPA2_PSK_connection_fail_v3.1' into 'release/v3.1'
fix the bug for WPA_WPA2_PSK connection fail (backport v3.1)

See merge request espressif/esp-idf!6011
2019-09-10 09:49:01 +08:00
Sagar Bijwe
0449ba7f91 docs: Added more wordings to capture secure boot and flash encryption dependency. 2019-09-10 10:11:44 +10:00
zhangyanjiao
7840d64d2e fix the bug that STA fails to connect WPA_WPA2_PSK Apple AP 2019-09-06 14:24:32 +08:00
Jiang Jiang Jian
b45ed8719c Merge branch 'bugfix/revert_optimize_wifi_rx_v3.1' into 'release/v3.1'
esp32: revert WiFi RX optimization (backport v3.1)

See merge request espressif/esp-idf!5942
2019-08-30 10:59:37 +08:00
liu zhifu
87304cbcf4 esp32: revert WiFi RX optimization
Revert following commit since it has compatibility issue:
commit 71f1b7f424
esp32: optimize wifi rx
2019-08-29 11:06:33 +08:00
wangmengyang
7942604c22 bugfix that call of esp_a2d_media_ctrl(ESP_A2D_MEDIA_CTRL_SUSPEND) will not get an ACK from callback on A2DP sink 2019-08-28 15:52:09 +08:00
Jiang Jiang Jian
c86be32b6d Merge branch 'bugfix_kconfig_deps_missing_v3.1' into 'release/v3.1'
kconfig: Add -MP option so .d files include empty targets (v3.1)

See merge request espressif/esp-idf!5849
2019-08-27 14:04:18 +08:00
Angus Gratton
a3d232f053 Merge branch 'test/use_correct_config_for_nvs_compatible_case_v3.1' into 'release/v3.1'
test: fix nvs compatible case error (backport v3.1)

See merge request espressif/esp-idf!5892
2019-08-27 13:30:35 +08:00
Jiang Jiang Jian
7e538b88fb Merge branch 'update/cjson_v1_7_12_v3.1' into 'release/v3.1'
Update cJSON to v1.7.12 (v3.1)

See merge request espressif/esp-idf!5853
2019-08-26 18:29:52 +08:00
Jiang Jiang Jian
e8f65b958d Merge branch 'bugfix/fix_i2s_channels_swapped_issue_v3.1' into 'release/v3.1'
Bugfix(i2s): fixed i2s left/right channels swapped issue for v3.1.

See merge request espressif/esp-idf!5897
2019-08-26 18:29:37 +08:00
Jiang Jiang Jian
87b9f2f660 Merge branch 'bugfix/fix_the_bug_for_softap_set_authmode_v3.1' into 'release/v3.1'
wifi: fix the bug for softAP set authmode (backport v3.1)

See merge request espressif/esp-idf!5827
2019-08-26 18:29:18 +08:00
Jiang Jiang Jian
56bb35d9fe Merge branch 'bugfix/btdm_security_vulnerability_on_encryption_key_size_v3.1' into 'release/v3.1'
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link

See merge request espressif/esp-idf!5874
2019-08-26 18:01:51 +08:00
He Yin Ling
2edb9c4761 test: fix integration test jobs not executed:
naming rule for parallel test job config file is different.
rename test job config file to make it unified.
2019-08-26 15:15:25 +08:00
redchenjs
61b585ab41 Bugfix(i2s): fixed i2s left/right channels swapped issue for v3.1.
The right channel data is in the high position, so the I2S_TX_MSB_RIGHT & I2S_RX_MSB_RIGHT bits should be set.
2019-08-26 13:55:05 +08:00
He Yin Ling
725eba3378 test: fix nvs compatible case error:
use new env tag for nvs compatible test case and update test config
file.
2019-08-26 09:33:19 +08:00
zhangyanjiao
4bf4384846 wifi: fix the bug for softAP set authmode 2019-08-23 16:40:40 +08:00
wangmengyang
4db0d07177 components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link for preventing KNOB attack.
This patch is to address the CVE-2019-9506 vulnerability.
2019-08-23 08:31:23 +08:00
Angus Gratton
58dc5049a5 Update cJSON to v1.7.12
Fixes potential DoS in cJSON_Minify, see https://github.com/DaveGamble/cJSON/issues/354
2019-08-21 18:59:06 +10:00
Angus Gratton
4db6f0721c kconfig: Add -MP option so .d files include empty targets
Prevents make-level errors when switching IDF versions, as headers may be removed.

Similar to some mentioned here:
https://github.com/espressif/esp-idf/issues/712
2019-08-21 18:39:19 +10:00
Wang Jia Lin
fd0ecca4c9 Merge branch 'bugfix/fix_flash_read_error_in_dio_mode_v3.1' into 'release/v3.1'
bugfix(flash): add spi dio address bitlen configure in psram init (backport v3.1)

See merge request espressif/esp-idf!5784
2019-08-21 16:18:53 +08:00
chenjianqiang
f21f5fd45b bugfix(flash): add spi dio address bitlen configure in psram init 2019-08-14 21:30:58 +08:00
Angus Gratton
9196bc7a53 Merge branch 'bugfix/supplicant_security_fixes_v3.1' into 'release/v3.1'
wpa_supplicant: Fix sprintf security bugs. (v3.1)

See merge request espressif/esp-idf!5466
2019-08-13 09:28:33 +08:00
Sagar Bijwe
da3239c336 wpa_supplicant: Fix sprintf security bugs.
Revert back to using os_snprintf instead of sprintf.

Closes WIFI-624
2019-08-12 06:30:02 +00:00
Jiang Jiang Jian
b94341c4e0 Merge branch 'bugfix/fix_wifi_bugs_for_authmode_and_multi_ssid_v3.1' into 'release/v3.1'
fix wifi bugs for authmode and multi ssid (backport v3.1)

See merge request espressif/esp-idf!5730
2019-08-11 17:07:48 +08:00