[nrf noup] Fix PSA crypto merge conflict

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
LipinskiPNordicSemi · Dec 12, 2023 · d97e091 · d97e091
1 parent 288c1e8
commit d97e091
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/protocols/secure_channel/PASESession.h b/src/protocols/secure_channel/PASESession.h
@@ -213,10 +213,11 @@ class DLL_EXPORT PASESession : public Messaging::UnsolicitedMessageHandler,
     // mNextExpectedMsg is set when we are expecting a message.
     Optional<Protocols::SecureChannel::MsgType> mNextExpectedMsg;
 
-#elif CHIP_CRYPTO_PSA_SPAKE2P
+#if CHIP_CRYPTO_PSA_SPAKE2P
     PSASpake2p_P256_SHA256_HKDF_HMAC mSpake2p;
+#else
     Spake2p_P256_SHA256_HKDF_HMAC mSpake2p;
-
+#endif
     Spake2pVerifier mPASEVerifier;
 
     uint32_t mSetupPINCode;