Merge "Backport "Reject access to ... temp bonding [3]"" into main (cc8e2e39) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_sec.cc

+4 −4

Original line number	Diff line number	Diff line
		@@ -1743,15 +1743,15 @@ tBTM_STATUS btm_sec_l2cap_access_req_by_requirement(
		btm_sec_cb.security_mode == BTM_SEC_MODE_SC) {
		if (BTM_SEC_IS_SM4(p_dev_rec->sm4)) {
		if (is_originator) {
		/* SM4 to SM4 -> always authenticate & encrypt */
		security_required \|= (BTM_SEC_OUT_AUTHENTICATE \| BTM_SEC_OUT_ENCRYPT);
		/* SM4 to SM4 -> always encrypt */
		security_required \|= BTM_SEC_OUT_ENCRYPT;
		} else /* acceptor */
		{
		/* SM4 to SM4: the acceptor needs to make sure the authentication is
		* already done */
		chk_acp_auth_done = true;
		/* SM4 to SM4 -> always authenticate & encrypt */
		security_required \|= (BTM_SEC_IN_AUTHENTICATE \| BTM_SEC_IN_ENCRYPT);
		/* SM4 to SM4 -> always encrypt */
		security_required \|= BTM_SEC_IN_ENCRYPT;
		}
		} else if (!(BTM_SM4_KNOWN & p_dev_rec->sm4)) {
		/* the remote features are not known yet */