Allow PSK instead of passphrase in WiFiSTA::begin (espressif#897)

mascii · me-no-dev · commit 79e5d4c40da0 · 2017-12-04T17:46:49.000+01:00
diff --git a/libraries/WiFi/src/WiFiSTA.cpp b/libraries/WiFi/src/WiFiSTA.cpp
@@ -110,7 +110,7 @@ wl_status_t WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_
         return WL_CONNECT_FAILED;
     }
 
-    if(passphrase && strlen(passphrase) > 63) {
+    if(passphrase && strlen(passphrase) > 64) {
         // fail passphrase too long!
         return WL_CONNECT_FAILED;
     }
@@ -119,7 +119,10 @@ wl_status_t WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_
     strcpy(reinterpret_cast<char*>(conf.sta.ssid), ssid);
 
     if(passphrase) {
-        strcpy(reinterpret_cast<char*>(conf.sta.password), passphrase);
+        if (strlen(passphrase) == 64) // it's not a passphrase, is the PSK
+            memcpy(reinterpret_cast<char*>(conf.sta.password), passphrase, 64);
+        else
+            strcpy(reinterpret_cast<char*>(conf.sta.password), passphrase);
     } else {
         *conf.sta.password = 0;
     }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ wl_status_t WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_`
`110`	`110`	`return WL_CONNECT_FAILED;`
`111`	`111`	`}`
`112`	`112`
`113`		`- if(passphrase && strlen(passphrase) > 63) {`
	`113`	`+ if(passphrase && strlen(passphrase) > 64) {`
`114`	`114`	`// fail passphrase too long!`
`115`	`115`	`return WL_CONNECT_FAILED;`
`116`	`116`	`}`
`@@ -119,7 +119,10 @@ wl_status_t WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_`
`119`	`119`	`strcpy(reinterpret_cast<char*>(conf.sta.ssid), ssid);`
`120`	`120`
`121`	`121`	`if(passphrase) {`
`122`		`- strcpy(reinterpret_cast<char*>(conf.sta.password), passphrase);`
	`122`	`+ if (strlen(passphrase) == 64) // it's not a passphrase, is the PSK`
	`123`	`+ memcpy(reinterpret_cast<char*>(conf.sta.password), passphrase, 64);`
	`124`	`+ else`
	`125`	`+ strcpy(reinterpret_cast<char*>(conf.sta.password), passphrase);`
`123`	`126`	`} else {`
`124`	`127`	`*conf.sta.password = 0;`
`125`	`128`	`}`