sample: bluetooth: mesh: start using BT_APP_PASSKEY

BT_FIXED_PASSKEY is deprecated, thus we start using BT_APP_PASSKEY

Signed-off-by: alperen sener <[email protected]>

Author: m-alperen-sener

samples/bluetooth/mesh/common/smp_bt_auth.c

@@ -47,12 +47,22 @@ static void pairing_confirm(struct bt_conn *conn)
 	printk("Pairing confirmed: %s\n", addr);
 }
 
+#if defined(CONFIG_BT_APP_PASSKEY)
+static uint32_t app_passkey(struct bt_conn *conn)
+{
+	return bt_mesh_le_pair_resp_passkey_get();
+}
+#endif /* CONFIG_BT_APP_PASSKEY */
+
 static struct bt_conn_auth_cb auth_cb = {
 	/* Enable passkey_display callback to enable the display capability. */
 	.passkey_display = passkey_display,
 	/* These 2 callbacks are required for passkey_display callback. */
 	.cancel = cancel,
 	.pairing_confirm = pairing_confirm,
+#if defined(CONFIG_BT_APP_PASSKEY)
+	.app_passkey = app_passkey,
+#endif /* CONFIG_BT_APP_PASSKEY */
 };
 
 static void pairing_complete(struct bt_conn *conn, bool bonded)
@@ -63,8 +73,10 @@ static void pairing_complete(struct bt_conn *conn, bool bonded)
 
 	printk("Pairing completed: %s, bonded: %d\n", addr, bonded);
 
+#if defined(CONFIG_BT_FIXED_PASSKEY)
 	/* Invalidate the previously used passkey. */
 	bt_mesh_le_pair_resp_passkey_invalidate();
+#endif /* CONFIG_BT_FIXED_PASSKEY */
 }
 
 static void pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
@@ -75,8 +87,10 @@ static void pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
 
 	printk("Pairing failed: %s, reason %d\n", addr, reason);
 
+#if defined(CONFIG_BT_FIXED_PASSKEY)
 	/* Invalidate the previously used passkey. */
 	bt_mesh_le_pair_resp_passkey_invalidate();
+#endif /* CONFIG_BT_FIXED_PASSKEY */
 }
 
 static struct bt_conn_auth_info_cb conn_auth_info_callbacks = {

samples/bluetooth/mesh/dfu/distributor/overlay-smp-bt-auth.conf

@@ -1,6 +1,6 @@
 CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_AUTHEN=y
 CONFIG_BT_SMP=y
-CONFIG_BT_FIXED_PASSKEY=y
+CONFIG_BT_APP_PASSKEY=y
 CONFIG_BT_MESH_LE_PAIR_RESP=y
 CONFIG_BT_SMP_SC_ONLY=y
 CONFIG_BT_SMP_ALLOW_UNAUTH_OVERWRITE=n