Merge "RootCanal: Allow only the peer to have OOB data" (a7f95299) · Commits · e / os / android_packages_modules_Bluetooth

system/vendor_libs/test_vendor_lib/model/controller/link_layer_controller.cc

+23 −7

Original line number	Diff line number	Diff line
		@@ -721,11 +721,6 @@ void LinkLayerController::IncomingIoCapabilityRequestPacket(
		return;
		}

		security_manager_.AuthenticationRequest(peer, handle);

		security_manager_.SetPeerIoCapability(peer, io_capability, oob_data_present,
		authentication_requirements);

		auto packet = bluetooth::hci::IoCapabilityResponseBuilder::Create(
		peer, static_cast<bluetooth::hci::IoCapability>(io_capability),
		static_cast<bluetooth::hci::OobDataPresent>(oob_data_present),
		@@ -733,9 +728,26 @@ void LinkLayerController::IncomingIoCapabilityRequestPacket(
		authentication_requirements));
		send_event_(std::move(packet));

		bool pairing_started = security_manager_.AuthenticationInProgress();
		if (!pairing_started) {
		security_manager_.AuthenticationRequest(peer, handle);
		StartSimplePairing(peer);
		}

		security_manager_.SetPeerIoCapability(peer, io_capability, oob_data_present,
		authentication_requirements);
		if (pairing_started) {
		PairingType pairing_type = security_manager_.GetSimplePairingType();
		if (pairing_type != PairingType::INVALID) {
		ScheduleTask(milliseconds(5), [this, peer, pairing_type]() {
		AuthenticateRemoteStage1(peer, pairing_type);
		});
		} else {
		LOG_INFO("Security Manager returned INVALID");
		}
		}
		}

		void LinkLayerController::IncomingIoCapabilityResponsePacket(
		model::packets::LinkLayerPacketView incoming) {
		auto response = model::packets::IoCapabilityResponseView::Create(incoming);
		@@ -1441,6 +1453,10 @@ void LinkLayerController::AuthenticateRemoteStage1(const Address& peer,
		LOG_INFO("Oob data request for %s", peer.ToString().c_str());
		send_event_(bluetooth::hci::RemoteOobDataRequestBuilder::Create(peer));
		break;
		case PairingType::PEER_HAS_OUT_OF_BAND:
		LOG_INFO("Trusting that %s has OOB data", peer.ToString().c_str());
		SaveKeyAndAuthenticate('P', peer);
		break;
		default:
		LOG_ALWAYS_FATAL("Invalid PairingType %d",
		static_cast<int>(pairing_type));
		@@ -1531,7 +1547,7 @@ void LinkLayerController::SaveKeyAndAuthenticate(uint8_t key_type,
		'e',
		'y',
		' ',
		'U',
		key_type,
		5,
		6,
		7,

system/vendor_libs/test_vendor_lib/model/controller/security_manager.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -134,8 +134,8 @@ PairingType SecurityManager::GetSimplePairingType() {
		return PairingType::AUTO_CONFIRMATION;
		}
		if (peer_oob_present_flag_ != 0 \|\| host_oob_present_flag_ != 0) {
		if (peer_oob_present_flag_ != host_oob_present_flag_) {
		return PairingType::INVALID;
		if (peer_oob_present_flag_ != 0) {
		return PairingType::PEER_HAS_OUT_OF_BAND;
		} else {
		return PairingType::OUT_OF_BAND;
		}

system/vendor_libs/test_vendor_lib/model/controller/security_manager.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ enum class PairingType : uint8_t {
		DISPLAY_AND_CONFIRM,
		INPUT_PIN,
		OUT_OF_BAND,
		PEER_HAS_OUT_OF_BAND,
		INVALID = 0xff,
		};