samples: bluetooth: Disable legacy pairing

Tryton77 · rlubos · commit 58d2ce1e6b3f · 2025-09-25T14:52:03.000+02:00
Removed legacy pairing option from the following samples:
    - central_nrf_pairing
    - peripheral_power_profiling

Leaved legacy pairing in peripherial_nfc_pairing
sample for compatibility with older Android devices.

JIRA: NCSDK-35217

Signed-off-by: Michał Strządała &lt;michal.strzadala@nordicsemi.no&gt;
diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
@@ -307,6 +307,13 @@ Bluetooth samples
    * :ref:`peripheral_status`
    * :ref:`peripheral_uart`
 
+* Disabled legacy pairing in the following samples:
+
+   * :ref:`central_nfc_pairing`
+   * :ref:`power_profiling`
+
+   Support for legacy pairing remains exclusively for :ref:`peripheral_nfc_pairing` sample to retain compatibility with older Andorid devices.
+
 * :ref:`direct_test_mode` sample:
 
   * Updated by simplifying the 2-wire UART polling.
diff --git a/samples/bluetooth/central_nfc_pairing/README.rst b/samples/bluetooth/central_nfc_pairing/README.rst
@@ -17,8 +17,6 @@ The sample supports pairing in one of the following modes:
 
 * LE Secure Connections Just Works pairing
 * LE Secure Connections OOB pairing
-* Legacy OOB pairing
-* Legacy Just Works pairing
 * Negotiated Handover (TNEP protocol) - two-way OOB pairing
 
 Requirements
diff --git a/samples/bluetooth/central_nfc_pairing/prj.conf b/samples/bluetooth/central_nfc_pairing/prj.conf
@@ -10,7 +10,7 @@ CONFIG_NCS_SAMPLES_DEFAULTS=y
 CONFIG_BT=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_SMP=y
-CONFIG_BT_SMP_SC_PAIR_ONLY=n
+CONFIG_BT_SMP_SC_PAIR_ONLY=y
 CONFIG_BT_GATT_CLIENT=y
 
 # Enable the BLE modules from NCS
diff --git a/samples/bluetooth/central_nfc_pairing/src/main.c b/samples/bluetooth/central_nfc_pairing/src/main.c
@@ -36,25 +36,10 @@
 static struct k_poll_signal pair_signal;
 static struct k_poll_event events[K_POOL_EVENTS_CNT];
 
-static bool use_remote_tk;
 static struct bt_le_oob oob_local;
-static uint8_t tk_value[NFC_NDEF_LE_OOB_REC_TK_LEN];
-static uint8_t remote_tk_value[NFC_NDEF_LE_OOB_REC_TK_LEN];
 static struct bt_le_oob oob_remote;
 static struct bt_conn *default_conn;
 
-static int tk_value_generate(void)
-{
-	int err;
-
-	err = bt_rand(tk_value, sizeof(tk_value));
-	if (err) {
-		printk("Random TK value generation failed: %d\n", err);
-	}
-
-	return err;
-}
-
 static void pair_key_generate_init(void)
 {
 	k_poll_signal_init(&pair_signal);
@@ -74,7 +59,7 @@ static int paring_key_generate(void)
 		printk("Error while fetching local OOB data: %d\n", err);
 	}
 
-	return tk_value_generate();
+	return err;
 }
 
 static void paring_key_process(void)
@@ -268,31 +253,13 @@ static void lesc_oob_data_set(struct bt_conn *conn,
 	}
 }
 
-static void legacy_tk_value_set(struct bt_conn *conn)
-{
-	int err;
-	const uint8_t *tk = use_remote_tk ? remote_tk_value : tk_value;
-
-	err = bt_le_oob_set_legacy_tk(conn, tk);
-	if (err) {
-		printk("TK value set error: %d\n", err);
-	}
-
-	use_remote_tk = false;
-}
-
 static void auth_oob_data_request(struct bt_conn *conn,
 				  struct bt_conn_oob_info *info)
 {
 	if (info->type == BT_CONN_OOB_LE_SC) {
 		printk("LESC OOB data requested\n");
 		lesc_oob_data_set(conn, info);
 	}
-
-	if (info->type == BT_CONN_OOB_LE_LEGACY) {
-		printk("Legacy TK value requested\n");
-		legacy_tk_value_set(conn);
-	}
 }
 
 static void auth_cancel(struct bt_conn *conn)
@@ -315,7 +282,6 @@ static void pairing_complete(struct bt_conn *conn, bool bonded)
 
 	k_poll_signal_raise(&pair_signal, 0);
 	bt_le_oob_set_sc_flag(false);
-	bt_le_oob_set_legacy_flag(false);
 }
 
 
@@ -330,7 +296,6 @@ static void pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
 
 	k_poll_signal_raise(&pair_signal, 0);
 	bt_le_oob_set_sc_flag(false);
-	bt_le_oob_set_legacy_flag(false);
 }
 
 static struct bt_conn_auth_cb conn_auth_callbacks = {
@@ -419,12 +384,6 @@ static int oob_le_data_handle(const struct nfc_ndef_record_desc *rec,
 		bt_addr_le_copy(&oob_remote.addr, oob->addr);
 	}
 
-	if (oob->tk_value) {
-		bt_le_oob_set_legacy_flag(true);
-		memcpy(remote_tk_value, oob->tk_value, sizeof(remote_tk_value));
-		use_remote_tk = request;
-	}
-
 	/* Remove all scanning filters. */
 	bt_scan_filter_remove_all();
 
@@ -453,7 +412,6 @@ static int carrier_prepare(void)
 
 	rec_payload.addr = &oob_local.addr;
 	rec_payload.le_sc_data = &oob_local.le_sc_data;
-	rec_payload.tk_value = tk_value;
 	rec_payload.local_name = bt_get_name();
 	rec_payload.le_role = NFC_NDEF_LE_OOB_REC_LE_ROLE(
 		NFC_NDEF_LE_OOB_REC_LE_ROLE_CENTRAL_ONLY);
diff --git a/samples/bluetooth/peripheral_nfc_pairing/prj.conf b/samples/bluetooth/peripheral_nfc_pairing/prj.conf
@@ -25,6 +25,9 @@ CONFIG_NFC_TNEP_CH=y
 CONFIG_BT=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SMP_APP_PAIRING_ACCEPT=y
+
+# Keep support for legacy pairing to retain compatibility
+# with older Andorid phones that may not support OOB SC pairing
 CONFIG_BT_SMP_SC_PAIR_ONLY=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_DEVICE_NAME="Nordic_NFC_pairing"
diff --git a/samples/bluetooth/peripheral_power_profiling/prj.conf b/samples/bluetooth/peripheral_power_profiling/prj.conf
@@ -6,7 +6,7 @@
 
 CONFIG_BT=y
 CONFIG_BT_SMP=y
-CONFIG_BT_SMP_SC_PAIR_ONLY=n
+CONFIG_BT_SMP_SC_PAIR_ONLY=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_DEVICE_NAME="Nordic_Power_Profiling"
 CONFIG_BT_EXT_ADV=y
diff --git a/samples/bluetooth/peripheral_power_profiling/src/main.c b/samples/bluetooth/peripheral_power_profiling/src/main.c
@@ -61,7 +61,6 @@
 
 
 static struct bt_le_oob oob_local;
-static uint8_t tk_local[NFC_NDEF_LE_OOB_REC_TK_LEN];
 #if !IS_ENABLED(CONFIG_BT_POWER_PROFILING_NFC_DISABLED)
 static uint8_t nfc_buffer[NFC_BUFFER_SIZE];
 static void adv_work_handler(struct k_work *work);
@@ -269,16 +268,6 @@ static void auth_cancel(struct bt_conn *conn)
 	printk("Pairing cancelled: %s\n", addr);
 }
 
-static void legacy_tk_value_set(struct bt_conn *conn)
-{
-	int err;
-
-	err = bt_le_oob_set_legacy_tk(conn, tk_local);
-	if (err) {
-		printk("Failed to set local TK (err %d)\n", err);
-	}
-}
-
 static void lesc_oob_data_set(struct bt_conn *conn, struct bt_conn_oob_info *info)
 {
 	int err;
@@ -315,11 +304,6 @@ static void oob_data_request(struct bt_conn *conn, struct bt_conn_oob_info *info
 		printk("LESC OOB data requested\n");
 		lesc_oob_data_set(conn, info);
 	}
-
-	if (info->type == BT_CONN_OOB_LE_LEGACY) {
-		printk("Legacy TK value requested\n");
-		legacy_tk_value_set(conn);
-	}
 }
 
 static const struct bt_conn_auth_cb conn_auth_callbacks = {
@@ -479,11 +463,6 @@ static int pairing_key_generate(void)
 		return err;
 	}
 
-	err = bt_rand(tk_local, sizeof(tk_local));
-	if (err) {
-		printk("Failed to generate random TK value (err %d)\n", err);
-	}
-
 	return err;
 }
 
@@ -593,7 +572,6 @@ static int nfc_oob_data_setup(size_t *size)
 			NFC_NDEF_LE_OOB_REC_LE_ROLE(NFC_NDEF_LE_OOB_REC_LE_ROLE_PERIPH_ONLY);
 	oob_rec_payload.le_sc_data = &oob_local.le_sc_data;
 	oob_rec_payload.local_name = bt_get_name();
-	oob_rec_payload.tk_value = tk_local;
 
 	ch_msg_records.ac = &NFC_NDEF_CH_AC_RECORD_DESC(ac_rec);
 	ch_msg_records.carrier = &NFC_NDEF_LE_OOB_RECORD_DESC(oob_rec);
