Angus Gratton
d3e562907f
Merge branch 'feature/add_chip_min_revision_3.2' into 'release/v3.2'
...
support esp32 eco revision 2 and 3 (v3.2)
See merge request espressif/esp-idf!6133
2019-09-20 18:13:58 +08:00
suda-morris
eb4c8d9991
support esp32 eco revision 2 and 3
2019-09-19 17:05:08 +08:00
Angus Gratton
b1ee664367
Merge branch 'bugfix/bootloader_factory_reset_with_wake_up_from_deep_sleep_v3.2' into 'release/v3.2'
...
bootloader: Blocking the Factory reset during wake up from deep sleep (v3.2)
See merge request espressif/esp-idf!6024
2019-09-16 15:11:38 +08:00
Angus Gratton
ee5604cad0
Merge branch 'bugfix/dis_interrupts_up_to_6_level_for_dport_wa_v3.2' into 'release/v3.2'
...
esp32: Dis interrupts up to 5 lvl for DPORT (v3.2)
See merge request espressif/esp-idf!5714
2019-09-16 15:11:33 +08:00
Angus Gratton
88d8e93223
Merge branch 'update/cjson_v1_7_12_v3.2' into 'release/v3.2'
...
Update cJSON to v1.7.12 (v3.2)
See merge request espressif/esp-idf!5852
2019-09-16 08:20:59 +08:00
Angus Gratton
43def55de8
Merge branch 'bugfix/use_local_kconfiglib_v3.2' into 'release/v3.2'
...
Use kconfiglib from $IDF_PATH/tools/kconfig_new (v3.2)
See merge request espressif/esp-idf!6081
2019-09-13 14:48:04 +08:00
Mahavir Jain
62f201b4bd
Merge branch 'bugfix/http_header_parser_resolution_v3.2' into 'release/v3.2'
...
(backport v3.2) esp_http_server : Bugfix in parsing of empty header values
See merge request espressif/esp-idf!6040
2019-09-13 13:42:16 +08:00
KonstantinKondrashov
2b22f3e853
app_update: Fix UTs for FACTORY_RESET and APP_TEST
2019-09-12 22:07:05 +08:00
KonstantinKondrashov
70954c0b3e
bootloader: Factory reset not for deep sleep
...
Closes: https://github.com/espressif/esp-idf/issues/3800
Closes: IDFGH-1536
2019-09-12 22:07:05 +08:00
Konstantin Kondrashov
69be477885
esp32: Add UTs for DPORT and Hi-interrupt
2019-09-12 13:47:48 +00:00
Konstantin Kondrashov
76f97f3abd
esp32: Dis interrupts up to 5 lvl for DPORT
...
Disable interrupts for both DPORT workarounds up to 5 lvl.
Closes: https://esp32.com/viewtopic.php?f=2&t=10981&sid=d125cec233070ed4d2c5410bf5d3d74a
Closes: IDF-728
2019-09-12 13:47:48 +00:00
Roland Dobai
544e9831e8
Use kconfiglib from $IDF_PATH/tools/kconfig_new
2019-09-11 14:40:57 +02:00
Chinmay
fa952e5d30
esp_http_server : Bugfix in parsing of empty header values
...
This MR is intended to fix incorrect parsing of HTTP requests when empty header values are present.
The issue is was due to asymmetric behavior of `http_parser` library, which in case of:
* non-empty header values : invokes callbacks with the pointer to the start of a value
* empty header values : invokes callbacks with pointer to the start of next header or section
Since HTTP server relies on this pointer (along with length of the value) to locate the end of a value, and replace the line terminators (CRLFs) with null characters, the second case needed to be handled correctly.
Closes IDFGH-1539
Closes https://github.com/espressif/esp-idf/issues/3803
Backports !5663
2019-09-09 08:57:29 +00:00
Jiang Jiang Jian
ca1e5e5bc5
Merge branch 'bugfix/fix_the_bug_for_WPA_WPA2_PSK_connection_fail_v3.2' into 'release/v3.2'
...
fix the bug for WPA_WPA2_PSK connection fail(backport v3.2)
See merge request espressif/esp-idf!6007
2019-09-06 11:44:09 +08:00
zhangyanjiao
23b3d97099
1. fix the bug that STA fails to connect WPA_WPA2_PSK Apple AP
...
2. fix the bug for softAP set authmode
2019-09-05 20:08:52 +08:00
Angus Gratton
0a0f5a3bdc
Merge branch 'bugfix/flash_encryption_disable_plaintext_v3.2' into 'release/v3.2'
...
flash encryption: Add config option to disable any plaintext reflashes (v3.2)
See merge request espressif/esp-idf!5998
2019-09-05 17:26:04 +08:00
Angus Gratton
ec331b3979
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-05 18:54:29 +10:00
Angus Gratton
73e040e584
Merge branch 'test/use_correct_config_for_nvs_compatible_case_v3.2' into 'release/v3.2'
...
test: fix nvs compatible case error (backport v3.2)
See merge request espressif/esp-idf!5893
2019-09-05 16:51:30 +08:00
Angus Gratton
d1f40c15ac
Merge branch 'bugfix/fix_i2s_channels_swapped_issue_v3.2' into 'release/v3.2'
...
Bugfix(i2s): fixed i2s left/right channels swapped issue for release/v3.2.
See merge request espressif/esp-idf!5898
2019-09-03 13:36:29 +08:00
Jiang Jiang Jian
7718234acc
Merge branch 'bugfix/coex_bb_reset_lock_v3.2' into 'release/v3.2'
...
fix bug that wifi start/stop may cause crash
See merge request espressif/esp-idf!5969
2019-09-02 14:26:03 +08:00
Tian Hao
01cd149cb7
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-08-30 22:13:01 +08:00
Angus Gratton
7dd4923190
Merge branch 'bugfix/httpd_sess_close_v3.2' into 'release/v3.2'
...
httpd_sess_close: Check for session validity before closing (v3.2)
See merge request espressif/esp-idf!5744
2019-08-29 10:29:41 +08:00
Jiang Jiang Jian
1fab985f63
Merge branch 'bugfix/btdm_security_vulnerability_on_encryption_key_size_v3.2' into 'release/v3.2'
...
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link
See merge request espressif/esp-idf!5873
2019-08-26 18:01:01 +08:00
redchenjs
548844b5cc
Bugfix(i2s): fixed i2s left/right channels swapped issue for release/v3.2.
...
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 14:02:27 +08:00
He Yin Ling
9bc71370b7
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 14:01:34 +08:00
He Yin Ling
66118ab580
test: fix nvs compatible case error:
...
use new env for nvs compatible test case and update test config
2019-08-26 09:36:32 +08:00
wangmengyang
fae3bad007
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:30:23 +08:00
Ivan Grokhotkov
48e5dcd9b5
Merge branch 'power_management/i2s+i2c-v3.2' into 'release/v3.2'
...
Power management/i2s+i2c (backport v3.2)
See merge request espressif/esp-idf!5863
2019-08-22 23:29:52 +08:00
Angus Gratton
d609daf0cd
Merge branch 'fix/sdio_slave_reset_infloop_leak_3.2' into 'release/v3.2'
...
sdio_slave: fix the send_flush infinite loop issue (backport v3.2)
See merge request espressif/esp-idf!5835
2019-08-22 13:38:12 +08:00
Sachin Parekh
eeb9a0359c
PM: I2S and I2C added in the Power Management docs
...
Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
2019-08-21 18:15:51 +05:30
Sachin Parekh
4cdf488de8
I2S: Enable Power Management locks
...
Acquires PM_APB_FREQ_MAX lock when carrying any transaction on I2S if
Power Management Framework is enabled.
Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
2019-08-21 18:15:41 +05:30
Sachin Parekh
c56f147d48
I2C: Enable Power Management locks
...
Acquires PM_APB_FREQ_MAX lock when carrying any transaction on I2C if
Power Management Framework is enabled.
Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
2019-08-21 18:15:29 +05:30
Angus Gratton
1d953831bd
Update cJSON to v1.7.12
...
Fixes potential DoS in cJSON_Minify, see https://github.com/DaveGamble/cJSON/issues/354
2019-08-21 18:58:37 +10:00
Michael (XIAO Xufeng)
a393bb6f1b
sdio_slave: fix the send_flush infinite loop issue
...
Also add some helper functions.
2019-08-20 17:00:21 +08:00
Angus Gratton
ad565f27f7
Merge branch 'bugfix/fix_flash_read_error_in_dio_mode_v3.2' into 'release/v3.2'
...
bugfix(flash): add spi dio address bitlen configure in psram init (backport v3.2)
See merge request espressif/esp-idf!5787
2019-08-15 15:43:31 +08:00
chenjianqiang
3bf6c5b604
bugfix(flash): add spi dio address bitlen configure in psram init
2019-08-15 10:34:04 +08:00
Jiang Jiang Jian
90747cc8b3
Merge branch 'bugfix/fix_wifi_bugs_for_authmode_and_multi_ssid_v3.2' into 'release/v3.2'
...
fix wifi bugs for authmode and multi ssid (backport v3.2)
See merge request espressif/esp-idf!5729
2019-08-11 17:14:53 +08:00
Angus Gratton
feeb22bdbe
Merge branch 'bugfix/hwcrypt_fault_inj_v3.2' into 'release/v3.2'
...
AES & SHA fault injection checks (backport v3.2)
See merge request espressif/esp-idf!5740
2019-08-11 14:04:22 +08:00
Angus Gratton
91451d31be
sha: Add fault injection checks reading hash digest state
...
Vulnerability reported by LimitedResults under Espressif Bug Bounty Program.
2019-08-11 13:19:21 +10:00
Angus Gratton
8fe9e4b09f
aes: Add fault injection checks when writing key to hardware
...
Vulnerability reported by LimitedResults under Espressif Bug Bounty Program.
2019-08-11 13:19:21 +10:00
Angus Gratton
910cede38d
hwcrypto: Add AES fault injection check
...
Hardware AES-CBC performance changes:
Release config 11.0MB/sec -> 10.8MB/sec
Debug config 9.4MB/sec -> 9.8MB/sec
(Unrolling the loop to optimize the check improves
performance at -Og, even with the fault check.)
2019-08-11 13:19:21 +10:00
Piyush Shah
107d927547
httpd_sess_close: Check for session validity before closing
...
If httpd_sess_trigger_close() gets called twice for the same socket,
the first httpd_sess_close() cb closes the correct socket, but the second
invocation closes the wrong socket which was just accepted and added to
the socket db. Checking for the lru counter will help identify this as the
counter is set only for requests actually served.
2019-08-09 14:58:28 +05:30
Jiang Jiang Jian
f023bf52c9
Merge branch 'bugfix/btdm_backports_v3.2_0808' into 'release/v3.2'
...
components/bt: Backport 3 bugfixs into release v3.2
See merge request espressif/esp-idf!5723
2019-08-09 14:02:48 +08:00
baohongde
dc1db1c4e7
components/bt: Backport 3 bugfixs into release v3.2
...
1. Bugfix btdm sleep twice after wakeup request
2. Fix connect fail duo to loop of send extended feature request
3. Clear BT/BLE interrupts after controller_disable to overwrite the default non-zero value of intcntl registers
2019-08-09 03:04:40 +00:00
Jiang Jiang Jian
db898de8fb
Merge branch 'bugfix/lwip_prefer_allocate_memory_in_psram_v3.2' into 'release/v3.2'
...
Try to allocate some Lw-ip memories in SPIRAM first. If failed, try to allocate in internal RAM then.(Backport v3.2)
See merge request espressif/esp-idf!5719
2019-08-09 10:56:54 +08:00
Jiang Jiang Jian
d657a679a2
Merge branch 'feature/move_gettimeofday_in_clock_gettime_v3.2' into 'release/v3.2'
...
newlib: Move _gettimeofday_r call in clock_gettime (v3.2)
See merge request espressif/esp-idf!5718
2019-08-08 22:02:43 +08:00
zhangyanjiao
e451282f18
modify WIFI_CONN_0101 case for wrong authmode of AP
2019-08-08 16:54:35 +08:00
zhangyanjiao
f3ffce3096
wifi: fix wifi bugs for authmode and multi ssid
2019-08-08 16:48:50 +08:00
Xia Xiaotian
754a292309
lwip: Try to allocate some LWIP memories in SPIRAM first. If failed, try to allocate in internal RAM then.
2019-08-07 21:11:06 +08:00
Jiang Jiang Jian
00f1ac748b
Merge branch 'bugfix/add_wifi_internal_ioctl_declared_v3.2' into 'release/v3.2'
...
esp_wifi: add esp_wifi_internal_ioctl declared (v3.2)
See merge request espressif/esp-idf!5707
2019-08-07 20:48:58 +08:00