Fix GetRand due to that InitEntropy (srand) is not called.

project-chip · Sep 2, 2021 · e071bd6 · e071bd6
1 parent f0ae9d8
commit e071bd6
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 548 deletions.
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl.cpp b/src/include/platform/internal/GenericPlatformManagerImpl.cpp
@@ -56,7 +56,12 @@ CHIP_ERROR GenericPlatformManagerImpl<ImplClass>::_InitChipStack()
     // Arrange for Device Layer errors to be translated to text.
     RegisterDeviceLayerErrorFormatter();
 
-    // TODO Initialize the source used by CHIP to get secure random data.
+    err = InitEntropy();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Entropy initialization failed: %s", ErrorStr(err));
+    }
+    SuccessOrExit(err);
 
     err = ConfigurationMgr().Init();
     if (err != CHIP_NO_ERROR)

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -258,6 +258,7 @@ if (chip_device_platform != "none") {
       "../include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h",
       "../include/platform/internal/testing/ConfigUnitTest.h",
       "DeviceControlServer.cpp",
+      "Entropy.cpp",
       "GeneralUtils.cpp",
       "Globals.cpp",
       "LockTracker.cpp",
@@ -270,6 +271,7 @@ if (chip_device_platform != "none") {
 
     public_deps = [
       ":platform_base",
+      "${chip_root}/src/crypto",
       "${chip_root}/src/lib/support",
     ]
 

diff --git a/src/platform/EFR32/Entropy.cpp b/src/platform/EFR32/Entropy.cpp
diff --git a/src/platform/ESP32/Entropy.cpp b/src/platform/ESP32/Entropy.cpp
diff --git a/src/platform/ESP32/PlatformManagerImpl.cpp b/src/platform/ESP32/PlatformManagerImpl.cpp
@@ -107,12 +107,12 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
         }
     }
 
+    ReturnErrorOnFailure(chip::Crypto::add_entropy_source(app_entropy_source, NULL, 16));
+
     // Call _InitChipStack() on the generic implementation base class
     // to finish the initialization process.
     ReturnErrorOnFailure(Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack());
 
-    ReturnErrorOnFailure(chip::Crypto::add_entropy_source(app_entropy_source, NULL, 16));
-
 exit:
     return chip::DeviceLayer::Internal::ESP32Utils::MapError(err);
 }

diff --git a/src/platform/Linux/Entropy.cpp → src/platform/Entropy.cpp b/src/platform/Linux/Entropy.cpp → src/platform/Entropy.cpp
@@ -22,34 +22,18 @@
  *          on the Linux platforms.
  */
 
-#include <platform/internal/CHIPDeviceLayerInternal.h>
-#include <support/crypto/CHIPRNG.h>
-
-using namespace ::chip;
+#include <crypto/CHIPCryptoPAL.h>
 
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
 CHIP_ERROR InitEntropy()
 {
-    CHIP_ERROR err;
     unsigned int seed;
-
-    // Initialize the source used by CHIP to get secure random data.
-    err = Platform::Security::InitSecureRandomDataSource(getentropy, 64, NULL, 0);
-    SuccessOrExit(err);
-
-    // Seed the standard rand() pseudo-random generator with data from the secure random source.
-    err = Platform::Security::GetSecureRandomData((uint8_t *) &seed, sizeof(seed));
-    SuccessOrExit(err);
+    ReturnErrorOnFailure(chip::Crypto::DRBG_get_bytes((uint8_t *) &seed, sizeof(seed)));
     srand(seed);
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(Crypto, "InitEntropy() failed: %d" err);
-    }
-    return err;
+    return CHIP_NO_ERROR;
 }
 
 } // namespace Internal