AI review fixes

Author: ArekBalysNordic

examples/shell/shell_common/cmd_otcli.cpp

@@ -108,8 +108,6 @@ CHIP_ERROR cmd_otcli_dispatch(int argc, char ** argv)
     return CHIP_NO_ERROR;
 }
 
-static const shell_command_t cmds_otcli_root = { &cmd_otcli_dispatch, "otcli", "Dispatch OpenThread CLI command" };
-
 #if OPENTHREAD_API_VERSION >= 85
 #if !CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
 static int OnOtCliOutput(void * aContext, const char * aFormat, va_list aArguments)
@@ -170,10 +168,14 @@ CHIP_ERROR cmd_otcli_dispatch(int argc, char ** argv)
     }
 }
 
-static const shell_command_t cmds_otcli_root = { &cmd_otcli_dispatch, "otcli", "Dispatch OpenThread CLI command" };
-
 #endif // CHIP_TARGET_STYLE_EMBEDDED/UNIX
 
+#if (CHIP_TARGET_STYLE_EMBEDDED &&                                                                                                 \
+     (CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI || (defined(CONFIG_OPENTHREAD_SHELL) && CONFIG_OPENTHREAD_SHELL))) ||                   \
+    CHIP_TARGET_STYLE_UNIX
+static const shell_command_t cmds_otcli_root = { &cmd_otcli_dispatch, "otcli", "Dispatch OpenThread CLI command" };
+#endif
+
 #endif // CHIP_ENABLE_OPENTHREAD
 
 void cmd_otcli_init()

src/crypto/CHIPCryptoPALmbedTLSCert.cpp

@@ -28,11 +28,12 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/SafeInt.h>
 
-#include <mbedtls/version.h>
-
 // mbedTLS X.509 headers and symbols are only needed when the active mbedtls
 // config (MBEDTLS_CONFIG_FILE) enables the corresponding features.
 #if defined(MBEDTLS_X509_CRT_PARSE_C) || defined(MBEDTLS_X509_CSR_PARSE_C) || defined(MBEDTLS_X509_CSR_WRITE_C)
+
+#include <mbedtls/version.h>
+
 // mbedtls/ecp.h (mbedtls_ecp_* symbols) is only used by the legacy non-PSA path
 // and became private in mbedTLS 4.1.0, so include it only before 4.1.0.
 #if (MBEDTLS_VERSION_NUMBER < 0x04010000)

src/platform/nrfconnect/ConfigurationManagerImpl.cpp

@@ -29,7 +29,7 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/Zephyr/ZephyrConfig.h>
-#include <platform/internal/GenericConfigurationManagerImpl.h>
+#include <platform/internal/GenericConfigurationManagerImpl.ipp>
 
 #ifdef CONFIG_CHIP_FACTORY_RESET_ERASE_SETTINGS
 #include <zephyr/settings/settings.h>

src/platform/nrfconnect/FactoryDataProvider.cpp

@@ -200,6 +200,9 @@ CHIP_ERROR FactoryDataProvider<FlashFactoryData>::MoveDACPrivateKeyToSecureStora
         size_t requiredFlashSpaceSize  = ROUND_UP(kDACPrivateKeyLength + bytesToLeftBefore, flashParameters->write_block_size);
         size_t bytesToLeftAfter        = requiredFlashSpaceSize - bytesToLeftBefore - kDACPrivateKeyLength;
 
+        VerifyOrReturnError(mFactoryData.dacPrivateKeyOffset + kDACPrivateKeyLength <= factoryDataSize, CHIP_ERROR_INVALID_ARGUMENT);
+        VerifyOrReturnError(alignedDacPrivKeyOffset + requiredFlashSpaceSize <= factoryDataSize, CHIP_ERROR_INVALID_ARGUMENT);
+
         // Allocate the memory buffer for removing DAC private key.
         chip::Platform::ScopedMemoryBuffer<uint8_t> removedPrivKeyBuffer;
         VerifyOrReturnError(removedPrivKeyBuffer.Calloc(requiredFlashSpaceSize), CHIP_ERROR_NO_MEMORY);