Clean up unused functions in btm_sec (a0c474ae) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_int.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -1049,7 +1049,6 @@ extern void btm_sec_init (UINT8 sec_mode);
		extern void btm_sec_dev_reset (void);
		extern void btm_sec_abort_access_req (BD_ADDR bd_addr);
		extern void btm_sec_auth_complete (UINT16 handle, UINT8 status);
		extern void btm_sec_mkey_comp_event (UINT16 handle, UINT8 status, UINT8 key_flg);
		extern void btm_sec_encrypt_change (UINT16 handle, UINT8 status, UINT8 encr_enable);
		extern void btm_sec_connected (UINT8 *bda, UINT16 handle, UINT8 status, UINT8 enc_mode);
		extern tBTM_STATUS btm_sec_disconnect (UINT16 handle, UINT8 reason);

system/stack/btm/btm_sec.c

+0 −347

Original line number	Diff line number	Diff line
		@@ -235,25 +235,6 @@ BOOLEAN BTM_SecRegister (tBTM_APPL_INFO *p_cb_info)
		return(TRUE);
		}


		/*******************************************************************************
		**
		** Function BTM_SecRegisterLinkKeyNotificationCallback
		**
		** Description Application manager calls this function to register for
		** link key notification. When there is nobody registered
		** we should avoid changing link key
		**
		** Returns TRUE if registered OK, else FALSE
		**
		*******************************************************************************/
		BOOLEAN BTM_SecRegisterLinkKeyNotificationCallback (tBTM_LINK_KEY_CALLBACK *p_callback)
		{
		btm_cb.api.p_link_key_callback = p_callback;
		return(TRUE);
		}


		/*******************************************************************************
		**
		** Function BTM_SecAddRmtNameNotifyCallback
		@@ -307,20 +288,6 @@ BOOLEAN BTM_SecDeleteRmtNameNotifyCallback (tBTM_RMT_NAME_CALLBACK *p_callback)
		return(FALSE);
		}

		/*******************************************************************************
		**
		** Function BTM_GetSecurityMode
		**
		** Description Get security mode for the device
		**
		** Returns void
		**
		*******************************************************************************/
		UINT8 BTM_GetSecurityMode (void)
		{
		return(btm_cb.security_mode);
		}

		/*******************************************************************************
		**
		** Function BTM_GetSecurityFlags
		@@ -421,51 +388,6 @@ void BTM_SetPairableMode (BOOLEAN allow_pairing, BOOLEAN connect_only_paired)

		#define BTM_NO_AVAIL_SEC_SERVICES ((UINT16) 0xffff)

		/*******************************************************************************
		**
		** Function BTM_SetUCDSecurityLevel
		**
		** Description Register UCD service security level with Security Manager
		**
		** Parameters: is_originator - TRUE if originating the connection, FALSE if not
		** p_name - Name of the service relevant only if
		** authorization will show this name to user. ignored
		** if BTM_SEC_SERVICE_NAME_LEN is 0.
		** service_id - service ID for the service passed to authorization callback
		** sec_level - bit mask of the security features
		** psm - L2CAP PSM
		** mx_proto_id - protocol ID of multiplexing proto below
		** mx_chan_id - channel ID of multiplexing proto below
		**
		** Returns TRUE if registered OK, else FALSE
		**
		*******************************************************************************/
		BOOLEAN BTM_SetUCDSecurityLevel (BOOLEAN is_originator, char *p_name, UINT8 service_id,
		UINT16 sec_level, UINT16 psm, UINT32 mx_proto_id,
		UINT32 mx_chan_id)
		{
		#if (L2CAP_UCD_INCLUDED == TRUE)
		CONNECTION_TYPE conn_type;

		if (is_originator)
		conn_type = CONNLESS_ORIG;
		else
		conn_type = CONNLESS_TERM;

		return(btm_sec_set_security_level (conn_type, p_name, service_id,
		sec_level, psm, mx_proto_id, mx_chan_id));
		#else
		UNUSED(is_originator);
		UNUSED(p_name);
		UNUSED(service_id);
		UNUSED(sec_level);
		UNUSED(psm);
		UNUSED(mx_proto_id);
		UNUSED(mx_chan_id);
		return FALSE;
		#endif
		}

		/*******************************************************************************
		**
		** Function BTM_SetSecurityLevel
		@@ -838,45 +760,6 @@ void btm_sec_clr_temp_auth_service (BD_ADDR bda)
		}
		}

		/*******************************************************************************
		**
		**
		** Function BTM_SecClrUCDService
		**
		** Description
		**
		** Parameters Service ID - Id of the service to remove.
		** ('0' removes all service records )
		**
		** Returns Number of records that were cleared.
		**
		*******************************************************************************/
		UINT8 BTM_SecClrUCDService (UINT8 service_id)
		{
		#if (L2CAP_UCD_INCLUDED == TRUE)
		tBTM_SEC_SERV_REC *p_srec = &btm_cb.sec_serv_rec[0];
		UINT8 num_cleared = 0;
		int i;

		for (i = 0; i < BTM_SEC_MAX_SERVICE_RECORDS; i++, p_srec++)
		{
		/* Delete services with specified name (if in use and not SDP) */
		if ((p_srec->security_flags & BTM_SEC_IN_USE) &&
		(!service_id \|\| (service_id == (UINT32)p_srec->service_id)))
		{
		BTM_TRACE_API("BTM_UCD_SEC_CLR[%d]: id %d", i, service_id);
		p_srec->ucd_security_flags = 0;
		num_cleared++;
		}
		}

		return(num_cleared);
		#else
		UNUSED(service_id);
		return(0);
		#endif
		}

		/*******************************************************************************
		**
		** Function BTM_PINCodeReply
		@@ -1000,67 +883,6 @@ void BTM_PINCodeReply (BD_ADDR bd_addr, UINT8 res, UINT8 pin_len, UINT8 *p_pin,
		btsnd_hcic_pin_code_req_reply (bd_addr, pin_len, p_pin);
		}


		/*******************************************************************************
		**
		** Function BTM_DeviceAuthorized
		**
		** Description This function is called after Security Manager submitted
		** authorization request to the UI.
		**
		** Parameters: bd_addr - Address of the device for which PIN was requested
		** res - result of the operation BTM_SUCCESS if success
		**
		*******************************************************************************/
		void BTM_DeviceAuthorized (BD_ADDR bd_addr, UINT8 res, UINT32 trusted_mask[])
		{
		tBTM_SEC_DEV_REC *p_dev_rec;

		if ((p_dev_rec = btm_find_dev (bd_addr)) == NULL)
		{
		BTM_TRACE_WARNING ("Security Manager: Attempting Authorization of Unknown Device Address [%02x%02x%02x%02x%02x%02x]",
		bd_addr[0], bd_addr[1], bd_addr[2], bd_addr[3], bd_addr[4], bd_addr[5]);
		return;
		}

		BTM_TRACE_EVENT ("Security Manager: authorized status:%d State:%d Trusted:%08x %08x",
		res, (p_dev_rec) ? p_dev_rec->sec_state : 0, trusted_mask[0], trusted_mask[1]);

		if (res == BTM_SUCCESS)
		{
		p_dev_rec->sec_flags \|= BTM_SEC_AUTHORIZED;
		if (trusted_mask)
		{
		BTM_SEC_COPY_TRUSTED_DEVICE(trusted_mask, p_dev_rec->trusted_mask);
		}

		/* Save the currently authorized service in case we are asked again
		by another multiplexer layer */
		if (!p_dev_rec->is_originator)
		{
		BTM_TRACE_DEBUG("BTM_DeviceAuthorized: Setting last_author_service_id to %d",
		p_dev_rec->p_cur_service->service_id);
		p_dev_rec->last_author_service_id = p_dev_rec->p_cur_service->service_id;
		}
		}

		if (p_dev_rec->sec_state != BTM_SEC_STATE_AUTHORIZING)
		return;

		p_dev_rec->sec_state = BTM_SEC_STATE_IDLE;

		if (res != BTM_SUCCESS)
		{
		btm_sec_dev_rec_cback_event (p_dev_rec, res, FALSE);
		return;
		}

		if ((res = (UINT8)btm_sec_execute_procedure (p_dev_rec)) != BTM_CMD_STARTED)
		{
		btm_sec_dev_rec_cback_event (p_dev_rec, res, FALSE);
		}
		}

		/*******************************************************************************
		**
		** Function btm_sec_bond_by_transport
		@@ -1386,37 +1208,6 @@ tBTM_STATUS BTM_SecBondCancel (BD_ADDR bd_addr)
		return BTM_WRONG_MODE;
		}

		/*******************************************************************************
		**
		** Function BTM_SecUseMasterLinkKey
		**
		** Description This function is called to tell master of the piconet to
		** switch to master link key
		**
		** Parameters: use_master_key - If true Master Link Key shoul be used
		**
		*******************************************************************************/
		tBTM_STATUS BTM_SecUseMasterLinkKey (BOOLEAN use_master_key)
		{
		return(btsnd_hcic_master_link_key (use_master_key) ? BTM_SUCCESS :
		BTM_NO_RESOURCES);
		}

		/*******************************************************************************
		**
		** Function BTM_SetMasterKeyCompCback
		**
		** Description This function is called to register for the master key complete
		** status event.
		**
		** Parameters: mkey_cback - callback registered with the security manager
		**
		*******************************************************************************/
		void BTM_SetMasterKeyCompCback( tBTM_MKEY_CALLBACK *mkey_cback )
		{
		btm_cb.mkey_cback = mkey_cback;
		}

		/*******************************************************************************
		**
		** Function BTM_SecGetDeviceLinkKey
		@@ -3978,35 +3769,6 @@ void btm_sec_auth_complete (UINT16 handle, UINT8 status)
		btm_sec_dev_rec_cback_event (p_dev_rec, status, FALSE);
		}

		/*******************************************************************************
		**
		** Function btm_sec_mkey_comp_event
		**
		** Description This function is when encryption of the connection is
		** completed by the LM
		**
		** Returns void
		**
		*******************************************************************************/
		void btm_sec_mkey_comp_event (UINT16 handle, UINT8 status, UINT8 key_flg)
		{
		tBTM_SEC_DEV_REC *p_dev_rec = btm_find_dev_by_handle (handle);
		UINT8 bd_addr[BD_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} ;

		BTM_TRACE_EVENT ("Security Manager: mkey comp status:%d State:%d",
		status, (p_dev_rec) ? p_dev_rec->sec_state : 0);

		/* If encryption setup failed, notify the waiting layer */
		/* There is no next procedure or start of procedure failed, notify the waiting layer */
		if (btm_cb.mkey_cback)
		{
		if (!p_dev_rec)
		(btm_cb.mkey_cback)(bd_addr, status, key_flg );
		else
		(btm_cb.mkey_cback)(p_dev_rec->bd_addr, status, key_flg );
		}
		}

		/*******************************************************************************
		**
		** Function btm_sec_encrypt_change
		@@ -4106,38 +3868,6 @@ void btm_sec_encrypt_change (UINT16 handle, UINT8 status, UINT8 encr_enable)
		btm_sec_dev_rec_cback_event (p_dev_rec, status, FALSE);
		}

		/*******************************************************************************
		**
		** Function btm_sec_create_conn
		**
		** Description This function records current role and forwards request to
		** HCI
		**
		** Returns void
		**
		*******************************************************************************/
		BOOLEAN btm_sec_create_conn (BD_ADDR bda, UINT16 packet_types,
		UINT8 page_scan_rep_mode, UINT8 page_scan_mode,
		UINT16 clock_offset, UINT8 allow_switch)
		{
		tBTM_SEC_DEV_REC *p_dev_rec = btm_find_or_alloc_dev (bda);

		memcpy (btm_cb.connecting_bda, p_dev_rec->bd_addr, BD_ADDR_LEN);
		memcpy (btm_cb.connecting_dc, p_dev_rec->dev_class, DEV_CLASS_LEN);

		btm_cb.acl_disc_reason = 0xff ;

		p_dev_rec->sec_state = BTM_SEC_STATE_IDLE;
		p_dev_rec->role_master = TRUE;

		/* If any SCO link up, do not allow a switch */
		if (BTM_GetNumScoLinks() != 0)
		allow_switch = HCI_CR_CONN_NOT_ALLOW_SWITCH;

		return(btsnd_hcic_create_conn (bda, packet_types, page_scan_rep_mode,
		page_scan_mode, clock_offset, allow_switch));
		}

		/*******************************************************************************
		**
		** Function btm_sec_connect_after_reject_timeout
		@@ -4472,48 +4202,6 @@ void btm_sec_connected (UINT8 *bda, UINT16 handle, UINT8 status, UINT8 enc_mode)
		return;
		}

		/*******************************************************************************
		**
		** Function btm_sec_role_changed
		**
		** Description This function is colled when controller reports role
		** changed, or failed command status for Role Change request
		**
		** Returns void
		**
		*******************************************************************************/
		void btm_sec_role_changed (void *p_ref_data)
		{
		tBTM_SEC_DEV_REC p_dev_rec = (tBTM_SEC_DEV_REC )p_ref_data;
		UINT8 res;

		BTM_TRACE_EVENT ("Security Manager: role changed");

		/* If this role switch was started by peer do not need to do anything */
		if (p_dev_rec->sec_state != BTM_SEC_STATE_SWITCHING_ROLE)
		return;

		/* If serurity required was to FORCE switch and it failed, notify the waiting layer */
		if (((p_dev_rec->security_required & BTM_SEC_FORCE_MASTER) && !p_dev_rec->role_master)
		\|\| ((p_dev_rec->security_required & BTM_SEC_FORCE_SLAVE) && p_dev_rec->role_master))
		{
		btm_sec_dev_rec_cback_event (p_dev_rec, BTM_ERR_PROCESSING, FALSE);
		return;
		}

		p_dev_rec->sec_flags \|= BTM_SEC_ROLE_SWITCHED;

		p_dev_rec->security_required &= ~(BTM_SEC_FORCE_MASTER \| BTM_SEC_ATTEMPT_MASTER \|
		BTM_SEC_FORCE_SLAVE \| BTM_SEC_ATTEMPT_SLAVE);

		p_dev_rec->sec_state = BTM_SEC_STATE_IDLE;

		if ((res = (UINT8)btm_sec_execute_procedure (p_dev_rec)) != BTM_CMD_STARTED)
		{
		btm_sec_dev_rec_cback_event (p_dev_rec, res, FALSE);
		}
		}

		/*******************************************************************************
		**
		** Function btm_sec_disconnect
		@@ -5613,41 +5301,6 @@ tBTM_SEC_DEV_REC *btm_sec_find_dev_by_sec_state (UINT8 state)
		return(NULL);
		}

		/*******************************************************************************
		**
		** Function BTM_snd_conn_encrypt
		**
		** Description This function is called to start/stop encryption
		** Used by JSR-82
		**
		** Returns TRUE if request started
		**
		*******************************************************************************/
		BOOLEAN BTM_snd_conn_encrypt (UINT16 handle, BOOLEAN enable)
		{
		tBTM_SEC_DEV_REC *p_dev_rec = btm_find_dev_by_handle (handle);

		BTM_TRACE_EVENT ("BTM_snd_conn_encrypt Security Manager: encrypt_change p_dev_rec : 0x%x, enable = %s", p_dev_rec, (enable == TRUE) ? "TRUE" : "FALSE");

		if (!p_dev_rec)
		{
		BTM_TRACE_EVENT ("BTM_snd_conn_encrypt Error no p_dev_rec : 0x%x\n", p_dev_rec);
		return(FALSE);
		}

		if ( p_dev_rec->sec_state == BTM_SEC_STATE_IDLE)
		{
		if (!btsnd_hcic_set_conn_encrypt (handle, enable))
		return(FALSE);

		p_dev_rec->sec_state = BTM_SEC_STATE_ENCRYPTING;

		return(TRUE);
		}
		else
		return(FALSE);
		}

		/*******************************************************************************
		**
		** Function btm_sec_change_pairing_state

system/stack/btu/btu_hcif.c

+0 −27

Original line number	Diff line number	Diff line
		@@ -72,7 +72,6 @@ static void btu_hcif_disconnection_comp_evt (UINT8 *p);
		static void btu_hcif_authentication_comp_evt (UINT8 *p);
		static void btu_hcif_rmt_name_request_comp_evt (UINT8 *p, UINT16 evt_len);
		static void btu_hcif_encryption_change_evt (UINT8 *p);
		static void btu_hcif_master_link_key_comp_evt (UINT8 *p);
		static void btu_hcif_read_rmt_features_comp_evt (UINT8 *p);
		static void btu_hcif_read_rmt_ext_features_comp_evt (UINT8 *p);
		static void btu_hcif_read_rmt_version_comp_evt (UINT8 *p);
		@@ -190,9 +189,6 @@ void btu_hcif_process_event (UNUSED_ATTR UINT8 controller_id, BT_HDR *p_msg)
		btu_hcif_encryption_key_refresh_cmpl_evt(p);
		break;
		#endif
		case HCI_MASTER_LINK_KEY_COMP_EVT:
		btu_hcif_master_link_key_comp_evt (p);
		break;
		case HCI_READ_RMT_FEATURES_COMP_EVT:
		btu_hcif_read_rmt_features_comp_evt (p);
		break;
		@@ -665,29 +661,6 @@ static void btu_hcif_encryption_change_evt (UINT8 *p)
		btm_sec_encrypt_change (handle, status, encr_enable);
		}

		/*******************************************************************************
		**
		** Function btu_hcif_master_link_key_comp_evt
		**
		** Description Process event HCI_MASTER_LINK_KEY_COMP_EVT
		**
		** Returns void
		**
		*******************************************************************************/
		static void btu_hcif_master_link_key_comp_evt (UINT8 *p)
		{
		UINT8 status;
		UINT16 handle;
		UINT8 key_flg;

		STREAM_TO_UINT8 (status, p);
		STREAM_TO_UINT16 (handle, p);
		STREAM_TO_UINT8 (key_flg, p);

		btm_sec_mkey_comp_event (handle, status, key_flg);
		}


		/*******************************************************************************
		**
		** Function btu_hcif_read_rmt_features_comp_evt

system/stack/hcic/hcicmds.c

+0 −22

Original line number	Diff line number	Diff line
		@@ -448,28 +448,6 @@ BOOLEAN btsnd_hcic_set_conn_encrypt (UINT16 handle, BOOLEAN enable)
		return (TRUE);
		}

		BOOLEAN btsnd_hcic_master_link_key (BOOLEAN key_flag)
		{
		BT_HDR *p;
		UINT8 *pp;

		if ((p = HCI_GET_CMD_BUF(HCIC_PARAM_SIZE_MASTER_LINK_KEY)) == NULL)
		return (FALSE);

		pp = (UINT8 *)(p + 1);

		p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_MASTER_LINK_KEY;
		p->offset = 0;

		UINT16_TO_STREAM (pp, HCI_MASTER_LINK_KEY);
		UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_MASTER_LINK_KEY);

		UINT8_TO_STREAM (pp, key_flag);

		btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
		return (TRUE);
		}

		BOOLEAN btsnd_hcic_rmt_name_req (BD_ADDR bd_addr, UINT8 page_scan_rep_mode,
		UINT8 page_scan_mode, UINT16 clock_offset)
		{

system/stack/include/btm_api.h

+0 −102

Original line number	Diff line number	Diff line
		@@ -3170,19 +3170,6 @@ extern UINT8 BTM_GetNumScoLinks (void);
		extern BOOLEAN BTM_SecRegister (tBTM_APPL_INFO *p_cb_info);


		/*******************************************************************************
		**
		** Function BTM_SecRegisterLinkKeyNotificationCallback
		**
		** Description Profiles can register to be notified when a new Link Key
		** is generated per connection.
		**
		** Returns TRUE if registered OK, else FALSE
		**
		*******************************************************************************/
		extern BOOLEAN BTM_SecRegisterLinkKeyNotificationCallback (tBTM_LINK_KEY_CALLBACK *p_callback);


		/*******************************************************************************
		**
		** Function BTM_SecAddRmtNameNotifyCallback
		@@ -3208,19 +3195,6 @@ extern BOOLEAN BTM_SecAddRmtNameNotifyCallback (tBTM_RMT_NAME_CALLBACK *p_callba
		*******************************************************************************/
		extern BOOLEAN BTM_SecDeleteRmtNameNotifyCallback (tBTM_RMT_NAME_CALLBACK *p_callback);


		/*******************************************************************************
		**
		** Function BTM_GetSecurityMode
		**
		** Description Get security mode for the device
		**
		** Returns void
		**
		*******************************************************************************/
		extern UINT8 BTM_GetSecurityMode (void);


		/*******************************************************************************
		**
		** Function BTM_GetSecurityFlags
		@@ -3305,23 +3279,6 @@ extern BOOLEAN BTM_SetSecurityLevel (BOOLEAN is_originator, char *p_name,
		UINT16 psm, UINT32 mx_proto_id,
		UINT32 mx_chan_id);

		/*******************************************************************************
		**
		** Function BTM_SetUCDSecurityLevel
		**
		** Description Register UCD service security level with Security Manager. Each
		** service must register its requirements regardless of the
		** security level that is used. This API is called once for originators
		** and again for acceptors of connections.
		**
		** Returns TRUE if registered OK, else FALSE
		**
		*******************************************************************************/
		extern BOOLEAN BTM_SetUCDSecurityLevel (BOOLEAN is_originator, char *p_name,
		UINT8 service_id, UINT16 sec_level,
		UINT16 psm, UINT32 mx_proto_id,
		UINT32 mx_chan_id);

		/*******************************************************************************
		**
		** Function BTM_SetOutService
		@@ -3349,20 +3306,6 @@ extern void BTM_SetOutService(BD_ADDR bd_addr, UINT8 service_id, UINT32 mx_chan_
		*******************************************************************************/
		extern UINT8 BTM_SecClrService (UINT8 service_id);

		/*******************************************************************************
		**
		** Function BTM_SecClrUCDService
		**
		** Description
		**
		** Parameters Service ID - Id of the service to remove. ('0' removes all service
		** records.
		**
		** Returns Number of records that were freed.
		**
		*******************************************************************************/
		extern UINT8 BTM_SecClrUCDService (UINT8 service_id);

		/*******************************************************************************
		**
		** Function BTM_SecAddDevice
		@@ -3393,34 +3336,6 @@ extern BOOLEAN BTM_SecAddDevice (BD_ADDR bd_addr, DEV_CLASS dev_class,
		extern BOOLEAN BTM_SecDeleteDevice (BD_ADDR bd_addr);


		/*******************************************************************************
		**
		** Function BTM_SecUseMasterLinkKey
		**
		** Description This function is called to tell master of the piconet to
		** switch to master link key
		**
		** Returns BTM_SUCCESS if command is successully initiated
		**
		*******************************************************************************/
		extern tBTM_STATUS BTM_SecUseMasterLinkKey (BOOLEAN use_master_key);


		/*******************************************************************************
		**
		** Function BTM_SetMasterKeyCompCback
		**
		** Description This function is called to register for the master key complete
		** status event.
		**
		** Parameters: mkey_cback - callback registered with the security manager
		**
		** Returns void
		**
		*******************************************************************************/
		extern void BTM_SetMasterKeyCompCback(tBTM_MKEY_CALLBACK *mkey_cback );


		/*******************************************************************************
		**
		** Function BTM_SecGetDeviceLinkKey
		@@ -3457,23 +3372,6 @@ extern void BTM_PINCodeReply (BD_ADDR bd_addr, UINT8 res, UINT8 pin_len,
		UINT8 *p_pin, UINT32 trusted_mask[]);


		/*******************************************************************************
		**
		** Function BTM_DeviceAuthorized
		**
		** Description This function is called after Security Manager submitted
		** authorization request to the UI.
		**
		** Parameters: bd_addr - Address of the device for which PIN was requested
		** res - result of the operation BTM_SUCCESS if success
		**
		** Returns void
		**
		*******************************************************************************/
		extern void BTM_DeviceAuthorized (BD_ADDR bd_addr, UINT8 res,
		UINT32 trusted_mask[]);


		/*******************************************************************************
		**
		** Function BTM_SecBond