arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

fix bug. in sta mode, empty passphrase should not use secure auth mode (#5516)

Browse Source 
* in sta mode, empty passphrase should not use secure auth mode

* use nullptr, camelCase and parenthesis
This commit is contained in:
acevest
2018-12-18 21:47:25 +08:00
committed by Develo
parent 3348ddf650
commit 34e90f3c56
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
View File

@ -113,21 +113,22 @@ wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase,
return WL_CONNECT_FAILED; return WL_CONNECT_FAILED;
} }
if(passphrase && strlen(passphrase) > 64) { int passphraseLen = passphrase == nullptr ? 0 : strlen(passphrase);
if(passphraseLen > 64) {
// fail passphrase too long! // fail passphrase too long!
return WL_CONNECT_FAILED; return WL_CONNECT_FAILED;
} }
struct station_config conf; struct station_config conf;
conf.threshold.authmode = (passphraseLen == 0) ? AUTH_OPEN : (_useInsecureWEP ? AUTH_WEP : AUTH_WPA_PSK);
if(strlen(ssid) == 32) if(strlen(ssid) == 32)
memcpy(reinterpret_cast<char*>(conf.ssid), ssid, 32); //copied in without null term memcpy(reinterpret_cast<char*>(conf.ssid), ssid, 32); //copied in without null term
else else
strcpy(reinterpret_cast<char*>(conf.ssid), ssid); strcpy(reinterpret_cast<char*>(conf.ssid), ssid);
conf.threshold.authmode = AUTH_OPEN;
if(passphrase) { if(passphrase) {
conf.threshold.authmode = _useInsecureWEP ? AUTH_WEP : AUTH_WPA_PSK; if (passphraseLen == 64) // it's not a passphrase, is the PSK, which is copied into conf.password without null term
if (strlen(passphrase) == 64) // it's not a passphrase, is the PSK, which is copied into conf.password without null term
memcpy(reinterpret_cast<char*>(conf.password), passphrase, 64); memcpy(reinterpret_cast<char*>(conf.password), passphrase, 64);
else else
strcpy(reinterpret_cast<char*>(conf.password), passphrase); strcpy(reinterpret_cast<char*>(conf.password), passphrase);