Clean up configuration manager (#10528)

* Remove unused ConfigurationManager methods.

Part one:
* Firmware build time.
* The device certificate chain and private key.
* The provisioning hash.
* Configuring the CHIP stack.

* Remove unused ConfigurationManager methods.

Part two:
* Service ID, configuration, and provisioning data.
* Paired account ID.

* Remove unused ConfigurationManager methods.

Part three:
* Fabric ID.
* The flags member variable since the methods that used it have also been removed.
* Remove the fabric ID from the shell commands since that was the only place that used it.

* Remove unused ConfigurationManager methods.

Part four:
* Device ID.
* Remove the device ID from the shell commands since that was the only place that used it.

* Remove unused ConfigurationManager methods.

Part five:
* QR Code.
* Wifi AP SSID.
* _GetPollPeriod (GenericConfigurationManagerImpl-specific)

* Remove string parsing methods that the ConfigurationManager no longer uses.

Author: harimau-qirex

src/include/platform/ConfigurationManager.h

@@ -58,7 +58,6 @@ class ConfigurationManager
 
     enum
     {
-        kMaxPairingCodeLength      = 16,
         kMaxSerialNumberLength     = 32,
         kMaxFirmwareRevisionLength = 32,
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
@@ -82,22 +81,8 @@ class ConfigurationManager
     CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & dayOfMonth);
     CHIP_ERROR GetFirmwareRevisionString(char * buf, size_t bufSize);
     CHIP_ERROR GetFirmwareRevision(uint32_t & firmwareRev);
-    CHIP_ERROR GetFirmwareBuildTime(uint16_t & year, uint8_t & month, uint8_t & dayOfMonth, uint8_t & hour, uint8_t & minute,
-                                    uint8_t & second);
-    CHIP_ERROR GetDeviceId(uint64_t & deviceId);
-    CHIP_ERROR GetDeviceCertificate(uint8_t * buf, size_t bufSize, size_t & certLen);
-    CHIP_ERROR GetDeviceIntermediateCACerts(uint8_t * buf, size_t bufSize, size_t & certsLen);
-    CHIP_ERROR GetDevicePrivateKey(uint8_t * buf, size_t bufSize, size_t & keyLen);
-    CHIP_ERROR GetManufacturerDeviceId(uint64_t & deviceId);
-    CHIP_ERROR GetManufacturerDeviceCertificate(uint8_t * buf, size_t bufSize, size_t & certLen);
-    CHIP_ERROR GetManufacturerDeviceIntermediateCACerts(uint8_t * buf, size_t bufSize, size_t & certsLen);
-    CHIP_ERROR GetManufacturerDevicePrivateKey(uint8_t * buf, size_t bufSize, size_t & keyLen);
     CHIP_ERROR GetSetupPinCode(uint32_t & setupPinCode);
     CHIP_ERROR GetSetupDiscriminator(uint16_t & setupDiscriminator);
-    CHIP_ERROR GetServiceId(uint64_t & serviceId);
-    CHIP_ERROR GetFabricId(uint64_t & fabricId);
-    CHIP_ERROR GetServiceConfig(uint8_t * buf, size_t bufSize, size_t & serviceConfigLen);
-    CHIP_ERROR GetPairedAccountId(char * buf, size_t bufSize, size_t & accountIdLen);
 #if CHIP_ENABLE_ROTATING_DEVICE_ID
     // Lifetime counter is monotonic counter that is incremented only in the case of a factory reset
     CHIP_ERROR GetLifetimeCounter(uint16_t & lifetimeCounter);
@@ -110,40 +95,21 @@ class ConfigurationManager
     CHIP_ERROR StorePrimary802154MACAddress(const uint8_t * buf);
     CHIP_ERROR StoreManufacturingDate(const char * mfgDate, size_t mfgDateLen);
     CHIP_ERROR StoreProductRevision(uint16_t productRev);
-    CHIP_ERROR StoreFabricId(uint64_t fabricId);
-    CHIP_ERROR StoreManufacturerDeviceId(uint64_t deviceId);
-    CHIP_ERROR StoreManufacturerDeviceCertificate(const uint8_t * cert, size_t certLen);
-    CHIP_ERROR StoreManufacturerDeviceIntermediateCACerts(const uint8_t * certs, size_t certsLen);
-    CHIP_ERROR StoreManufacturerDevicePrivateKey(const uint8_t * key, size_t keyLen);
     CHIP_ERROR StoreSetupPinCode(uint32_t setupPinCode);
     CHIP_ERROR StoreSetupDiscriminator(uint16_t setupDiscriminator);
-    CHIP_ERROR StoreServiceProvisioningData(uint64_t serviceId, const uint8_t * serviceConfig, size_t serviceConfigLen,
-                                            const char * accountId, size_t accountIdLen);
-    CHIP_ERROR ClearServiceProvisioningData();
-    CHIP_ERROR StoreServiceConfig(const uint8_t * serviceConfig, size_t serviceConfigLen);
-    CHIP_ERROR StorePairedAccountId(const char * accountId, size_t accountIdLen);
     CHIP_ERROR StoreRegulatoryLocation(uint32_t location);
     CHIP_ERROR StoreCountryCode(const char * code, size_t codeLen);
     CHIP_ERROR StoreBreadcrumb(uint64_t breadcrumb);
 
-    CHIP_ERROR GetQRCodeString(char * buf, size_t bufSize);
-
-    CHIP_ERROR GetWiFiAPSSID(char * buf, size_t bufSize);
-
     CHIP_ERROR GetBLEDeviceIdentificationInfo(Ble::ChipBLEDeviceIdentificationInfo & deviceIdInfo);
 
 #if !defined(NDEBUG)
     CHIP_ERROR RunUnitTests();
 #endif
 
-    bool IsServiceProvisioned();
-    bool IsPairedToAccount();
-    bool IsMemberOfFabric();
     bool IsFullyProvisioned();
     void InitiateFactoryReset();
 
-    CHIP_ERROR ComputeProvisioningHash(uint8_t * hashBuf, size_t hashBufSize);
-
     void LogDeviceConfig();
 
     bool IsCommissionableDeviceTypeEnabled();
@@ -170,7 +136,6 @@ class ConfigurationManager
     using ImplClass = ::chip::DeviceLayer::ConfigurationManagerImpl;
 
     CHIP_ERROR Init();
-    CHIP_ERROR ConfigureChipStack();
     bool CanFactoryReset();
     CHIP_ERROR GetFailSafeArmed(bool & val);
     CHIP_ERROR SetFailSafeArmed(bool val);
@@ -303,52 +268,6 @@ inline CHIP_ERROR ConfigurationManager::GetFirmwareRevision(uint32_t & firmwareR
     return static_cast<ImplClass *>(this)->_GetFirmwareRevision(firmwareRev);
 }
 
-inline CHIP_ERROR ConfigurationManager::GetFirmwareBuildTime(uint16_t & year, uint8_t & month, uint8_t & dayOfMonth, uint8_t & hour,
-                                                             uint8_t & minute, uint8_t & second)
-{
-    return static_cast<ImplClass *>(this)->_GetFirmwareBuildTime(year, month, dayOfMonth, hour, minute, second);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetDeviceId(uint64_t & deviceId)
-{
-    return static_cast<ImplClass *>(this)->_GetDeviceId(deviceId);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetDeviceCertificate(uint8_t * buf, size_t bufSize, size_t & certLen)
-{
-    return static_cast<ImplClass *>(this)->_GetDeviceCertificate(buf, bufSize, certLen);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetDeviceIntermediateCACerts(uint8_t * buf, size_t bufSize, size_t & certsLen)
-{
-    return static_cast<ImplClass *>(this)->_GetDeviceIntermediateCACerts(buf, bufSize, certsLen);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetDevicePrivateKey(uint8_t * buf, size_t bufSize, size_t & keyLen)
-{
-    return static_cast<ImplClass *>(this)->_GetDevicePrivateKey(buf, bufSize, keyLen);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetManufacturerDeviceId(uint64_t & deviceId)
-{
-    return static_cast<ImplClass *>(this)->_GetManufacturerDeviceId(deviceId);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetManufacturerDeviceCertificate(uint8_t * buf, size_t bufSize, size_t & certLen)
-{
-    return static_cast<ImplClass *>(this)->_GetManufacturerDeviceCertificate(buf, bufSize, certLen);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetManufacturerDeviceIntermediateCACerts(uint8_t * buf, size_t bufSize, size_t & certsLen)
-{
-    return static_cast<ImplClass *>(this)->_GetManufacturerDeviceIntermediateCACerts(buf, bufSize, certsLen);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetManufacturerDevicePrivateKey(uint8_t * buf, size_t bufSize, size_t & keyLen)
-{
-    return static_cast<ImplClass *>(this)->_GetManufacturerDevicePrivateKey(buf, bufSize, keyLen);
-}
-
 inline CHIP_ERROR ConfigurationManager::GetSetupPinCode(uint32_t & setupPinCode)
 {
     return static_cast<ImplClass *>(this)->_GetSetupPinCode(setupPinCode);
@@ -359,26 +278,6 @@ inline CHIP_ERROR ConfigurationManager::GetSetupDiscriminator(uint16_t & setupDi
     return static_cast<ImplClass *>(this)->_GetSetupDiscriminator(setupDiscriminator);
 }
 
-inline CHIP_ERROR ConfigurationManager::GetServiceId(uint64_t & serviceId)
-{
-    return static_cast<ImplClass *>(this)->_GetServiceId(serviceId);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetFabricId(uint64_t & fabricId)
-{
-    return static_cast<ImplClass *>(this)->_GetFabricId(fabricId);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetServiceConfig(uint8_t * buf, size_t bufSize, size_t & serviceConfigLen)
-{
-    return static_cast<ImplClass *>(this)->_GetServiceConfig(buf, bufSize, serviceConfigLen);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetPairedAccountId(char * buf, size_t bufSize, size_t & accountIdLen)
-{
-    return static_cast<ImplClass *>(this)->_GetPairedAccountId(buf, bufSize, accountIdLen);
-}
-
 #if CHIP_ENABLE_ROTATING_DEVICE_ID
 inline CHIP_ERROR ConfigurationManager::GetLifetimeCounter(uint16_t & lifetimeCounter)
 {
@@ -426,31 +325,6 @@ inline CHIP_ERROR ConfigurationManager::StoreProductRevision(uint16_t productRev
     return static_cast<ImplClass *>(this)->_StoreProductRevision(productRev);
 }
 
-inline CHIP_ERROR ConfigurationManager::StoreFabricId(uint64_t fabricId)
-{
-    return static_cast<ImplClass *>(this)->_StoreFabricId(fabricId);
-}
-
-inline CHIP_ERROR ConfigurationManager::StoreManufacturerDeviceId(uint64_t deviceId)
-{
-    return static_cast<ImplClass *>(this)->_StoreManufacturerDeviceId(deviceId);
-}
-
-inline CHIP_ERROR ConfigurationManager::StoreManufacturerDeviceCertificate(const uint8_t * cert, size_t certLen)
-{
-    return static_cast<ImplClass *>(this)->_StoreManufacturerDeviceCertificate(cert, certLen);
-}
-
-inline CHIP_ERROR ConfigurationManager::StoreManufacturerDeviceIntermediateCACerts(const uint8_t * certs, size_t certsLen)
-{
-    return static_cast<ImplClass *>(this)->_StoreManufacturerDeviceIntermediateCACerts(certs, certsLen);
-}
-
-inline CHIP_ERROR ConfigurationManager::StoreManufacturerDevicePrivateKey(const uint8_t * key, size_t keyLen)
-{
-    return static_cast<ImplClass *>(this)->_StoreManufacturerDevicePrivateKey(key, keyLen);
-}
-
 inline CHIP_ERROR ConfigurationManager::StoreSetupPinCode(uint32_t setupPinCode)
 {
     return static_cast<ImplClass *>(this)->_StoreSetupPinCode(setupPinCode);
@@ -461,14 +335,6 @@ inline CHIP_ERROR ConfigurationManager::StoreSetupDiscriminator(uint16_t setupDi
     return static_cast<ImplClass *>(this)->_StoreSetupDiscriminator(setupDiscriminator);
 }
 
-inline CHIP_ERROR ConfigurationManager::StoreServiceProvisioningData(uint64_t serviceId, const uint8_t * serviceConfig,
-                                                                     size_t serviceConfigLen, const char * accountId,
-                                                                     size_t accountIdLen)
-{
-    return static_cast<ImplClass *>(this)->_StoreServiceProvisioningData(serviceId, serviceConfig, serviceConfigLen, accountId,
-                                                                         accountIdLen);
-}
-
 inline CHIP_ERROR ConfigurationManager::StoreRegulatoryLocation(uint32_t location)
 {
     return static_cast<ImplClass *>(this)->_StoreRegulatoryLocation(location);
@@ -484,21 +350,6 @@ inline CHIP_ERROR ConfigurationManager::StoreBreadcrumb(uint64_t breadcrumb)
     return static_cast<ImplClass *>(this)->_StoreBreadcrumb(breadcrumb);
 }
 
-inline CHIP_ERROR ConfigurationManager::ClearServiceProvisioningData()
-{
-    return static_cast<ImplClass *>(this)->_ClearServiceProvisioningData();
-}
-
-inline CHIP_ERROR ConfigurationManager::StoreServiceConfig(const uint8_t * serviceConfig, size_t serviceConfigLen)
-{
-    return static_cast<ImplClass *>(this)->_StoreServiceConfig(serviceConfig, serviceConfigLen);
-}
-
-inline CHIP_ERROR ConfigurationManager::StorePairedAccountId(const char * accountId, size_t accountIdLen)
-{
-    return static_cast<ImplClass *>(this)->_StorePairedAccountId(accountId, accountIdLen);
-}
-
 inline CHIP_ERROR ConfigurationManager::ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value)
 {
     return static_cast<ImplClass *>(this)->_ReadPersistedStorageValue(key, value);
@@ -509,36 +360,11 @@ inline CHIP_ERROR ConfigurationManager::WritePersistedStorageValue(::chip::Platf
     return static_cast<ImplClass *>(this)->_WritePersistedStorageValue(key, value);
 }
 
-inline CHIP_ERROR ConfigurationManager::GetQRCodeString(char * buf, size_t bufSize)
-{
-    return static_cast<ImplClass *>(this)->_GetQRCodeString(buf, bufSize);
-}
-
-inline CHIP_ERROR ConfigurationManager::GetWiFiAPSSID(char * buf, size_t bufSize)
-{
-    return static_cast<ImplClass *>(this)->_GetWiFiAPSSID(buf, bufSize);
-}
-
 inline CHIP_ERROR ConfigurationManager::GetBLEDeviceIdentificationInfo(Ble::ChipBLEDeviceIdentificationInfo & deviceIdInfo)
 {
     return static_cast<ImplClass *>(this)->_GetBLEDeviceIdentificationInfo(deviceIdInfo);
 }
 
-inline bool ConfigurationManager::IsServiceProvisioned()
-{
-    return static_cast<ImplClass *>(this)->_IsServiceProvisioned();
-}
-
-inline bool ConfigurationManager::IsPairedToAccount()
-{
-    return static_cast<ImplClass *>(this)->_IsPairedToAccount();
-}
-
-inline bool ConfigurationManager::IsMemberOfFabric()
-{
-    return static_cast<ImplClass *>(this)->_IsMemberOfFabric();
-}
-
 inline bool ConfigurationManager::IsFullyProvisioned()
 {
     return static_cast<ImplClass *>(this)->_IsFullyProvisioned();
@@ -559,21 +385,11 @@ inline CHIP_ERROR ConfigurationManager::RunUnitTests()
 }
 #endif
 
-inline CHIP_ERROR ConfigurationManager::ComputeProvisioningHash(uint8_t * hashBuf, size_t hashBufSize)
-{
-    return static_cast<ImplClass *>(this)->_ComputeProvisioningHash(hashBuf, hashBufSize);
-}
-
 inline CHIP_ERROR ConfigurationManager::Init()
 {
     return static_cast<ImplClass *>(this)->_Init();
 }
 
-inline CHIP_ERROR ConfigurationManager::ConfigureChipStack()
-{
-    return static_cast<ImplClass *>(this)->_ConfigureChipStack();
-}
-
 inline bool ConfigurationManager::CanFactoryReset()
 {
     return static_cast<ImplClass *>(this)->_CanFactoryReset();

src/include/platform/GeneralUtils.h

@@ -28,8 +28,6 @@
 namespace chip {
 namespace DeviceLayer {
 
-extern CHIP_ERROR ParseCompilerDateStr(const char * dateStr, uint16_t & year, uint8_t & month, uint8_t & dayOfMonth);
-extern CHIP_ERROR Parse24HourTimeStr(const char * timeStr, uint8_t & hour, uint8_t & minute, uint8_t & second);
 extern const char * CharacterizeIPv6Address(const chip::Inet::IPAddress & ipAddr);
 extern const char * CharacterizeIPv6Prefix(const chip::Inet::IPPrefix & inPrefix);
 extern void RegisterDeviceLayerErrorFormatter();