Merge "stack::sec Use proper API and callbacks tBTM_STATUS" into main (15ed17bb) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_dm.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -3614,7 +3614,7 @@ static void btif_dm_ble_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type) {
		pairing_cb.is_le_only = true;
		pairing_cb.is_le_nc = false;

		BTM_BleOobDataReply(req_oob_type->bd_addr, 0, 16, oob_cb.p192_data.sm_tk);
		BTM_BleOobDataReply(req_oob_type->bd_addr, BTM_SUCCESS, 16, oob_cb.p192_data.sm_tk);
		}

		static void btif_dm_ble_sc_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type) {

system/stack/btm/btm_ble_sec.cc

+10 −9

Original line number	Diff line number	Diff line
		@@ -237,7 +237,7 @@ const Octet16& BTM_GetDeviceDHK() { return btm_sec_cb.devcb.id_keys.dhk; }
		* Returns None
		*
		******************************************************************************/
		void BTM_SecurityGrant(const RawAddress& bd_addr, uint8_t res) {
		void BTM_SecurityGrant(const RawAddress& bd_addr, tBTM_STATUS res) {
		const tSMP_STATUS res_smp = (res == BTM_SUCCESS) ? SMP_SUCCESS : SMP_REPEATED_ATTEMPTS;
		log::verbose("bd_addr:{}, res:{}", bd_addr, smp_status_text(res_smp));
		BTM_LogHistory(kBtmLogTag, bd_addr, "Granted",
		@@ -260,7 +260,7 @@ void BTM_SecurityGrant(const RawAddress& bd_addr, uint8_t res) {
		* p_passkey - pointer to array with the passkey
		*
		******************************************************************************/
		void BTM_BlePasskeyReply(const RawAddress& bd_addr, uint8_t res, uint32_t passkey) {
		void BTM_BlePasskeyReply(const RawAddress& bd_addr, tBTM_STATUS res, uint32_t passkey) {
		tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);
		log::verbose("bd_addr:{}, res:{}", bd_addr, res);
		if (p_dev_rec == NULL) {
		@@ -290,7 +290,7 @@ void BTM_BlePasskeyReply(const RawAddress& bd_addr, uint8_t res, uint32_t passke
		* res - comparison result BTM_SUCCESS if success
		*
		******************************************************************************/
		void BTM_BleConfirmReply(const RawAddress& bd_addr, uint8_t res) {
		void BTM_BleConfirmReply(const RawAddress& bd_addr, tBTM_STATUS res) {
		tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);
		log::verbose("bd_addr:{}, res:{}", bd_addr, res);
		if (p_dev_rec == NULL) {
		@@ -323,7 +323,7 @@ void BTM_BleConfirmReply(const RawAddress& bd_addr, uint8_t res) {
		* "Security Manager TK Value".
		*
		******************************************************************************/
		void BTM_BleOobDataReply(const RawAddress& bd_addr, uint8_t res, uint8_t len, uint8_t* p_data) {
		void BTM_BleOobDataReply(const RawAddress& bd_addr, tBTM_STATUS res, uint8_t len, uint8_t* p_data) {
		tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);
		if (p_dev_rec == NULL) {
		log::error("Unknown device:{}", bd_addr);
		@@ -1390,8 +1390,9 @@ void btm_ble_ltk_request_reply(const RawAddress& bda, bool use_stk, const Octet1
		* Returns void
		*
		******************************************************************************/
		static uint8_t btm_ble_io_capabilities_req(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data) {
		uint8_t callback_rc = BTM_SUCCESS;
		static tBTM_STATUS btm_ble_io_capabilities_req(tBTM_SEC_DEV_REC* p_dev_rec,
		tBTM_LE_IO_REQ* p_data) {
		tBTM_STATUS callback_rc = BTM_SUCCESS;
		log::verbose("p_dev_rec->bd_addr:{}", p_dev_rec->bd_addr);
		if (btm_sec_cb.api.p_le_callback) {
		/* the callback function implementation may change the IO capability... */
		@@ -1453,8 +1454,8 @@ static uint8_t btm_ble_io_capabilities_req(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_
		* Returns void
		*
		******************************************************************************/
		static uint8_t btm_ble_br_keys_req(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data) {
		uint8_t callback_rc = BTM_SUCCESS;
		static tBTM_STATUS btm_ble_br_keys_req(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data) {
		tBTM_STATUS callback_rc = BTM_SUCCESS;
		log::verbose("p_dev_rec->bd_addr:{}", p_dev_rec->bd_addr);
		*p_data = tBTM_LE_IO_REQ{
		.io_cap = BTM_IO_CAP_UNKNOWN,
		@@ -1768,7 +1769,7 @@ bool BTM_BleVerifySignature(const RawAddress& bd_addr, uint8_t* p_orig, uint16_t
		* Returns void
		*
		******************************************************************************/
		void BTM_BleSirkConfirmDeviceReply(const RawAddress& bd_addr, uint8_t res) {
		void BTM_BleSirkConfirmDeviceReply(const RawAddress& bd_addr, tBTM_STATUS res) {
		tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);
		tSMP_STATUS res_smp = (res == BTM_SUCCESS) ? SMP_SUCCESS : SMP_FAIL;

system/stack/include/btm_ble_sec_api.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ const Octet16& BTM_GetDeviceDHK();
		* Returns None
		*
		******************************************************************************/
		void BTM_SecurityGrant(const RawAddress& bd_addr, uint8_t res);
		void BTM_SecurityGrant(const RawAddress& bd_addr, tBTM_STATUS res);

		/*******************************************************************************
		*
		@@ -101,7 +101,7 @@ void BTM_SecurityGrant(const RawAddress& bd_addr, uint8_t res);
		* BTM_MAX_PASSKEY_VAL(999999(0xF423F)).
		*
		******************************************************************************/
		void BTM_BlePasskeyReply(const RawAddress& bd_addr, uint8_t res, uint32_t passkey);
		void BTM_BlePasskeyReply(const RawAddress& bd_addr, tBTM_STATUS res, uint32_t passkey);

		/*******************************************************************************
		*
		@@ -115,7 +115,7 @@ void BTM_BlePasskeyReply(const RawAddress& bd_addr, uint8_t res, uint32_t passke
		* res - comparison result BTM_SUCCESS if success
		*
		******************************************************************************/
		void BTM_BleConfirmReply(const RawAddress& bd_addr, uint8_t res);
		void BTM_BleConfirmReply(const RawAddress& bd_addr, tBTM_STATUS res);

		/*******************************************************************************
		*
		@@ -129,7 +129,7 @@ void BTM_BleConfirmReply(const RawAddress& bd_addr, uint8_t res);
		* p_data - simple pairing Randomizer C.
		*
		******************************************************************************/
		void BTM_BleOobDataReply(const RawAddress& bd_addr, uint8_t res, uint8_t len, uint8_t* p_data);
		void BTM_BleOobDataReply(const RawAddress& bd_addr, tBTM_STATUS res, uint8_t len, uint8_t* p_data);

		/*******************************************************************************
		*

system/stack/include/btm_sec_api.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,6 +106,6 @@ tBTM_STATUS BTM_DeleteStoredLinkKey(const RawAddress* bd_addr, tBTM_CMPL_CB* p_c
		* Returns void
		*
		******************************************************************************/
		void BTM_BleSirkConfirmDeviceReply(const RawAddress& bd_addr, uint8_t res);
		void BTM_BleSirkConfirmDeviceReply(const RawAddress& bd_addr, tBTM_STATUS res);

		uint8_t btm_ble_read_sec_key_size(const RawAddress& bd_addr);

system/stack/include/security_client_callbacks.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		/* Authorize device for service. Parameters are
		* Service Id (NULL - unknown service or unused)
		*/
		typedef uint8_t(tBTM_AUTHORIZE_CALLBACK)(uint8_t service_id);
		typedef tBTM_STATUS(tBTM_AUTHORIZE_CALLBACK)(uint8_t service_id);

		/* Get PIN for the connection. Parameters are
		* BD Address of remote
		@@ -131,9 +131,9 @@ typedef struct {
		uint8_t* p_pin);
		void (*BTM_SecConfirmReqReply)(tBTM_STATUS res, tBT_TRANSPORT transport,
		const RawAddress bd_addr);
		void (*BTM_BleSirkConfirmDeviceReply)(const RawAddress& bd_addr, uint8_t res);
		void (*BTM_BleSirkConfirmDeviceReply)(const RawAddress& bd_addr, tBTM_STATUS res);

		void (*BTM_BlePasskeyReply)(const RawAddress& bd_addr, uint8_t res, uint32_t passkey);
		void (*BTM_BlePasskeyReply)(const RawAddress& bd_addr, tBTM_STATUS res, uint32_t passkey);

		// other misc APIs
		uint8_t (*BTM_GetSecurityMode)();