alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
32,078 Commits 20 Branches 148 Tags 384 MiB
a8f833a912
Commit Graph

494 Commits

Author SHA1 Message Date
Kapil Gupta
e8e7e3f946 esp_wifi: Flush PMK caching if bss akm has changed 2022-11-21 18:34:13 +05:30
Kapil Gupta
93dd1b2175 Merge branch 'bugfix/fixing_memory_leak_in_wps_scan_master' into 'master' 
Adds improvements to esp_wps code to cover up potential memory leaks.

See merge request espressif/esp-idf!20741
 2022-11-10 12:39:26 +08:00
Kevin (Lao Kaiyao)
5bed8fab49 Merge branch 'refactor/rename_h2_to_h4' into 'master' 
esp32h2: renaming esp32h2 to esp32h4

Closes IDF-6098

See merge request espressif/esp-idf!20676
 2022-11-09 19:19:43 +08:00
Shreyas Sheth
7de54eabf4 esp_wifi: Bugfix WPA Enterprise Reauthentication issue 2022-11-08 18:10:28 +05:30
laokaiyao
8677216576 esp32h2: renaming esp32h2 to esp32h4 2022-11-08 17:05:33 +08:00
Jiang Jiang Jian
9d7facf284 Merge branch 'remove_deprecated_rc4' into 'master' 
Removed some occurences of the RC4 cipher suite

Closes IDF-4983

See merge request espressif/esp-idf!19856
 2022-11-07 13:57:51 +08:00
jgujarathi
2272350820 (esp_wifi) : Adds improvements to esp_wps.c to cover up potential memory leaks. 2022-11-07 10:53:44 +05:30
Jiang Jiang Jian
6fb6bdf6dd Merge branch 'bugfix/wpa_sm_cleanup' into 'master' 
esp_wifi: Remove unnecessary function pointers from wpa_sm_init

See merge request espressif/esp-idf!19833
 2022-11-04 16:45:42 +08:00
Kapil Gupta
7278cf3e16 Merge branch 'feature/move_eloop_to_pptask' into 'master' 
wpa_supplicant: Run eloop timer in ppTask context

Closes WIFI-4981

See merge request espressif/esp-idf!20481
 2022-10-31 12:48:43 +08:00
Kapil Gupta
79b6e32ea7 wpa_supplicant: Validate eloop struct before deleting it 2022-10-27 09:16:18 +05:30
Kapil Gupta
404aa30290 wpa_supplicant: Run eloop timer in ppTask context 
Currently eloop runs in timer context which may cause some
inconsistent behavior.

Add changes to run eloop in ppTask context
 2022-10-26 18:09:25 +05:30
jgujarathi
915fb4dfe2 Removed some occurences of the RC4 cipher suite(deprecated now) 2022-10-26 03:02:16 +00:00
Mahavir Jain
dd76328927 Merge branch 'feature/wpa_supp_mbedtls_private_cleanup' into 'master' 
wpa_supplicant: `MBEDTLS_PRIVATE` & `MBEDTLS_ALLOW_PRIVATE_ACCESS`-related cleanup

Closes IDF-5861

See merge request espressif/esp-idf!20171
 2022-10-19 12:13:14 +08:00
Jiang Jiang Jian
72a70f08b9 Merge branch 'bugfix/reason_code_pmk_flush' into 'master' 
Prevent pmk flush for unspecified reasoncode

Closes WIFI-4796

See merge request espressif/esp-idf!20459
 2022-10-13 11:51:48 +08:00
gauri patankar
84252e4eb8 wpa_supplicant: Update security patches from upstream 
1. Adding security patch for SAE side channel attacks
2. Adding confirm message validation in error cases
3. Adding y coordinate for PWE in SAE
 2022-10-11 11:33:33 +05:30
gauri patankar
c286b0192b wpa_supplicant: Move SAE modules into dragonfly files 2022-10-11 11:26:39 +05:30
Laukik Hase
82c5bdcb76
wpa_supplicant: MBEDTLS_PRIVATE & MBEDTLS_ALLOW_PRIVATE_ACCESS-related cleanup 2022-10-10 11:48:16 +05:30
Kapil Gupta
198a4335f2 Remove unnecessary code from disconnect handler 2022-10-04 21:38:59 +05:30
gauri patankar
c89686647d esp_wifi:added hash key length validation 2022-09-30 10:40:27 +05:30
Kapil Gupta
cc6196ff6a esp_wifi: Remove unnecessary function pointer from wpa_sm_init 2022-09-29 12:46:53 +00:00
wuzhenghui
6b6bb3a321 esp32c6: add wpa_supplicant support 2022-09-26 20:32:13 +08:00
Kapil Gupta
6729f870b9 wpa_supplicant: Prevent pmk flush for unspecified reasoncode 2022-09-26 15:09:48 +05:30
Kapil Gupta
2bbd5ea69c Merge branch 'bugfix/wps_connect_to_open_ap' into 'master' 
esp_wifi: bugfix wps connect to open AP

See merge request espressif/esp-idf!20247
 2022-09-20 23:59:47 +08:00
Kapil Gupta
1cfd20c476 Merge branch 'bugfix/wps_connection_optimization' into 'master' 
wpa_supplicant: Use channel from WPS scan for WPS connect

See merge request espressif/esp-idf!20184
 2022-09-20 20:09:31 +08:00
Shreyas Sheth
d12351f7a6 esp_wifi: bugfix wps connect to open AP 
Set Mac address in correct field
 2022-09-20 11:43:53 +05:30
Kapil Gupta
3c5c108fa8 wpa_supplicat: Use same channel as found in WPS scan for WPS connect 2022-09-16 10:58:03 +05:30
muhaidong
0960aa8d87 wpa_supplicant: try install gtk before send 2 of 2 2022-09-05 21:28:19 +08:00
Kapil Gupta
06db6c2098 Merge branch 'bugfix/wps_ssid_len_validation' into 'master' 
wpa_supplicant: Add WPS ssid length validation

See merge request espressif/esp-idf!19486
 2022-08-29 13:55:17 +08:00
Mahavir Jain
fbd1972318
wpa_supplicant: fix issue with WPA2 enterprise TLS session 
Usage of `mbedtls_ssl_conf_sig_algs()` was incorrect, it must include signature
algorithm with hash. This change is as per requirement defined in mbedTLS-3.2.1
release.
 2022-08-24 11:59:35 +05:30
Laukik Hase
6319970ab7
esp_tls/wpa_supplicant: Updated deprecated mbedtls APIs 2022-08-24 11:59:34 +05:30
Jiang Jiang Jian
08ed16f48c Merge branch 'bugfix/remove_rc4_3des_tls_cipher_wpa' into 'master' 
wpa_supplicant: remove RC4 and 3DES ciphers for TLS

Closes IDFGH-8107

See merge request espressif/esp-idf!19718
 2022-08-24 14:07:05 +08:00
Kapil Gupta
964f0ad5ad wpa_supplicant: remove RC4 and 3DES ciphers for TLS 
MbedTLS-3.x has dropped support for 3DES and RC4 TLS cipher
suites. Removing them from supplicant as well

Closes https://github.com/espressif/esp-idf/issues/9607
 2022-08-23 13:02:05 +05:30
Kapil Gupta
4df06ed2f0 wpa_supplicant: Fix WPS connection issue after WPS done 
esp_wifi_disconnect is needed to clear the wifi state and enable
station to connect to new SSID. Add changes to call it after
WPS is done.
 2022-08-22 20:32:34 +05:30
Kapil Gupta
51f785fabe wpa_supplicant: Add WPS ssid length validation 2022-08-10 12:08:40 +05:30
muhaidong
36feb95a9e esp_wifi: done beacon monitor timer and eloop timer when deinit 2022-08-09 17:22:39 +08:00
Ivan Grokhotkov
401c10ecfb build system: re-add -Wno-format as private flag for some components 2022-08-03 16:42:47 +04:00
Kapil Gupta
465996fba5 wpa_supplicant: fix invalid pointer free 2022-07-28 12:47:31 +00:00
Shreyas Sheth
341a92aaa5 esp_wifi: WPA3 SAE keep default value as h2e and hunting and pecking for sae pwe 2022-07-22 12:23:13 +05:30
Jiang Jiang Jian
371a935e76 Merge branch 'bugfix/wpa2_enterprise_issues' into 'master' 
esp_wifi: WPA2 enterprise related changes

Closes WIFI-4579

See merge request espressif/esp-idf!19162
 2022-07-22 13:56:41 +08:00
Kapil Gupta
951928960b esp_wifi: WPA2 enterprise related changes 
1. Removed DHE ciphers when mbedTLS is disabled since they take
too much processing power.
2. Removed support of SHA384 and SHA512 when mbedTLS is disabled
due to too much processing needed.
3. Fixed bugs in crypto_hash_init API which was causing
EAP connections to fail when mbedTLS was enabled.
4. Cleaned some code of crypto_hash_***
 2022-07-21 13:33:18 +05:30
David Cermak
5c383d7b73 esp_netif/lwip: Fix deps cycles to "lwip -> esp_netif -> phy-drivers" 
Fix dependency tree so that lwip doesn't depend on any specific network
interface component.
Network interface drivers shall depend on esp_netif.
esp_netif shall depend on lwip (but not on any specific interface
driver) -- it optionally depends on vfs and esp_eth (need ethernet
header for L2/bridge mode)
 2022-07-20 14:59:07 +02:00
Kapil Gupta
9d98cd8f8d WiFi: Do not disconnect in WPS disable incase WPS is done/scanning 
Closes https://github.com/espressif/esp-idf/issues/9341
 2022-07-18 14:57:01 +05:30
Jiang Jiang Jian
633a9f744a Merge branch 'bugfix/OWE_memory_leak' into 'master' 
esp_wifi : fixed OWE memory leak

See merge request espressif/esp-idf!19061
 2022-07-18 17:20:36 +08:00
Kapil Gupta
882ad4e5e7 Merge branch 'feature/eloop_debug_framework' into 'master' 
wpa_supplicant: Add debug info for eloop functions

See merge request espressif/esp-idf!18451
 2022-07-18 14:17:25 +08:00
Shyamal Khachane
88db86672d fix for OWE memory leak 2022-07-15 14:29:32 +05:30
Kapil Gupta
ff00a1c7a2 esp_wifi: Clear old keys before going for new connection 2022-07-12 16:37:55 +05:30
Jiang Jiang Jian
5f9bbf71fe Merge branch 'feature/sae_sta_h2e' into 'master' 
SAE H2E support for STA

See merge request espressif/esp-idf!17860
 2022-06-20 23:52:08 +08:00
Shreyas Sheth
591c7a496c esp_wifi: WPA3 SAE H2E support for station 2022-06-20 18:51:11 +05:30
muhaidong
6ca2804107 esp_wifi: esp32c2 does not support wapi. 2022-06-20 11:42:12 +08:00
Kapil Gupta
7fae6ce4f2 Correct SSID copy length during WPS scan 2022-06-18 13:26:48 +00:00
Kapil Gupta
6212a50edd wpa_supplicant: Add debug info for eloop functions 2022-06-16 10:36:34 +05:30
Shyamal Khachane
6d55761f60 OWE support for station 2022-06-15 17:20:24 +05:30
Kapil Gupta
bb23d783c0 Merge branch 'bugfix/sta_rejoin_softap_mode_issue' into 'master' 
wpa_supplicant: Add changes to deinit sta_info correctly

Closes WIFI-4441

See merge request espressif/esp-idf!18395
 2022-06-07 21:47:14 +08:00
Kapil Gupta
ed2bed49c0 wpa_supplicant: Add changes to deinit sta_info correctly 
Incase sta pointer is not null during station join, deinit of
previous sm causing crash due to incorrect typecast.

Add changes to correct this.
 2022-06-07 11:41:53 +05:30
Kapil Gupta
28a06d07f7 Corrected hash size for sta_info structure 2022-06-06 16:38:04 +05:30
Kapil Gupta
e9128b3b5b wpa_supplicant: Removed ESP32 reference from generic APIs/Code 2022-06-06 11:03:36 +05:30
Kapil Gupta
e60ebc0cbe Use snprintf instead of sprintf 2022-06-06 11:03:36 +05:30
Kapil Gupta
2aa6853d3e Remove strcpy/strncpy function callings from supplicant 2022-06-06 11:03:35 +05:30
Kapil Gupta
916a4d6524 Fix coverity reported issues 2022-06-06 11:03:35 +05:30
Kapil Gupta
944690a5e7 Correct condition for not to use pmk caching 2022-06-06 11:03:35 +05:30
Michael (XIAO Xufeng)
6a8aed12ee ci: partially enable ut tests for esp32c2 
Disabled test cases are tracked in:

 IDF-4465, IDF-5045, IDF-5057, IDF-5058, IDF-5059, IDF-5060, IDF-5061, IDF-5131

- test_fatfs: IDF-5136

- test_pm: IDF-5053

- test_cache_mmu: IDF-5138

- test_partitions: IDF-5137

- test_vfs: IDF-5139

- test_freertos: IDF-5140

- test_wpa_supplicant: IDF-5046

- test_mbedtls: IDF-5141

- test_pthread: IDF-5142

- test_protocomm: IDF-5143

- test_lightsleep: IDF-5053

- test_taskwdt: IDF-5055

- test_tcp_transport: IDF-5144

- test_app_update: IDF-5145

- test_timer: IDF-5052

- test_spi: IDF-5146

- test_rtc_clk: IDF-5060

- test_heap: IDF-5167

ci: fixed issues for tests of libgcc, ets_timer, newlib

test_pm: support on C2
 2022-06-02 14:23:35 +08:00
Mahavir Jain
8250edbf22 Merge branch 'bugfix/mbedtls_deprecated_options' into 'master' 
mbedtls: Remove deprecated options from mbedtls/esp_config.h

Closes IDFGH-7296

See merge request espressif/esp-idf!18008
 2022-05-30 10:38:08 +08:00
Jiang Jiang Jian
8efa4d64e0 Merge branch 'feature/add_task_wrappers' into 'master' 
wpa_supplicant: Add osi layer for FreeRTOS calls

Closes WIFI-2996

See merge request espressif/esp-idf!11734
 2022-05-30 10:29:50 +08:00
Jiang Jiang Jian
0e94779b2e Merge branch 'feature/support_esp32c2_wifi_new' into 'master' 
Bringup ESP32C2 Wi-Fi

Closes IDF-3905

See merge request espressif/esp-idf!18136
 2022-05-29 18:25:24 +08:00
Kapil Gupta
777b2caa1c wpa_supplicant: Move ETS/ESP timers to eloop 2022-05-29 09:32:16 +05:30
Jiang Jiang Jian
2042840974 Merge branch 'bugfix/sae_pmk_caching_issue' into 'master' 
esp_wifi: Do not use pmkid caching when SSID is changed

Closes WIFI-4422

See merge request espressif/esp-idf!18244
 2022-05-29 00:18:19 +08:00
Zhang Jun Hao
fcf8c84ad5 fix potential leak of memory check error 2022-05-28 08:52:55 +00:00
Laukik Hase
28ac0b12fb
mbedtls: Remove deprecated options from mbedtls/esp_config.h 
- Removed options related to RC4 ciphersuite, SSL3 and TLS1
  (as per mbedtls v3.1.0)
 2022-05-28 10:21:06 +05:30
Kapil Gupta
0cdad0a002 wpa_supplicant: Add wrappers for FreeRTOS APIs 2022-05-26 15:23:21 +05:30
Kapil Gupta
1cf54db433 esp_wifi: Changes to not use pmkid caching when SSID is changed 2022-05-25 15:11:26 +05:30
Kapil Gupta
a6811adac7 wpa_supplicant: Add WPS registrar support for softAP mode 2022-05-24 12:11:53 +05:30
Kapil Gupta
df1a15e918 wpa_supplicant: Add upstream files for wps registrar 2022-05-24 12:11:53 +05:30
Kapil Gupta
ee33c6ae05 esp_wifi: Add APIs to check BTM and RRM support of connected AP 2022-05-16 15:57:59 +05:30
Kapil Gupta
c2429f1cf9 wpa_supplicant: sync eap code with upstream 2022-05-13 12:57:47 +08:00
Kapil Gupta
36321fda82 Merge branch 'feature/eloop_timer' into 'master' 
wpa_supplicant: Add timer based eloop implementation

See merge request espressif/esp-idf!17430
 2022-05-12 12:30:44 +08:00
Kapil Gupta
ecc87cfc8d wpa_supplicant: wps code updation 
Update WPS code with upstream. Also moved ESP specific code
in another esp code folder.
 2022-05-11 12:18:52 +00:00
Kapil Gupta
9c27cf93fc Add testcase for eloop execution 2022-05-11 17:45:23 +05:30
Kapil Gupta
d06daee350 wpa_supplicant: Add timer based eloop implementation 2022-05-11 17:45:23 +05:30
Kapil Gupta
cb222740bd Merge branch 'bugfix/coverity_fixes' into 'master' 
wpa_supplicant: Fix issues reported by coverity

Closes WIFI-4390

See merge request espressif/esp-idf!17915
 2022-05-05 18:17:27 +08:00
kapil.gupta
3d5ca7ee6e wpa_supplicant: Add support for FT psk 2022-05-01 16:16:51 +05:30
Kapil Gupta
f38e6cb4fa Merge branch 'bugfix/tkip_countermeasure_changes' into 'master' 
wpa_supplicant: Unicast key renew in TKIP mic failure

See merge request espressif/esp-idf!17819
 2022-04-28 18:50:44 +08:00
Kapil Gupta
f070e2db6d wpa_supplicant: Fix issues reported by coverity 2022-04-26 21:40:27 +05:30
Kapil Gupta
9a818cf31d wpa_supplicant: Unicast key renew in TKIP mic failure 
Currently we always request group key renew for during
TKIP mic failure. Add support for unicast/multicast
key renew as per packet.
 2022-04-26 17:43:34 +05:30
Ivan Grokhotkov
708e99497b
global: add dependency on esp_timer component and include esp_timer.h 
Some components were including esp_timer.h without declaring a
dependency on esp_timer component. This used to work due to a
transitive public dependency on esp_timer from freertos component.
Add explicit dependencies where needed.
Also some source files were using esp_timer functions without
including the header file. This used to work because esp_timer.h was
included from freertos port header file. This commit adds esp_timer.h
includes where needed.
 2022-04-25 18:39:23 +02:00
Hrudaynath Dhabe
079b5b1857 Merge branch 'bugfix/do_not_allow_unauthenticated_encrypted_key_data' into 'master' 
esp_wifi: Ignore unauthenticated encrypted EAPOL-Key data

Closes IDFGH-6773

See merge request espressif/esp-idf!17105
 2022-04-20 16:32:45 +08:00
Nachiket Kukade
bd40793771 Merge branch 'bugfix/dpp_pkey_api_fix' into 'master' 
Move adding prefix/postfix of DPP key to example

Closes IDFGH-7116

See merge request espressif/esp-idf!17383
 2022-04-19 15:04:13 +08:00
Kapil Gupta
86013e918a Merge branch 'feature/mbedtls_default_bundle_wpa_ent' into 'master' 
wpa_supplicant: Add CA certification bundle support

See merge request espressif/esp-idf!17055
 2022-04-18 19:47:45 +08:00
Hrudaynath Dhabe
57905c7ecf esp_wifi: Ignore unauthenticated encrypted EAPOL-Key data and fix 
handling of key RSC.

Closes https://github.com/espressif/esp-idf/issues/8401
 2022-04-14 17:13:49 +05:30
Nachiket Kukade
8dea7cbed6 wpa_supplicant/dpp: Avoid deadlock while deleting DPP task 
Closes https://github.com/espressif/esp-idf/issues/8724
 2022-04-14 16:54:47 +05:30
Nachiket Kukade
282d3c6188 wpa_supplicant/dpp: Move adding prefix/postfix of DPP key to example 
1. Move adding of prefix/postfix to the private key to example code.
   This is to preserve forward compatibility when more curves are supported.
2. Documentation correction of bootstrapping key configuration.
 2022-04-14 16:54:47 +05:30
Kapil Gupta
92c18f11d9 wpa_supplicant: Remove scan done event in task 2022-04-06 19:49:52 +05:30
Kapil Gupta
62eb06e386 wpa_supplicant: Add CA certification bundle support 
Add support for CA certificate bundle support for server
certificate validation
 2022-04-05 10:57:09 +05:30
Anton Maklakov
6200d2328d Merge branch 'bugfix/printf-placeholder-for-time_t' into 'master' 
components: correct printf() placeholder for time_t

See merge request espressif/esp-idf!17439
 2022-03-17 16:08:08 +08:00
Kapil Gupta
2bdaa49cb0 Merge branch 'bugfix/pvs_warning_fixes' into 'master' 
wpa_supplicant: fix issues reported in static analysis

Closes IDF-2733

See merge request espressif/esp-idf!17499
 2022-03-17 12:47:05 +08:00
Kapil Gupta
6da52cf0d8 wpa_supplicant: static analysis fixes 2022-03-16 10:50:49 +05:30
Kapil Gupta
a1b842b1c6 wpa_supplicant: Add changes to fix broken dpp crypto 2022-03-14 18:26:35 +05:30
Anton Maklakov
e27f1331e4 components: correct printf() placeholder for time_t 
Using C99 %jd, https://en.cppreference.com/w/c/chrono/time_t
 2022-03-14 14:05:47 +07:00
Kapil Gupta
9130988299 Merge branch 'bugfix/security_validation' into 'master' 
wpa_supplicant: Add BTM security checks

Closes WIFI-4075 and WIFI-4081

See merge request espressif/esp-idf!16619
 2022-03-10 15:14:06 +08:00
Sagar Bijwe
6501eff7f5 Remove legacy system event framework. 2022-03-09 15:53:45 +05:30
Kapil Gupta
c098c253b1 wpa_supplicant: Add BTM security checks 2022-03-09 03:58:39 +00:00
Zim Kalinowski
0440aca4e3 Merge branch 'feature/reevaluate_headers_include_dirs' into 'master' 
esp_hw_support/esp_system: Re-evaluate header inclusions and include directories

See merge request espressif/esp-idf!16763
 2022-03-08 01:32:24 +08:00
0xFEEDC0DE64
9b7c345bce Fix compiler error in mbedtls 
Closes https://github.com/espressif/esp-idf/pull/8500
Closes https://github.com/espressif/esp-idf/issues/8499
Closes IDFGH-6879
Closes IDFGH-6881
 2022-03-07 12:15:08 +05:30
Sudeep Mohanty
a9fda54d39 esp_hw_support/esp_system: Re-evaluate header inclusions and include directories 
This commit updates the visibility of various header files and cleans up
some unnecessary inclusions. Also, this commit removes certain header
include paths which were maintained for backward compatibility.
 2022-03-07 11:18:08 +05:30
Jiang Jiang Jian
1068c7720b Merge branch 'bugfix/ignore_pmf_capable_flag' into 'master' 
Always connect Station in PMF mode if possible

Closes WIFI-4320

See merge request espressif/esp-idf!17023
 2022-03-03 19:34:36 +08:00
Aditya Patwardhan
72f12a0c8c Fix issue in wpa_supplicant 2022-03-03 01:37:10 +05:30
Laukik Hase
3925365351 ci: Fix pre-check stage failing tests 
- Updated license headers
- Re-enabled public headers and static analysis checks
- Fix public header file check failure

Co-authored-by: Aditya Patwardhan <aditya.patwardhan@espressif.com>
 2022-03-03 01:37:10 +05:30
Aditya Patwardhan
60b167f2d6 mbedtls-3.1 update: Removed the MBEDTLS_PRIVATE from multiple files 
after they have been again made public in mbedtls-3.1

*Added `MBEDTLS_ALLOW_PRIVATE_ACCESS` in some files.
 2022-03-03 01:37:10 +05:30
Kapil Gupta
6a164cc5bc Fix issues in wpa2 enterprise with mbedTLS 3.0 2022-03-03 01:37:10 +05:30
Aditya Patwardhan
3b71bd7326 mbedtls-3.0: Fixed ESP32 build issues 
- Added MBEDLTS_PRIVATE(...) wherever necessary
- For functions like mbedtls_pk_parse_key(...), it is necessary to pass the RNG function
  pointers as parameter. Solved for dependent components: wpa_supplicant & openSSL
- For libcoap, the SSLv2 ClientHello handshake method has been deprecated, need to handle this.
  Currently, corresponding snippet has been commented.
- Examples tested: hello-world | https_request | wifi_prov_mgr

mbedtls-3.0: Fixed ESP32-C3 & ESP32-S3 build issues
- Removed MBEDTLS_DEPRECATED_REMOVED macro from sha1 port
- DS peripheral: esp_ds_rsa_sign -> removed unsused 'mode' argument
- Added MBEDTLS_PRIVATE(...) wherever required

mbedtls-3.0: Fixed ESP32-S2 build issues
- Fixed outdated function prototypes and usage in mbedlts/port/aes/esp_aes_gcm.c due to changes in GCM module

mbedtls-3.0: Fixed ESP32-H2 build issues

ci: Fixing build stage
- Added MBEDTLS_PRIVATE(...) wherever required
- Added RNG function parameter
- Updated GCM Module changes
- Updated Copyright notices

- Tests:
- build_esp_idf_tests_cmake_esp32
- build_esp_idf_tests_cmake_esp32s2
- build_esp_idf_tests_cmake_esp32c3
- build_esp_idf_tests_cmake_esp32s3

ci: Fixing build stage (mbedtls-related changes)
- Added MBEDTLS_PRIVATE(...) wherever required
- Updated SHAXXX functions
- Updated esp_config according to mbedtls changes

- Tests:
- build_examples_cmake_esp32
- build_examples_cmake_esp32s2
- build_examples_cmake_esp32c3
- build_examples_cmake_esp32s3

ci: Fixing build stage (example-related changes)
- Added MBEDTLS_PRIVATE(...) wherever required
- Updated SHAXXX functions
- Updated esp_config according to mbedtls changes

- Tests:
- build_examples_cmake_esp32
- build_examples_cmake_esp32s2
- build_examples_cmake_esp32c3
- build_examples_cmake_esp32s3

ci: Fixing target_test stage
- Updated test SSL version to TLS_v1_2

- Tests:
- example_test_protocols 1/2

ci: Fixing build stage
- Added checks for MBEDTLS_DHM_C (disabled by default)
- Updated esp_cryptoauthlib submodule
- Updated factory partition size for legacy BLE provisioning example

- Tests:
- build_examples_cmake_esp32
- build_examples_cmake_esp32s2
- build_examples_cmake_esp32c3
- build_examples_cmake_esp32s3

Co-authored-by: Laukik Hase <laukik.hase@espressif.com>
 2022-03-03 01:37:10 +05:30
Aditya Patwardhan
45122533e0 mbedtls-3 update: 
1) Fix build issue in mbedtls
2) skip the public headers check in IDF
3)Update Kconfig Macros
4)Remove deprecated config options
5) Update the sha API according to new nomenclature
6) Update mbedtls_rsa_init usage
7) Include mbedtls/build_info.h instead of mbedtls/config.h
8) Dont include check_config.h
9) Add additional error message in esp_blufi_api.h
 2022-03-03 01:37:10 +05:30
Aditya Patwardhan
0483bfbbfe Initial Changes for updating mbedtls to v3.0 2022-03-03 01:37:09 +05:30
Kapil Gupta
84f9aa13c9 Merge branch 'bugfix/dpp_sdkconfig_default' into 'master' 
esp_example: Enable MbedTLS for DPP enrollee by default

Closes WIFI-4275

See merge request espressif/esp-idf!16624
 2022-03-03 00:10:25 +08:00
Nachiket Kukade
7ed8fdac59 esp_wifi: Always connect Station in PMF mode if possible 
While using esp_wifi_set_config, flag pmf_capable defaults to 0.
Users may not bother to enable it, which prevents connection to a
WPA3 AP. Or the AP may reset into WPA3 mode failing the re-connection.
To ensure better security, deprecate the pmf_capable flag and set it to
true internally.
 2022-02-21 11:31:56 +05:30
Jakob Hasse
b9d66670e8 wpa_supplicant: added missing includes 2022-02-17 16:11:56 +08:00
Kapil Gupta
20847eeb96 Merge branch 'bugfix/eap_client_crash' into 'master' 
wpa_supplicant: Fix memory corruption

Closes WIFI-4299

See merge request espressif/esp-idf!16841
 2022-02-11 09:54:27 +00:00
Darian
61639fe1ec Merge branch 'refactor/freertos_remove_legacy_types' into 'master' 
FreeRTOS: Remove usage of legacy data types

Closes IDF-4566

See merge request espressif/esp-idf!16680
 2022-02-10 04:57:00 +00:00
Jiang Jiang Jian
cca2234619 Merge branch 'feature/pmf_support_for_softAP' into 'master' 
esp_wifi: Add pmf support for softAP.

Closes WIFI-1353

See merge request espressif/esp-idf!14906
 2022-02-10 04:17:00 +00:00
Darian Leung
57fd78f5ba freertos: Remove legacy data types 
This commit removes the usage of all legacy FreeRTOS data types that
are exposed via configENABLE_BACKWARD_COMPATIBILITY. Legacy types can
still be used by enabling CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY.
 2022-02-09 23:05:45 +08:00
aditi_lonkar
c3a661c0fd esp_wifi: Add pmf support for softAP. 2022-02-09 18:58:37 +05:30
morris
ef00bd59dc esp_rom: extract int matrix route and cpu ticks getter 2022-02-09 13:52:20 +08:00
Kapil Gupta
9b38b15180 wpa_supplicant: Fix invalid memory dereference 2022-02-08 23:08:51 +08:00
Anton Maklakov
7cdd151612 Merge branch 'bugfix/nocommon' into 'master' 
enable and fix warnings on common symbols

Closes IDFGH-3055 and IDF-3013

See merge request espressif/esp-idf!16802
 2022-01-28 14:39:51 +00:00
Kapil Gupta
096fe163ca Merge branch 'bugfix/wps_scan_resumption' into 'master' 
wpa_supplicant: Scan resumption in PBC mode

Closes WIFI-4313

See merge request espressif/esp-idf!16912
 2022-01-28 06:00:12 +00:00
Kapil Gupta
f57ccaabee esp_example: Enable MbedTLS for DPP enrollee by default 2022-01-28 13:53:39 +08:00
Ivan Grokhotkov
d4190a9471 wpa_supplicant: mark global variables defined in headers 'extern' 
...to avoid defining common symbols.
GCC since version 10 defaults to -fno-common and doesn't generate
common symbols, leading to duplicate definitions of these symbols.
 2022-01-27 11:00:09 +07:00
Kapil Gupta
dfb60c0436 wpa_supplicant: Scan resumption in PBC mode 2022-01-25 16:41:51 +05:30
Laukik Hase
76a29cd68d wpa_supplicant: Saved message-type digest used in handshake for PRF operations 2022-01-25 10:51:27 +05:30
Hrudaynath Dhabe
6d81821516 esp_wifi: Fix the negotiation of method with eap server. 2022-01-03 13:31:32 +05:30
Jiang Jiang Jian
d95b56a435 Merge branch 'bugfix/rrm_dpp_task_delete' into 'master' 
wpa_supplicant: Correct task deletion for RRM and DPP tasks

Closes IDFGH-5688

See merge request espressif/esp-idf!14940
 2021-12-27 10:26:33 +00:00
Kapil Gupta
69e404e7b8 wpa_supplicant: Correct task deletion for RRM and DPP tasks 
Closes https://github.com/espressif/esp-idf/issues/7409
 2021-12-24 13:52:29 +05:30
Jiang Jiang Jian
2e06f1fee5 Merge branch 'bugfix/install_key_refactor' into 'master' 
esp_wifi: refactor key install code

Closes WIFI-4014

See merge request espressif/esp-idf!14878
 2021-12-24 06:56:41 +00:00
Jiang Jiang Jian
d7b83208c1 Merge branch 'bugfix/wpa3_memory_leak' into 'master' 
esp_wifi: Fixes memory leak in wpa3.

Closes WIFI-4196

See merge request espressif/esp-idf!16520
 2021-12-24 03:15:01 +00:00
Kapil Gupta
0336584f3e esp_wifi: Refactor key install code 2021-12-23 21:31:31 +08:00
aditi_lonkar
1eeac4943c esp_wifi: Fixes memory leak in wpa3 connection. 2021-12-23 12:26:58 +05:30
Kapil Gupta
14b949077d wpa_supplicant: Add WPS Fixes 
Add following bugfixes

1. Station not able to connect when WPS pin is pressed first on AP.
2. PBC overlap getting detected for selected registrar PIN APs.
3. Station not considering authorised MACs for PIN method.
4. For PIN methodm If no AP is found, station will loop through
   APs in its vicinity and try to do WPS with them one by one till
   WPS timeout occurs. This is for some APs which do not set
   selected registrar correctly.
 2021-12-20 17:34:30 +05:30
Hrudaynath Dhabe
9469f08a0b esp_wifi: Change the verbosity of wpa_supplicant logs. 
Closes https://github.com/espressif/esp-idf/issues/8030
 2021-12-14 14:23:31 +05:30
Kapil Gupta
d3542495ab ESP_WIFI: Remove static analysis warnings 2021-12-08 17:32:22 +05:30
Jakob Hasse
16514f93f0 refactor (test_utils)!: separate file for memory check functions 
Memory check (leaks and heap tracing) functions for unit tests
now have a separate file now and are renamed for more consistency.

BREAKING CHANGE: renamed memory check function names which may be used
                 in unit tests outside IDF.
 2021-12-08 11:06:00 +08:00
Hrudaynath Dhabe
5f96a6ffd2 esp_wifi: Add support for EAP-FAST authentication method 2021-11-22 17:33:36 +05:30
Kapil Gupta
4cbd4b19cb esp_wifi: Remove scan done event for supplicant scans 
Closes https://github.com/espressif/esp-idf/issues/7423
 2021-11-20 18:25:55 +05:30
Kapil Gupta
fa8f057ba8 wpa_supplicant: Fix compilation error when debug enabled 
Closes https://github.com/espressif/esp-idf/issues/7789
 2021-11-20 18:24:56 +05:30
Kapil Gupta
27e3422a23 wpa_supplicant: Optimize BTM request scan 2021-11-20 18:24:56 +05:30
Roland Dobai
766aa57084 Build & config: Remove leftover files from the unsupported "make" build system 2021-11-11 15:32:36 +01:00
Zhang Jun Hao
a568b4fddf esp_wifi: support station only mode for code size down 2021-10-27 11:48:22 +08:00
Kapil Gupta
54940f58a4 esp_wifi: Add WPA3 192-bit certification support 2021-10-12 20:48:53 +08:00
Kapil Gupta
797c7144bd esp_wifi: Add support for GCMP and GMAC ciphers 2021-10-12 20:48:51 +08:00
Axel Lin
abb67d0033 wpa_supplicant: Fix wps_free_pins to remove all pins 
Current code does not correctly free all pins in wps_free_pins due to the
semicolon at the end of dl_list_for_each_safe(). Fix it.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
 2021-10-12 04:16:58 +08:00
Kapil Gupta
834afad47e esp_wifi: Add support for MBO certification 2021-10-04 15:56:14 +08:00
Zim Kalinowski
002cd296e1 Merge remote-tracking branch 'origin/master' into feature/github-7022 2021-10-03 12:25:39 +08:00
Kapil Gupta
8bf942c724 wpa_supplicant: Add missing cflag for legacy makefile 2021-09-22 11:30:30 +05:30
Kapil Gupta
393a9d5a94 wpa_supplicant: Update internal tls client with sha384/sha512 support 
Add support for validating certificates with SHA384 and SHA512 hashes.
 2021-09-13 14:11:55 +05:30
Kapil Gupta
6647f48dda esp_wifi: Fix interoperability issue with windows 2008 2021-09-13 14:11:37 +05:30
Kapil Gupta
d3a42d787d wpa_supplicant: clean tls client state machine 2021-08-27 00:19:32 +08:00
Axel Lin
20d0891e1e wpa_supplicant: Trivial typo fix for setting spp_sup.require 
No functional change since both SPP_AMSDU_CAP_ENABLE and SPP_AMSDU_REQ_ENABLE
are defined as 1.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Sagar Bijwe <sagar@espressif.com>

Merges https://github.com/espressif/esp-idf/pull/7366
 2021-08-11 13:07:31 +08:00
Axel Lin
cd68b93e3b esp_supplicant: Make esp_rrm_send_neighbor_rep_request return proper error 
Current code always return 0 even though wpas_rrm_send_neighbor_rep_request()
fails. Return proper error so the caller can know what's wrong.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Sagar Bijwe <sagar@espressif.com>

Merges https://github.com/espressif/esp-idf/pull/7233
 2021-08-11 13:07:31 +08:00
Axel Lin
2a5d5c02b4 wpa_supplicant: Fix clear WLAN_FC_STYPE_ACTION bit in esp_register_action_frame 
It should clear WLAN_FC_STYPE_ACTION bit intead of WLAN_FC_STYPE_ACTION.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Sagar Bijwe <sagar@espressif.com>

Merges https://github.com/espressif/esp-idf/pull/7252
 2021-08-11 13:07:31 +08:00
Axel Lin
e144a60206 wpa_supplicant: Fix memory leak in esp_issue_scan error paths 
Fix memory leak when allocate memory for params->ssid / params->bssid fails.

Fixes: 27101f9454 ("wpa_supplicant: Add initial roaming support")
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Sagar Bijwe <sagar@espressif.com>

Merges https://github.com/espressif/esp-idf/pull/7240
 2021-08-11 13:07:31 +08:00
Ato Araki
aea865b360 Fix length typo 
Closes https://github.com/espressif/esp-idf/pull/7037
 2021-07-29 14:44:43 +08:00
Kapil Gupta
e667d1af2e wpa_supplicant: bypass sonar checks for upstream code 2021-07-22 14:12:22 +08:00
Marius Vikhammer
fe921291d2 build system: fix cxx init_priority not working on S3 2021-07-14 10:56:24 +08:00
Marius Vikhammer
80acc1a002 CI: add S3 default_2 unit test config 2021-07-08 18:39:57 +08:00
Kapil Gupta
16b64e8524 wpa_supplicant: Fix some issues in 11kv 
Fix following issues:

1. RRM capability addition for open AP
2. Crash during scan flush
3. Station not able to connect if disassoc timer is present in BTM request
4. Memory leaks during wifi init/deinit.
 2021-07-02 09:41:23 +05:30
Kapil Gupta
a7713676b8 wpa_supplicant: Fix crypto related bugs 
1. Fix aes_unwrap functionality when hardware acceleration is disabled
2. Fix compilation errors when mbedTLS is disabled.
3. Disable WPA3 when mbedTLS is disabled.
 2021-06-28 19:50:01 +08:00
Jiang Jiang Jian
d5845abe62 Merge branch 'bugfix/wps_wfa_cert_fixes' into 'master' 
wpa_supplicant: Add WPS strict in config option

Closes WIFI-3624 and WIFI-3842

See merge request espressif/esp-idf!13545
 2021-06-28 10:13:23 +00:00
Jiang Jiang Jian
08bd291459 Merge branch 'bugfix/debug_prints_caused_build_failure' into 'master' 
wpa_supplicant: Fix supplicant debug logs errors.

See merge request espressif/esp-idf!13745
 2021-06-25 05:45:55 +00:00
Kapil Gupta
d3d977617b wpa_supplicant: Add WPS strict in config option 
WPS strict disables workarounds with different APs and may cause
IOT issues. Remove this as default and introduce as a config option.

Also declare esp device as single band mobile device otherwise
WFA sniffer was not able to identify it in the certification setup.
 2021-06-24 16:15:15 +08:00
Aditya Patwardhan
e44bd93cc9 i) wpa_supplicant: Force enable the necessary options for mbedtls in the wpa_supplicant to fix illegal combinations in mbedtls 
ii) Fix dependancy for one option in mbedtls menuconfig
 2021-06-20 08:39:51 +05:30
David Cermak
02ac1baee4 wpa_supplicant: Temporarily disable write-string warning 
Since some assignment of a string literal to `char *` variables were
added and not caught by the CI.
 2021-06-10 22:22:48 +08:00
Hrudaynath Dhabe
a260a1bafa wpa_supplicant: Fix supplicant debug logs errors. 2021-05-27 13:02:38 +05:30
Andrey Starodubtsev
6e343c1f8b Fix typo 
s/\bUnknow\b/Unknown/g
 2021-05-14 18:26:22 +03:00
Jiang Jiang Jian
9afd57057d Merge branch 'bugfix/add_sniffer_fcs_filter' into 'master' 
example: Add sniffer FCSFAIL filter

Closes IDFGH-4661

See merge request espressif/esp-idf!12249
 2021-05-08 07:31:51 +00:00
kapil.gupta
ad7cb5f5c1 wpa_supplicant: Write Crypto API based on mbedtls 
This commit add following crypto changes

1. Update current crypto code with upstream supplicant code
2. Add a proper porting layer to use mbedtls APIs for all the crypto
   operations used by supplicant.

Internal crypto will be used when USE_MBEDLTS flag is disabled
in supplicant's menuconfig.

This commit also removes the clutter in crypto files due to partial
porting of some APIs to mbedtls, all the code from those files have
been removed and rewritten in a generic way, this is inspired from
current upstream code.

This also reduces the lib size significantly, supplicant's lib
size reduces around ~567kb after this change(NB: lib size doesn't
indicate reduction in final bin size).
 2021-05-04 10:54:57 +00:00
xiehang
adb15e4a5d esp_wifi: Modify ESP_IF_WIFI_STA to WIFI_IF_STA 2021-04-27 20:06:42 +08:00
Kapil Gupta
20bb0c3b02 wpa_supplicant: Group key reinstallation fixes 
This commit reverts previous commit for GTK reinstallation fix
and corrects original fix.
 2021-04-23 13:44:02 +05:30
Kapil Gupta
035909872b wpa_supplicant: Prevent reinstallation of an already in-use group key 2021-04-19 04:17:20 +00:00
Angus Gratton
d6f4d99d93 core system: Fix warnings in compilation when assertions are disabled 
Adds a CI config for hello world that sets this, to catch future regressions
 2021-03-03 10:26:57 +11:00
Marius Vikhammer
04df1f3a42 CI: enable example builds for C3 
Enables building C3 examples in CI.

Fixes related warnings/errors and disables examples that cannot run.
 2021-02-09 12:04:02 +08:00
Nachiket Kukade
f9ff3da5d4 wpa_supplicant: Fix error handling in DPP Action Rx 
1. Fix error handling while receiving DPP Action frames
2. Update wifi lib to avoid forwarding Public action frames
   with NULL bss
 2021-02-07 23:23:34 +08:00
Nachiket Kukade
76b2cb28d2 Add DPP Enrollee example 
1. Add Example for DPP Enrollee
2. Use DPP Supplicant API's to setup connection
3. Add support for multiple channels in Bootstrapping
4. Add Unity testcase for testing Offchannel operations

Closes https://github.com/espressif/esp-idf/issues/5654
 2021-01-25 13:26:33 +05:30
Nachiket Kukade
87205dc2f4 Add DPP Enrollee Support 
1. Modify DPP Protocol modules for our purpose
2. Add DPP supplicant task and modules to handle DPP frames
3. Add DPP Public API's and definitions for DPP
 2021-01-25 13:24:21 +05:30
Nachiket Kukade
1ca80b4221 Add support for Remain-on-Channel and Action Tx 
1. Add API's and structures for Remain-onChannel & Action Tx
2. Handling of events and callbacks for the operations
3. Update WiFi lib with related API support
 2021-01-25 13:24:21 +05:30
Jiang Jiang Jian
1614cefd4f Merge branch 'bugfix/wpa_supplicant_coverity_issue_fixes' into 'master' 
Fix some issues raised by Coverity static Analyzer.

Closes WIFI-3251

See merge request espressif/esp-idf!11918
 2021-01-25 15:52:21 +08:00
Jiang Jiang Jian
76bb9565af Merge branch 'bugfix/fix_wifi_interface_use' into 'master' 
esp_wifi: Modify ESP_IF_WIFI_STA to WIFI_IF_STA

See merge request espressif/esp-idf!12050
 2021-01-25 12:18:27 +08:00
aditi_lonkar
562a5dd215 wpa_supplicant: Fix some memory leak issues by coverity static analyzer. 2021-01-25 03:37:47 +00:00
Alex
67d0460c2d Feature/wifi wapi release 2021-01-23 18:15:07 +08:00
kapil.gupta
7bc74089f4 esp_wifi: Add pairwise cipher support in softAP config 
Closes https://github.com/espressif/esp-idf/issues/5963
 2021-01-20 22:40:40 +05:30
xiehang
b8a8fe3f54 esp_wifi: Modify ESP_IF_WIFI_STA to WIFI_IF_STA 2021-01-19 11:55:44 +08:00
ronghulin
adfa43a3a4 feature: support tx amsdu 2021-01-15 20:10:18 +08:00
zhangyanjiao
1da9d9c356 esp_wifi: add esptouch v2 
Closes https://github.com/espressif/esp-idf/issues/1311
 2021-01-15 14:32:46 +08:00
Jiang Jiang Jian
56625eea1e Merge branch 'bugfix/11kv_bugfixes' into 'master' 
wpa_supplicant: Remove lock during processing of BTM/RRM packets

Closes WIFI-3182 and WIFI-3175

See merge request espressif/esp-idf!11717
 2020-12-25 19:09:27 +08:00
kapil.gupta
f14da2ecc0 wpa_supplicant: Remove lock during processing of btm/rrm packets 
Lock is not required during btm/rrm action frames processing and
taking it may cause inconsistant behavior since wifi task
posts the events to this task.
 2020-12-22 16:56:41 +05:30
kapil.gupta
903198ad7f esp_wifi: Fix some wifi bugs. 
1. Send encrypted mgmt frames in pmf connection
2. Remove dependecy of SHA256 AKM on PMF
3. Fix null pointer dereference
4. Set TTLS default phase2 method as MSCHAPV2.
 2020-12-21 14:27:10 +05:30
zhangyanjiao
c0f4fdfd4d wpa_supplicant: Use WPA3 flag to reduce code size 
Flag ESP32_WIFI_ENABLE_WPA3_SAE from Menuconfig is used to
control the stack size required by WPA3. Use the same flag
to compile out the WPA3 code and control the code size.
With this flag disabled code footprint reduces by about 7.7kB
in libwpa_supplicant.a
Update WiFi libs with added checks to cleanly handle disabling
of WPA3 callbacks.

Closes https://github.com/espressif/esp-idf/issues/5971
 2020-11-23 14:28:12 +08:00
kapil.gupta
27101f9454 wpa_supplicant: Add initial roaming support 
This commit adds different features from 802.11k and 802.11v
specifications to make the device ready for network assisted
roaming. It also adds initial framework for device to detect
whether it needs to move to a better AP.

Followings are added as part of this.

1. Support for sending neighbor report request and provide
   the report back to the APP.
2. Support for beacon measurement report.
3. Support for link measurement report.
4. Support for sending bss transition management query frame
   (triggered by the APP).
5. Support for bss transition management request and move
   to the candidate based on that.
6. Sending the bss transition management response.
 2020-11-17 17:15:26 +05:30
Angus Gratton
420aef1ffe Updates for riscv support 
* Target components pull in xtensa component directly
* Use CPU HAL where applicable
* Remove unnecessary xtensa headers
* Compilation changes necessary to support non-xtensa gcc types (ie int32_t/uint32_t is no
  longer signed/unsigned int).

Changes come from internal branch commit a6723fc
 2020-11-13 07:49:11 +11:00
Angus Gratton
66fb5a29bb Whitespace: Automated whitespace fixes (large commit) 
Apply the pre-commit hook whitespace fixes to all files in the repo.

(Line endings, blank lines at end of file, trailing whitespace)
 2020-11-11 07:36:35 +00:00
Nachiket Kukade
89a25e41c8 wpa_supplicant: Increase PMK Lifetime to a very high value 
For WPA3 connection nearing PMK lifetime expiry, PMK Cache
needs a re-authentication or the cache will expire. After
current expiry of 12 hours Station ends up sending a deauth
to the AP. An SAE re-authentication also cannot occur without
a disconnection with current implementation. So increase the
PMK lifetime to 100 days for now.
 2020-11-10 10:17:48 +00:00
Angus Gratton
6d1d6e736d Merge branch 'bugfix/wpa_supplicant_link_depth' into 'master' 
wpa_supplicant: Fix failure to link under some circumstances

Closes IDFGH-3715

See merge request espressif/esp-idf!10822
 2020-10-26 12:22:32 +08:00
kapil.gupta
474c38a5f3 esp_wifi: Add WPS Reason code in all failures 2020-10-21 10:56:19 +05:30
Angus Gratton
bc1cca2bf8 wpa_supplicant: Fix failure to link under some circumstances 
Depending on CMake internals, the wpa_supplicant library may need to be repeated
multiple times in the linker command line.

Closes https://github.com/espressif/esp-idf/issues/5641
 2020-10-13 18:25:29 +11:00