Merge "Reland "Enforce authentication if encryption is required"" into main (2c46e872) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_sec.cc

+6 −4

Original line number	Diff line number	Diff line
		@@ -4355,13 +4355,15 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) {
		// Check link status of BR/EDR
		if (!(p_dev_rec->sec_rec.sec_flags & BTM_SEC_AUTHENTICATED)) {
		if (p_dev_rec->IsLocallyInitiated()) {
		if (p_dev_rec->sec_rec.security_required & BTM_SEC_OUT_AUTHENTICATE) {
		LOG_DEBUG("Outgoing authentication Required");
		if (p_dev_rec->sec_rec.security_required &
		(BTM_SEC_OUT_AUTHENTICATE \| BTM_SEC_OUT_ENCRYPT)) {
		LOG_DEBUG("Outgoing authentication/encryption Required");
		start_auth = true;
		}
		} else {
		if (p_dev_rec->sec_rec.security_required & BTM_SEC_IN_AUTHENTICATE) {
		LOG_DEBUG("Incoming authentication Required");
		if (p_dev_rec->sec_rec.security_required &
		(BTM_SEC_IN_AUTHENTICATE \| BTM_SEC_IN_ENCRYPT)) {
		LOG_DEBUG("Incoming authentication/encryption Required");
		start_auth = true;
		}
		}