From a13a46634f45eec195ee2f87a8353fda27fef2f8 Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk Date: Thu, 25 Apr 2024 12:34:11 +0200 Subject: [PATCH] [nrf noup] Fixed issues due to wrong conflict resolution Fixed two problems leading to compilation error that appeared due to some incorrect conflicts resolution. Signed-off-by: Kamil Kasperczyk --- src/platform/nrfconnect/CHIPDevicePlatformConfig.h | 1 - src/platform/nrfconnect/FactoryDataProvider.cpp | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h index ac018c8302..cd13e304f3 100644 --- a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h +++ b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h @@ -61,7 +61,6 @@ #define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT CONFIG_CHIP_DEVICE_SPAKE2_IT #define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT CONFIG_CHIP_DEVICE_SPAKE2_SALT #define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER CONFIG_CHIP_DEVICE_SPAKE2_TEST_VERIFIER -#endif #ifdef CONFIG_NET_L2_OPENTHREAD #define CHIP_DEVICE_CONFIG_ENABLE_THREAD CONFIG_NET_L2_OPENTHREAD diff --git a/src/platform/nrfconnect/FactoryDataProvider.cpp b/src/platform/nrfconnect/FactoryDataProvider.cpp index b6fa40fd02..23864a82f8 100644 --- a/src/platform/nrfconnect/FactoryDataProvider.cpp +++ b/src/platform/nrfconnect/FactoryDataProvider.cpp @@ -265,10 +265,6 @@ CHIP_ERROR FactoryDataProvider::SignWithDeviceAttestationKey(c { Crypto::P256ECDSASignature signature; Crypto::P256Keypair keypair; - CHIP_ERROR err = CHIP_NO_ERROR; -#ifdef CONFIG_CHIP_CRYPTO_PSA - psa_key_id_t keyId = 0; -#endif VerifyOrReturnError(outSignBuffer.size() >= signature.Capacity(), CHIP_ERROR_BUFFER_TOO_SMALL); ReturnErrorCodeIf(!mFactoryData.dac_cert.data, CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);