CI/CD: Synchronize ncs-aliro@82fa1c03b7dd and ncs-door-lock-app

Source commit ID: @82fa1c03b7dd
sync-ncs-aliro-82fa1c03b7dd

Signed-off-by: Marcin Kajor <marcin.kajor@nordicsemi.com>

Author: Marcin Kajor

app/src/access_manager_impl_custom/access_manager_impl.cpp

@@ -12,25 +12,38 @@ LOG_MODULE_REGISTER(access_manager_impl_custom, CONFIG_NCS_DOOR_LOCK_APP_LOG_LEV
 
 namespace Aliro {
 
-AliroError AccessManagerImpl::_Init(const Callbacks &callbacks)
+AliroError AccessManagerImpl::_Init(const ApplicationCallbacks &)
 {
 	LOG_INF("AccessManagerImpl custom init");
 	return ALIRO_ERROR_NOT_IMPLEMENTED;
 }
 
-AliroError AccessManagerImpl::_StartAccessDecision(const CryptoTypes::PublicKey &userPublicKey, bool isBleSession)
+void AccessManagerImpl::_SetStackCallbacks(const StackCallbacks &)
 {
-	LOG_INF("AccessManagerImpl custom start access decision");
+	LOG_INF("AccessManagerImpl custom set stack callbacks");
+}
+
+AliroError AccessManagerImpl::_VerifyAccessCredential(const CryptoTypes::PublicKey &, bool, SessionContext)
+{
+	LOG_INF("AccessManagerImpl custom verify access credential");
+	return ALIRO_ERROR_NOT_IMPLEMENTED;
+}
+
+#ifdef CONFIG_ALIRO_BLE_TP
+AliroError AccessManagerImpl::_StartRangingSession(uint32_t, const CryptoTypes::Ursk &, SessionContext)
+{
+	LOG_INF("AccessManagerImpl custom start ranging session");
 	return ALIRO_ERROR_NOT_IMPLEMENTED;
 }
+#endif // CONFIG_ALIRO_BLE_TP
 
-AliroError AccessManagerImpl::_AddPublicKey(const CryptoTypes::PublicKey &publicKey)
+AliroError AccessManagerImpl::_AddPublicKey(const CryptoTypes::PublicKey &)
 {
 	LOG_INF("AccessManagerImpl custom add public key");
 	return ALIRO_ERROR_NOT_IMPLEMENTED;
 }
 
-AliroError AccessManagerImpl::_RemovePublicKey(const CryptoTypes::PublicKey &publicKey)
+AliroError AccessManagerImpl::_RemovePublicKey(const CryptoTypes::PublicKey &)
 {
 	LOG_INF("AccessManagerImpl custom remove public key");
 	return ALIRO_ERROR_NOT_IMPLEMENTED;
@@ -41,20 +54,25 @@ void AccessManagerImpl::_ClearStoredKeys()
 	LOG_INF("AccessManagerImpl custom clear stored keys");
 }
 
-void AccessManagerImpl::_SetMaxAllowedDistance(uint32_t maxDistance)
+void AccessManagerImpl::_SetMaxAllowedDistance(uint32_t)
 {
 	LOG_INF("AccessManagerImpl custom set max allowed distance");
 }
 
-uint32_t AccessManagerImpl::_GetMaxAllowedDistance() const
+uint32_t AccessManagerImpl::_GetMaxAllowedDistance()
 {
 	LOG_INF("AccessManagerImpl custom get max allowed distance");
 	return 0;
 }
 
-void AccessManagerImpl::_HandleRangingSessionData(const UwbRangingData &uwbData)
+void AccessManagerImpl::_HandleRangingSessionData(SessionContext, const UwbRangingData &)
 {
 	LOG_INF("AccessManagerImpl custom handle ranging session data");
 }
 
+void AccessManagerImpl::_HandleSessionTermination(SessionContext)
+{
+	LOG_INF("AccessManagerImpl custom handle session termination");
+}
+
 } // namespace Aliro

app/src/access_manager_impl_custom/access_manager_impl.h

@@ -21,14 +21,21 @@ class AccessManagerImpl : public AccessManager {
 private:
 	friend class AccessManager;
 
-	AliroError _Init(const Callbacks &callbacks);
-	AliroError _StartAccessDecision(const CryptoTypes::PublicKey &userPublicKey, bool isBleSession);
+	AliroError _Init(const ApplicationCallbacks &callbacks);
+	void _SetStackCallbacks(const StackCallbacks &callbacks);
+	AliroError _VerifyAccessCredential(const CryptoTypes::PublicKey &userPublicKey, bool isNfcSession,
+					   SessionContext sessionContext);
+#ifdef CONFIG_ALIRO_BLE_TP
+	AliroError _StartRangingSession(uint32_t rangingSessionId, const CryptoTypes::Ursk &ursk,
+					SessionContext sessionContext);
+#endif // CONFIG_ALIRO_BLE_TP
 	AliroError _AddPublicKey(const CryptoTypes::PublicKey &publicKey);
 	AliroError _RemovePublicKey(const CryptoTypes::PublicKey &publicKey);
 	void _ClearStoredKeys();
 	void _SetMaxAllowedDistance(uint32_t maxDistance);
-	uint32_t _GetMaxAllowedDistance() const;
-	void _HandleRangingSessionData(const UwbRangingData &uwbData);
+	uint32_t _GetMaxAllowedDistance();
+	void _HandleRangingSessionData(SessionContext sessionContext, const UwbRangingData &uwbData);
+	void _HandleSessionTermination(SessionContext sessionContext);
 };
 
 inline AccessManager &AccessManagerInstance()

app/src/access_manager_impl_default/Kconfig

@@ -4,17 +4,17 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-config ACCESS_MANAGER_MAX_STORED_KEYS
+config ALIRO_ACCESS_MANAGER_MAX_STORED_KEYS
     int "Maximum number of stored public keys"
-    default 1
+    default 5
     help
       Specifies the maximum number of public keys that can be
       stored in the AccessManager. This determines the size of
       the statically allocated array for key storage.
 
 if ALIRO_BLE_TP
 
-config ACCESS_MANAGER_MAX_ALLOWED_DISTANCE_CM
+config ALIRO_ACCESS_MANAGER_MAX_ALLOWED_DISTANCE_CM
     int "Maximum allowed distance for granting access (cm)"
     default 100
     help
@@ -23,26 +23,33 @@ config ACCESS_MANAGER_MAX_ALLOWED_DISTANCE_CM
       This is used to determine if the Aliro User Device
       is within the allowed proximity range.
 
-config AUTOMATIC_RANGING_SESSION_INITIATION
-    bool "Automatic ranging session initiation"
-    depends on SOC_SERIES_NRF53X
-    default y
+choice ALIRO_ACCESS_MANAGER_TERMINATE_SESSION
+    prompt "Terminate session on given condition"
+    default ALIRO_ACCESS_MANAGER_TERMINATE_SESSION_ON_TIMEOUT
     help
-      Specifies if the Reader Device will autonomously initiate
-      the UWB ranging session in case the session is not initiated
-      by the User Device after Access Protocol is finalized.
+      Select the condition under which the AccessManager will
+      terminate the current Aliro session.
 
-if AUTOMATIC_RANGING_SESSION_INITIATION
+config ALIRO_ACCESS_MANAGER_TERMINATE_SESSION_ON_ACCESS_GRANTED
+    bool "Terminate the session if the access was granted"
+    help
+      If enabled, the AccessManager will terminate each
+      session immediately when an access is granted.
 
-config RANGING_START_TIMEOUT_MS
-    int "Ranging start timeout in ms"
-    default 3000
+config ALIRO_ACCESS_MANAGER_TERMINATE_SESSION_ON_TIMEOUT
+    bool "Terminate session on timeout"
     help
-      Specifies the time a Reader Device waits before it
-      initiates the ranging session by its own.
-      Set 0 to initiate the ranging session immediately after
-      the Access Protocol is finalized.
+      If enabled, the AccessManager will terminate each ongoing
+      session if it times out according to ALIRO_ACCESS_MANAGER_SESSION_TIMEOUT_MS.
+
+endchoice
+
+if ALIRO_ACCESS_MANAGER_TERMINATE_SESSION_ON_TIMEOUT
+
+config ALIRO_ACCESS_MANAGER_SESSION_TIMEOUT_MS
+    int "Session timeout in milliseconds"
+    default 10000
 
-endif # AUTOMATIC_RANGING_SESSION_INITIATION
+endif
 
 endif # ALIRO_BLE_TP