[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 <kamil.kasperczyk@nordicsemi.no>

Author: kkasperczyk-no

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

src/platform/nrfconnect/FactoryDataProvider.cpp

@@ -265,10 +265,6 @@ CHIP_ERROR FactoryDataProvider<FlashFactoryData>::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);