Ivan Grokhotkov
e410f4268e
Merge branch 'feature/uart_add_api_get_cmd_position_v3.0' into 'release/v3.0'
...
driver(uart): Provide an API to get the position of the cmd char from queue
See merge request idf/esp-idf!2254
2018-04-19 14:58:28 +08:00
Ivan Grokhotkov
8de29499ce
mbedtls: Add bounds check before length read
...
This is part of the patch for CVE-2018-9989.
Cherry-picked from 740b218386
Ref. https://github.com/espressif/esp-idf/issues/1860
2018-04-19 12:58:48 +08:00
Ivan Grokhotkov
ffab6084f0
mbedtls: Prevent arithmetic overflow on bounds check
...
Part of the patch for CVE-2018-9989.
Cherry-picked from 5224a7544c
.
Ref. https://github.com/espressif/esp-idf/issues/1860
2018-04-19 12:58:48 +08:00
Ivan Grokhotkov
f58c664e2b
mbedtls: Add bounds check before signature length read
...
Part of the patch for CVE-2018-9988.
Cherry-picked from a1098f81c2
Ref. https://github.com/espressif/esp-idf/issues/1860
2018-04-19 12:58:47 +08:00
Ivan Grokhotkov
b42ba1b0a5
mbedtls: Prevent arithmetic overflow on bounds check
...
Part of the patch for CVE-2018-9988.
Cherry-pick of 027f84c69f
Ref. https://github.com/espressif/esp-idf/issues/1860
2018-04-19 12:58:47 +08:00
Ivan Grokhotkov
67ba85650d
mbedtls: Prevent bounds check bypass through overflow in PSK identity parsing
...
This is a patch for CVE-2017-18187.
Cherry-picked from 83c9f495ff
Ref. https://github.com/espressif/esp-idf/issues/1730
2018-04-19 12:58:47 +08:00
Ivan Grokhotkov
0a97cb62ef
mbedtls: disable support for RSASSA-PSS signatures
...
This is a workaround for CVE-2018-0487.
Ref. https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2018-01
Ref. https://github.com/espressif/esp-idf/issues/1730
2018-04-19 12:58:47 +08:00
Ivan Grokhotkov
594e1b5e44
mbedtls: disable truncated HMAC
...
This is a workaround for CVE-2018-0488.
Ref. https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2018-01
Ref. https://github.com/espressif/esp-idf/issues/1730
2018-04-19 12:26:41 +08:00
Ivan Grokhotkov
10a5cfc900
Merge branch 'bugfix/deep_sleep_wake_dbias_3.0' into 'release/v3.0'
...
soc/rtc, sleep: don’t lower the bias for wakeup state
See merge request idf/esp-idf!2258
2018-04-18 20:23:50 +08:00
Ivan Grokhotkov
e4a840d8cf
soc/rtc, sleep: don’t lower the bias for wakeup state
...
This fixes watchdog resets occurring during wakeup from light sleep.
2018-04-18 18:22:49 +08:00
kooho
7a32ae363e
driver(uart):Provide an API to get the position of the cmd char from queue without modify the queue.
2018-04-18 10:11:02 +08:00
Jiang Jiang Jian
fddc905fa3
Merge branch 'bugfix/tw19728_support_static_allocation_of_freertos_queue_used_by_isr' into 'release/v3.0'
...
esp32/driver/bt: support static allocation of FreeRTOS queues used by ISR routine
See merge request idf/esp-idf!2171
2018-04-12 23:07:51 +08:00
Jiang Jiang Jian
574dd08085
Merge branch 'bugfix/i2s_mix_result_with_error_code' into 'release/v3.0'
...
fix i2s mix result and error code
See merge request idf/esp-idf!2187
2018-04-11 18:30:45 +08:00
Ivan Grokhotkov
7705126287
Merge branch 'bugfix/pm_init_1core' into 'release/v3.0'
...
pm: fix initialisation only done in dual core mode
See merge request idf/esp-idf!2196
2018-04-10 18:17:42 +08:00
Zhang Zhao Xiang
bf4184a049
fix i2s mix result and error code
2018-04-10 12:04:05 +08:00
Liu Zhi Fu
212222a9e0
esp32/bt/driver: support static allocation of FreeRTOS queues used by ISR routine
...
Support static allocation of FreeRTOS queues used by ISR routine in WiFi/BT/esp_timer/driver etc
2018-04-09 13:39:31 +08:00
Ivan Grokhotkov
6d3f81aa77
pm: fix initialisation only done in dual core mode
...
Introduced in 9377d4ac
. Accidentally put the new code block under an
2018-04-08 14:08:31 +08:00
Ivan Grokhotkov
489e98cfb7
Merge branch 'bugfix/heap_fragmentation_on_split_v30' into 'release/v3.0'
...
heap: Try to merge tail with next block when splitting (v3.0 backport)
See merge request idf/esp-idf!2178
2018-04-08 13:42:38 +08:00
He Yin Ling
8d0d7972f3
test: use SSC_BLE_WIFI to test NVS cases
2018-04-03 19:23:32 +08:00
Ivan Grokhotkov
e6acfedd3c
Merge branch 'feature/build_ssc_in_multiple_ci_jobs' into 'master'
...
CI: support build SSC in multiple jobs
See merge request idf/esp-idf!1622
(cherry picked from commit 595ddfd825
)
493a9266
CI: support build SSC in multiple jobs
48e3e3ef
test: change SSC binary path
2018-04-03 19:18:15 +08:00
Angus Gratton
0f5cae0218
heap: Change test_multi_heap_on_host multi-config to bash script not Makefile
...
Hopefully fix some CI building issues with parallel builds.
2018-04-03 16:35:47 +10:00
Deomid Ryabkov
712bd1d773
Try to merge tail with next block when splitting
...
When splitting a memory block, check if the next block is free.
If it is, then just extend it upwards instead of creating a new block.
This fixes a bug where when shrinking existing allocations would result in irreversible free space fragmentation.
When testing on the host, test all the poisoning configurations.
2018-04-03 16:35:47 +10:00
Jiang Jiang Jian
4e36ede3bf
Merge branch 'feature/i2s_add_expand_function' into 'release/v3.0'
...
Add a new i2s feature to expand the original i2s width
See merge request idf/esp-idf!2174
2018-04-02 21:51:14 +08:00
Jiang Jiang Jian
2f2aa41ea7
Merge branch 'bugfix/btdm_slow_interrupt_reaction_for_v3.0' into 'release/v3.0'
...
Bugfix/btdm slow interrupt reaction for v3.0
See merge request idf/esp-idf!2159
2018-04-02 20:04:52 +08:00
Jiang Jiang Jian
089438139d
Merge branch 'bugfix/some_wifi_bugs_for_v3.0' into 'release/v3.0'
...
Bugfix/some wifi bugs for v3.0
See merge request idf/esp-idf!2168
2018-04-02 16:34:09 +08:00
Jiang Jiang Jian
e468a105d8
Merge branch 'cherry-pick-f46ad1fe' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_fix_get_PID_key_error' into 'release/v3.0'
See merge request idf/esp-idf!2169
2018-04-02 16:12:26 +08:00
Jiang Jiang Jian
894ddea353
Merge branch 'cherry-pick-8eaae966' into 'release/v3.0'
...
Merge branch 'bugfix/flash_mapp' into 'release/v3.0'
See merge request idf/esp-idf!2170
2018-04-02 16:12:05 +08:00
Zhang Zhao Xiang
fed3c3ebf0
Add a new i2s feature to expand the original i2s width
2018-04-02 05:24:38 +00:00
Jiang Jiang Jian
f8515688cb
Merge branch 'bugfix/i2c_bugfix_for_v3.0' into 'release/v3.0'
...
driver(i2c): fix i2c bugs for release/v3.0
See merge request idf/esp-idf!2152
2018-03-31 17:12:55 +08:00
Tian Hao
b9dab23437
component/bt : fix interrupt slow reaction cause assert(interrupt wdt)
...
Some application lock interrupt(portENTER_CRITICAL) too long time,
it will cause bluetooth cannot react interrupt in time, then t will
cause some assert, assert info following:
1. ld_acl.c 1900
2. ld_fm.c 340
3. other assert reference to this.
2018-03-31 06:52:00 +00:00
Tian Hao
5632385d5f
component/bt : add bluetooth controller library compile version
2018-03-31 06:52:00 +00:00
Jiang Jiang Jian
cfcb22fe16
Merge branch 'bugfix/btdm_fix_get_PID_key_error' into 'master'
...
Component/bt: fix get PID key error
See merge request idf/esp-idf!2156
(cherry picked from commit f46ad1fec8
)
109a93bf
Component/bt: fix get PID key error
2018-03-31 06:51:31 +00:00
Jiang Jiang Jian
d6e3943233
Merge branch 'bugfix/flash_mapp' into 'master'
...
spi_flash: add api to get valid mmu table pages number
See merge request idf/esp-idf!2070
(cherry picked from commit 8eaae96658
)
75550315
add api get valid mmu table pages number
fa687743
spi_flash:
49a236da
fix CI failed when flash chip size if 2MBytes
2018-03-31 06:51:08 +00:00
Deng Xin
b563219f93
Fix some wifi bugs
...
1. Do not filter out TKIP MIC ERR packet
2. Modify response retry counter from 32 to 5
3. support enrollee feature in APSTA mode
2018-03-31 06:50:15 +00:00
Jiang Jiang Jian
d881fcd380
Merge branch 'bugfix/btdm_modify_open_API_params' into 'release/v3.0'
...
Component/bt: modify open API params for v3.0
See merge request idf/esp-idf!2166
2018-03-30 19:41:31 +08:00
zhiweijian
058a38a141
Component/bt: fix connect fail when remote addr type is random
2018-03-30 17:10:56 +08:00
Jiang Jiang Jian
ffe6af44c1
Merge branch 'cherry-pick-6ffd089c' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_fix_no_set_rand_addr_event_callback' into 'release/v3.0'
See merge request idf/esp-idf!2163
2018-03-30 16:52:23 +08:00
Jiang Jiang Jian
1fca253a65
Merge branch 'bugfix/btdm_fix_no_set_rand_addr_event_callback' into 'master'
...
Component/bt: fix no set rand add callback
See merge request idf/esp-idf!2140
(cherry picked from commit 6ffd089c97
)
aa236809
Component/bt: fix no set rand add callback event
2018-03-30 16:05:43 +08:00
Jiang Jiang Jian
486ff50eac
Merge branch 'cherry-pick-e84df7a2' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_fix_strncpy_error_in_blufi' into 'release/v3.0'
See merge request idf/esp-idf!2158
2018-03-30 15:58:59 +08:00
Jiang Jiang Jian
cf69dfa458
Merge branch 'cherry-pick-b26ab188' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_fix_service_change_event_param_error' into 'release/v3.0'
See merge request idf/esp-idf!2161
2018-03-30 15:53:51 +08:00
Jiang Jiang Jian
501640514a
Merge branch 'bugfix/btdm_xQueueGenericSend_assertion_3.0' into 'release/v3.0'
...
component/bt: Fix xQueueGenericSend assertion in release/v3.0
See merge request idf/esp-idf!2160
2018-03-30 15:51:53 +08:00
Jiang Jiang Jian
a80e687f8c
Merge branch 'bugfix/btdm_fix_service_change_event_param_error' into 'master'
...
Component/bt: fix service change event params error
See merge request idf/esp-idf!2150
(cherry picked from commit b26ab188af
)
f5d58142
Component/bt: fix service change event params error
2018-03-30 14:57:24 +08:00
baohongde
bc90b89e2b
component/bt: Fix xQueueGenericSend assertion in release/v3.0
2018-03-30 14:53:27 +08:00
Jiang Jiang Jian
a1cc202b70
Merge branch 'bugfix/no_link_key_notify_on_repair_for_v3.0' into 'release/v3.0'
...
component/bt: bugfix for no link key notification event on repairing for…
See merge request idf/esp-idf!2134
2018-03-30 14:26:35 +08:00
Jiang Jiang Jian
062ba57d0f
Merge branch 'bugfix/btdm_fix_strncpy_error_in_blufi' into 'master'
...
Component/bt: fix strncpy error in blufi
See merge request idf/esp-idf!2141
(cherry picked from commit e84df7a27d
)
6a942046
Component/bt: fix strncp error in blufi
2018-03-30 14:15:03 +08:00
kooho
14baac302f
driver(i2c):Fixed i2c bug for release/v3.0
2018-03-29 14:03:04 +08:00
wangmengyang
af211fcf0c
component/bt: bugfix for no link key notification event on repairing for initiating side of simple_pairing
...
In response to: https://github.com/espressif/esp-idf/issues/1275
2018-03-27 15:49:52 +08:00
Jiang Jiang Jian
5ee7233b5b
Merge branch 'bugfix/btdm_fix_error_when_close_SMP' into 'release/v3.0'
...
Component/bt: fix build error when close SMP for v3.0
See merge request idf/esp-idf!2108
2018-03-21 15:33:28 +08:00
zhiweijian
48c7afde27
Component/bt: fix build error when close SMP
2018-03-21 13:48:05 +08:00
Jiang Jiang Jian
d3bab0d7f0
Merge branch 'cherry-pick-84788230' into 'release/v3.0'
...
cherry pick 'bugfix/dfs_rtc_fixes' into 'release/v3.0'
See merge request idf/esp-idf!2107
2018-03-21 13:19:17 +08:00