Angus Gratton
002104b262
Merge branch 'bugfix/err_code_collision' into 'master'
...
Fix error code collisions and re-enable CI check
Closes IDF-832
See merge request espressif/esp-idf!5923
2019-09-03 08:30:40 +08:00
Jiang Jiang Jian
9b070666e1
Merge branch 'bugfix/btdm_linking_fail_with_toolchain_8.2.0' into 'master'
...
components/bt: Fix linking fail with toolchain 8.2.0
See merge request espressif/esp-idf!5782
2019-09-02 22:21:59 +08:00
Jiang Jiang Jian
81cf2cf130
Merge branch 'bugfix/btdm_remove_unused_macro_in_menuconfig' into 'master'
...
components/bt: Remove unused macro in menuconfig
See merge request espressif/esp-idf!5950
2019-09-02 22:20:49 +08:00
Jiang Jiang Jian
a4a95e6c67
Merge branch 'bugfix/coex_bb_reset_lock' into 'master'
...
fix bug that wifi start/stop may cause crash
See merge request espressif/esp-idf!5968
2019-09-02 14:25:50 +08:00
Jiang Jiang Jian
6fa20a4d33
Merge branch 'test/use_correct_config_for_nvs_compatible_case' into 'master'
...
test: fix nvs compatible case error:
See merge request espressif/esp-idf!5890
2019-09-02 12:40:38 +08:00
Jiang Jiang Jian
a2e0c6b1ab
Merge branch 'test/fix_mesh_test_case' into 'master'
...
test: fix test case MESH_EST_2403
See merge request espressif/esp-idf!5813
2019-09-02 12:38:38 +08:00
Angus Gratton
eca4b855d9
Merge branch 'bugfix/secure_boot_ecdsa_config' into 'master'
...
secure boot: Ensure mbedTLS enables ECDSA if signatures are checked in app
See merge request espressif/esp-idf!5960
2019-09-02 08:31:18 +08:00
Tian Hao
3af18c0422
fix some coex bugs
...
1. fix the bug that bb reset lock unhandled may cause assert in vPortCPUReleaseMutexIntsDisabledInternal
2. fix wifi mac reset may blocking then cause wdt timeout
3. fix bug wifi mac reset before coex init
2019-08-30 22:06:29 +08:00
Angus Gratton
d1f2ea7cdf
Merge branch 'bugfix/make_build_issue_if_build_dir_symlink' into 'master'
...
ldgen: fix build issue on make when build dir is a symlink
Closes IDFGH-1340
See merge request espressif/esp-idf!5915
2019-08-30 16:27:21 +08:00
Angus Gratton
879778a677
Merge branch 'refactor/move_smartconfig_ack_to_wifi' into 'master'
...
smartconfig: move smartconfig_ack to esp_wifi conponent
Closes IDFGH-1758
See merge request espressif/esp-idf!5881
2019-08-30 16:27:11 +08:00
Angus Gratton
ff5cb217fe
Merge branch 'bugfix/unicore_config_prevent_ipc_code' into 'master'
...
ipc: prevent code getting pulled in for unicore configuration
See merge request espressif/esp-idf!5795
2019-08-30 16:26:47 +08:00
Angus Gratton
6123f78897
mbedtls: Make ECDHE-PSK config item depend on ECDHE
2019-08-30 15:01:53 +10:00
Angus Gratton
abd6d40796
secure boot: Ensure mbedTLS enables ECDSA if signatures are checked in app
...
and all ECDSA to be disabled if secure boot is not enabled
Previously if ECDSA disabled in config then secure_boot_signatures.c would
fail to build (whether or not secure boot was enabled).
To avoid breaking apps that might be using the signature scheme with custom OTA
without enabling secure boot signatures in config, this change just disables
this functionality if unavailable in mbedTLS config.
Possible fix for root cause of https://github.com/espressif/esp-idf/pull/3703
2019-08-30 14:56:11 +10:00
baohongde
d12503eb55
components/bt: Remove unused macro in menuconfig
2019-08-29 19:58:05 +08:00
Mahavir Jain
d6982e0401
Merge branch 'feature/enable_cfg_for_tls_asymmetric_content_length' into 'master'
...
mbedtls: keep asymmetric tls buffer length option enabled by default
See merge request espressif/esp-idf!5678
2019-08-29 19:45:06 +08:00
Roland Dobai
612db28b6f
Fix error code collision and CI check
2019-08-29 08:14:08 +00:00
Jon Shallow
e7033716db
LwIP: Make IP_PKTINFO support configurable
...
LwIP has support for IP_PKTINFO, but it cannot be activated as it is
not configurable. This fix adds in the ability to configure it.
Merges https://github.com/espressif/esp-idf/pull/3983
2019-08-29 11:20:56 +08:00
suda-morris
a36cc962a3
smartconfig: move smartconfig_ack to esp_wifi conponent
2019-08-29 10:39:30 +08:00
Angus Gratton
1cd54d34f6
Merge branch 'bugfix/bootloader_factory_reset_with_wake_up_from_deep_sleep' into 'master'
...
bootloader: Blocking the Factory reset during wake up from deep sleep
Closes IDFGH-1536
See merge request espressif/esp-idf!5673
2019-08-29 09:35:08 +08:00
Angus Gratton
06898325e6
Merge branch 'bugfix/bootloader_efuse_build_regression' into 'master'
...
bootloader: add definition of esp_clk_apb_freq
Closes IDFGH-1734
See merge request espressif/esp-idf!5913
2019-08-29 08:35:48 +08:00
Jiang Jiang Jian
17dc04183a
Merge branch 'bugfix/fix_the_bug_for_softap_set_authmode' into 'master'
...
wifi: fix the bug for softAP set authmode
Closes WIFI-449
See merge request espressif/esp-idf!5823
2019-08-28 19:05:00 +08:00
Mahavir Jain
ebe53416ad
ipc: prevent code getting pulled in for unicore configuration
2019-08-28 12:47:08 +05:30
Mahavir Jain
5582878f8e
mbedtls: keep asymmetric tls buffer length option enabled by default
2019-08-28 06:23:33 +00:00
Angus Gratton
a21ca2270a
Merge branch 'feature/deep_sleep_fast_wake' into 'master'
...
bootloader: Reduce the time spent in image validation when waking from deep sleep
See merge request espressif/esp-idf!5140
2019-08-28 08:54:28 +08:00
Jiang Jiang Jian
039f9d0a20
Merge branch 'bugfix/btdm_fix_ble_data_loss_and_send_same_pkt_twice' into 'master'
...
Component/bt: fix some BLE bugs
See merge request espressif/esp-idf!5896
2019-08-27 18:48:45 +08:00
Ivan Grokhotkov
fb72a6f629
bootloader: add definition of esp_clk_apb_freq
...
Commit 8cd04c80
has added a dependency of efuse component on
esp_clk_apb_freq, however there was no definition of this function in
the bootloader context.
Reported at https://esp32.com/viewtopic.php?f=13&t=12035
2019-08-27 12:01:11 +02:00
Renz Christian Bagaporo
c50a67567a
ldgen: fix build issue on make when build dir is a symlink
...
Fixes an issue where build fails if the build directory is a symlink.
The issue is caused by the rule target and the final executable dependency
not matching.
Closes https://github.com/espressif/esp-idf/issues/3626
2019-08-27 13:53:31 +08:00
Angus Gratton
8d8d4a57e1
Merge branch 'bugfix/reset_periph_modules' into 'master'
...
driver: Add a reset before enabling if a module is off
Closes IDF-188
See merge request espressif/esp-idf!4843
2019-08-26 16:38:23 +08:00
zhiweijian
f002d1c6aa
Component/bt: fix dome BLE bugs
...
- fix data loss and send same pkt twice sometimes
- fix adv data error in air sometimes
- fix adv start/stop crash sometimes
2019-08-26 14:17:46 +08:00
Jiang Jiang Jian
f68cd62abd
Merge branch 'bugfix/btdm_security_vulnerability_on_encryption_key_size' into 'master'
...
bugfix/btdm_security_vulnerability_on_encryption_key_size
See merge request espressif/esp-idf!5868
2019-08-26 14:08:22 +08:00
He Yin Ling
954a23be37
test: fix nvs compatible case error:
...
nvs compatible test case uses new test env and app. update test config
file.
2019-08-25 20:35:49 +08:00
KonstantinKondrashov
30953ba9c4
app_update: Fix UTs for FACTORY_RESET and APP_TEST
2019-08-23 10:21:06 +00:00
KonstantinKondrashov
69f45c3674
bootloader: Factory reset not for deep sleep
...
Closes: https://github.com/espressif/esp-idf/issues/3800
Closes: IDFGH-1536
2019-08-23 10:21:06 +00:00
Jiang Jiang Jian
8db44f67d7
Merge branch 'bugfix/wps_workaround_for_Telstra_AP' into 'master'
...
wps: Relax the check on older config methods in case of WPS2.0
See merge request espressif/esp-idf!5781
2019-08-23 17:32:46 +08:00
zhangyanjiao
ff96965a91
wifi: fix the bug for softAP set authmode
2019-08-23 14:37:08 +08:00
Ivan Grokhotkov
12c9d9a564
spi_flash: remove duplicate definition of spi_flash_unlock
...
The other (static) definition is in flash_ops.c, all references are
also in flash_ops.c.
2019-08-23 12:37:55 +08:00
wangmengyang
76b6902e96
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:26:15 +08:00
suda-morris
5a09de8245
cbor: add tinycbor library and example
2019-08-22 17:44:29 +08:00
Jiang Jiang Jian
0a30468945
Merge branch 'feature/wifi_use_new_event_api' into 'master'
...
esp_wifi/event: wifi use new event api
Closes WIFI-696
See merge request espressif/esp-idf!5454
2019-08-21 21:12:28 +08:00
KonstantinKondrashov
c543aac91e
bootloader: API for the fast wakeup and custom using RTC mem
...
Added "Reserve RTC FAST memory for custom purposes" option.
Added a boot counter.
2019-08-21 11:44:37 +00:00
Tim Nordell
43393cf4d1
bootloader: Support for skipping validation upon wake from deep sleep
...
This saves time when waking up from deep sleep, but potentially decreases
the security of the system. If the application able to modify itself
(especially areas that are loaded into RAM) in flash while running
without crashing or is modifies the cached bits of information about
what was last booted from the bootloader, this could cause security
issues if the user does a "deep sleep reset" since the full validation
is skipped.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Tim Nordell
82984f0539
bootloader: Do not obfuscate RAM if we are not doing image validation
...
No need to take this step if we are not doing image validation. The
obfuscation only buys us a tiny bit of "security" anyways since the
main parts of flash are memory mapped, too. This saves a little bit of
wake-up time when waking up from deep sleep when the
BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP option is set.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Tim Nordell
1e32fa2cf7
bootloader: Remove extraneous newlines from some debug statements
...
ESP_LOGD(...) provides its own new lines so remove these from these
debug strings.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Prasad Alatkar
393eb1700d
NimBLE: Add misc menuconfig options
...
- Add option to configure stack size of NimBLE host task, update NimBLE
submodule for the same.
- Change max concurrent connections supported to 9 inline with controller.
2019-08-21 19:28:47 +08:00
Jiang Jiang Jian
14608cc0fb
Merge branch 'Bugfix/nonblocking_udp_is_zero' into 'master'
...
fix bug for nonblocking udp is zero
Closes WIFI-756
See merge request espressif/esp-idf!5792
2019-08-21 16:44:11 +08:00
Angus Gratton
3aef62527a
Merge branch 'update/cjson_v1_7_12' into 'master'
...
Update cJSON to v1.7.12
See merge request espressif/esp-idf!5776
2019-08-21 16:40:35 +08:00
Angus Gratton
319d44b1a6
Merge branch 'bugfix/esp_timer_null_checks' into 'master'
...
esp_timer: Add parameter NULL checks to public API
See merge request espressif/esp-idf!5804
2019-08-21 16:17:15 +08:00
xueyunfei
36920b4062
fix bug for nonblocking udp is zero
2019-08-21 11:25:17 +08:00
Ivan Grokhotkov
636c6a9a30
Merge branch 'feature/ulp_macro_updates' into 'master'
...
ulp: updates for ULP macros (PRs from Github)
Closes IDFGH-1492
See merge request espressif/esp-idf!5801
2019-08-20 20:40:09 +08:00
Nachiket Kukade
19a1af88a5
wps: Relax the check on older config methods in case of WPS2.0
...
Some APs incorrectly advertize newer WPS2.0 config method bits
without setting bits for the corresponding older methods. This
results in failures during 8-way handshake. Add a workaround to
relax this check so that WPS handshake can proceed.
2019-08-20 09:58:41 +00:00