[BouffaloLab]update sdk to support open network (#29070)

* BL702&BL602 Support OpenNetWork * update sdk to support open network on bl706-wifi * Restyled by whitespace * BLCONFIG Bytes alignment * remove repo openthread misc * code style * Restyled by gn * remove otPlatCAlloc/otPlatFree * Restyled by gn * add comment and check credentials length * Restyled by clang-format --------- Co-authored-by: wyhong <[email protected]> Co-authored-by: Restyled.io <[email protected]>
project-chip · Nov 30, 2023 · 352371e · 352371e
1 parent 0b61ef9
commit 352371e
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 33 deletions.
diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp
@@ -44,11 +44,11 @@ CHIP_ERROR BLWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeC
     size_t ssidLen        = 0;
     size_t credentialsLen = 0;
 
-    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiSSID, mSavedNetwork.credentials,
+    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiPassword, mSavedNetwork.credentials,
                                                    sizeof(mSavedNetwork.credentials), &credentialsLen);
     SuccessOrExit(err);
-    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiPassword, mSavedNetwork.ssid,
-                                                   sizeof(mSavedNetwork.ssid), &ssidLen);
+    err = PersistedStorage::KeyValueStoreMgr().Get(BLConfig::kConfigKey_WiFiSSID, mSavedNetwork.ssid, sizeof(mSavedNetwork.ssid),
+                                                   &ssidLen);
     SuccessOrExit(err);
 
     mSavedNetwork.credentialsLen = credentialsLen;
@@ -160,7 +160,33 @@ CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen,
     memcpy(passwd, key, keyLen);
     wifi_interface_t wifi_interface;
     wifi_interface = wifi_mgmr_sta_enable();
-    wifi_mgmr_sta_connect(&wifi_interface, wifi_ssid, passwd, NULL, NULL, 0, 0);
+    // Valid Credentials length are:
+    // - 0 bytes: Unsecured (open) connection
+    // - 5 bytes: WEP-64 passphrase
+    // - 10 hexadecimal ASCII characters: WEP-64 40-bit hex raw PSK
+    // - 13 bytes: WEP-128 passphrase
+    // - 26 hexadecimal ASCII characters: WEP-128 104-bit hex raw PSK
+    // - 8..63 bytes: WPA/WPA2/WPA3 passphrase
+    // - 64 bytes: WPA/WPA2/WPA3 raw hex PSK
+    // Note 10 hex WEP64 and 13 bytes / 26 hex WEP128 passphrase are covered by 8~63 bytes WPA passphrase, so we don't check WEP64
+    // hex and WEP128 passphrase.
+    if (keyLen == BLWiFiDriver::WiFiCredentialLength::kOpen || keyLen == BLWiFiDriver::WiFiCredentialLength::kWEP64 ||
+        (keyLen >= BLWiFiDriver::WiFiCredentialLength::kMinWPAPSK && keyLen <= BLWiFiDriver::WiFiCredentialLength::kMaxWPAPSK))
+    {
+
+        if (keyLen == BLWiFiDriver::WiFiCredentialLength::kOpen)
+        {
+            wifi_mgmr_sta_connect(&wifi_interface, wifi_ssid, NULL, NULL, NULL, 0, 0);
+        }
+        else
+        {
+            wifi_mgmr_sta_connect(&wifi_interface, wifi_ssid, passwd, NULL, NULL, 0, 0);
+        }
+    }
+    else
+    {
+        return CHIP_ERROR_INVALID_STRING_LENGTH;
+    }
 
     return CHIP_NO_ERROR;
 }

diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h
@@ -86,6 +86,14 @@ class BLWiFiDriver final : public WiFiDriver
         char credentials[DeviceLayer::Internal::kMaxWiFiKeyLength];
         uint8_t credentialsLen = 0;
     };
+    enum WiFiCredentialLength
+    {
+        kOpen      = 0,
+        kWEP64     = 5,
+        kMinWPAPSK = 8,
+        kMaxWPAPSK = 63,
+        kWPAPSKHex = 64,
+    };
 
     // BaseDriver
     NetworkIterator * GetNetworks() override { return new WiFiNetworkIterator(this); }
@@ -116,7 +124,6 @@ class BLWiFiDriver final : public WiFiDriver
 
     CHIP_ERROR SetLastDisconnectReason(const ChipDeviceEvent * event);
     int32_t GetLastDisconnectReason();
-
     static BLWiFiDriver & GetInstance()
     {
         static BLWiFiDriver instance;

diff --git a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp b/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.cpp
@@ -132,7 +132,33 @@ Status BLWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCh
 CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
 {
     ChipLogProgress(NetworkProvisioning, "ConnectWiFiNetwork");
-    wifiInterface_connect((char *) ssid, (char *) key);
+    // Valid Credentials length are:
+    // - 0 bytes: Unsecured (open) connection
+    // - 5 bytes: WEP-64 passphrase
+    // - 10 hexadecimal ASCII characters: WEP-64 40-bit hex raw PSK
+    // - 13 bytes: WEP-128 passphrase
+    // - 26 hexadecimal ASCII characters: WEP-128 104-bit hex raw PSK
+    // - 8..63 bytes: WPA/WPA2/WPA3 passphrase
+    // - 64 bytes: WPA/WPA2/WPA3 raw hex PSK
+    // Note 10 hex WEP64 and 13 bytes / 26 hex WEP128 passphrase are covered by 8~63 bytes WPA passphrase, so we don't check WEP64
+    // hex and WEP128 passphrase.
+    if (keyLen == BLWiFiDriver::WiFiCredentialLength::kOpen || keyLen == BLWiFiDriver::WiFiCredentialLength::kWEP64 ||
+        (keyLen >= BLWiFiDriver::WiFiCredentialLength::kMinWPAPSK && keyLen <= BLWiFiDriver::WiFiCredentialLength::kMaxWPAPSK))
+    {
+
+        if (keyLen == BLWiFiDriver::WiFiCredentialLength::kOpen)
+        {
+            wifiInterface_connect((char *) ssid, NULL);
+        }
+        else
+        {
+            wifiInterface_connect((char *) ssid, (char *) key);
+        }
+    }
+    else
+    {
+        return CHIP_ERROR_INVALID_STRING_LENGTH;
+    }
     ConnectivityMgrImpl().ChangeWiFiStationState(ConnectivityManager::kWiFiStationState_Connecting);
     return CHIP_NO_ERROR;
 }

diff --git a/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.h b/src/platform/bouffalolab/BL702/NetworkCommissioningDriver.h
@@ -78,7 +78,14 @@ class BLWiFiDriver final : public WiFiDriver
         char credentials[DeviceLayer::Internal::kMaxWiFiKeyLength + 1];
         uint8_t credentialsLen = 0;
     };
-
+    enum WiFiCredentialLength
+    {
+        kOpen      = 0,
+        kWEP64     = 5,
+        kMinWPAPSK = 8,
+        kMaxWPAPSK = 63,
+        kWPAPSKHex = 64,
+    };
     // BaseDriver
     NetworkIterator * GetNetworks() override { return new WiFiNetworkIterator(this); }
     CHIP_ERROR Init(NetworkStatusChangeCallback * networkStatusChangeCallback) override;

diff --git a/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp b/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp
@@ -103,16 +103,6 @@ extern "C" otInstance * otrGetInstance()
     return ThreadStackMgrImpl().OTInstance();
 }
 
-extern "C" void * otPlatCAlloc(size_t aNum, size_t aSize)
-{
-    return calloc(aNum, aSize);
-}
-
-extern "C" void otPlatFree(void * aPtr)
-{
-    free(aPtr);
-}
-
 extern "C" uint32_t otrEnterCrit(void)
 {
     if (xPortIsInsideInterrupt())

diff --git a/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp b/src/platform/bouffalolab/BL702L/ThreadStackManagerImpl.cpp
@@ -106,16 +106,6 @@ extern "C" otInstance * otrGetInstance()
     return ThreadStackMgrImpl().OTInstance();
 }
 
-extern "C" void * otPlatCAlloc(size_t aNum, size_t aSize)
-{
-    return calloc(aNum, aSize);
-}
-
-extern "C" void otPlatFree(void * aPtr)
-{
-    free(aPtr);
-}
-
 extern "C" ot_system_event_t otrGetNotifyEvent(void)
 {
     ot_system_event_t sevent = OT_SYSTEM_EVENT_NONE;

diff --git a/src/platform/bouffalolab/common/BLConfig.cpp b/src/platform/bouffalolab/common/BLConfig.cpp
@@ -111,9 +111,21 @@ CHIP_ERROR BLConfig::WriteConfigValue(const char * key, uint8_t * val, size_t si
 
     ef_port_env_lock();
 
-    if (size && val)
+    if (size)
     {
-        ret = ef_set_env_blob(key, val, size);
+        if (val)
+        {
+            ret = ef_set_env_blob(key, val, size);
+        }
+        else
+        {
+            ret = EF_ENV_ARG_ERR;
+        }
+    }
+    else
+    {
+        uint32_t value_null = 0;
+        ret                 = ef_set_env_blob(key, &value_null, size);
     }
 
     ef_port_env_unlock();
@@ -240,11 +252,22 @@ CHIP_ERROR BLConfig::WriteKVS(const char * key, const void * value, size_t value
 
     ef_port_env_lock();
 
-    if (value && value_size)
+    if (value_size)
     {
-        ret = ef_set_env_blob(key, value, value_size);
+        if (value)
+        {
+            ret = ef_set_env_blob(key, value, value_size);
+        }
+        else
+        {
+            ret = EF_ENV_ARG_ERR;
+        }
+    }
+    else
+    {
+        uint32_t value_null = 0;
+        ret                 = ef_set_env_blob(key, &value_null, value_size);
     }
-
     ef_port_env_unlock();
 
     if (ret == EF_NO_ERR)

diff --git a/third_party/bouffalolab/repo b/third_party/bouffalolab/repo