Merge "[DPP R2] Support for DPP R2" (182ff206) · Commits · e / os / android_hardware_interfaces

current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -654,9 +654,9 @@ cf1d55e8c68300090747ab90b94c22e4c859b29c84ced68a317c595bb115eab2 android.hardwar
		2defa258951e25a132aaeb36e3febe6f41bf9c6dbb1b1ebdf0b41708ab4e107e android.hardware.wifi.hostapd@1.2::types
		a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardware.wifi.supplicant@1.3::ISupplicant
		213457930af81ff3ea344fbc9d4a0d0a2bb70527f96b7b6a32ee3b5e4c17057e android.hardware.wifi.supplicant@1.3::ISupplicantStaIface
		619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback
		c1b8cfff5a86a7edef800a65b7c8fa025f4546cb95710d48e27bac50a8d16619 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback
		a6163000e2804472924733bcf8b4269db776460cc4df64f9c4dc8350d7aeafc5 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork
		9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types
		16e3e23eea763fbff39230ef069823643c5760b738b3661dbbdaf460c5b9ba13 android.hardware.wifi.supplicant@1.3::types
		7a4ba60b5ddedf497e5d2bdff7d72b7d4a811969000e28677dd9e2389e683b34 android.hardware.radio@1.5::types
		afa2d6cf4c0ba4b8482d5bcc097594ad5bc49be0bf3003034f75955cdaf66045 android.hardware.radio@1.5::IRadio
		3afac66f21a33bc9c4b80481c7d5540038348651d9a7d8af64ea13610af138da android.hardware.radio@1.5::IRadioIndication

wifi/supplicant/1.3/ISupplicantStaIfaceCallback.hal

+27 −0

Original line number	Diff line number	Diff line
		@@ -35,4 +35,31 @@ interface ISupplicantStaIfaceCallback extends @1.2::ISupplicantStaIfaceCallback
		* opaque for the framework and depends on the native implementation.
		*/
		oneway onPmkCacheAdded(int64_t expirationTimeInSec, vec<uint8_t> serializedEntry);

		/**
		* Indicates a DPP success event.
		*/
		oneway onDppSuccess(DppSuccessCode code);

		/**
		* Indicates a DPP progress event.
		*/
		oneway onDppProgress_1_3(DppProgressCode code);

		/**
		* Indicates a DPP failure event.
		*
		* ssid: A string indicating the SSID for the AP that the Enrollee attempted to connect.
		* channelList: A string containing a list of operating channels and operating classes
		* indicating the channels that the Enrollee scanned in attempting to discover the AP.
		* The list conforms to the following ABNF syntax:
		* channel-list2 = class-and-channels *(“,” class-and-channels)
		* class-and-channels = class “/” channel *(“,” channel)
		* class = 1*3DIGIT
		* channel = 1*3DIGIT
		* bandList: A list of band parameters that are supported by the Enrollee expressed as the
		* Operating Class.
		*/
		oneway onDppFailure_1_3(DppFailureCode code, string ssid, string channelList,
		vec<uint16_t>bandList);
		};

wifi/supplicant/1.3/types.hal

+27 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*/

		package android.hardware.wifi.supplicant@1.3;
		import @1.2::DppProgressCode;
		import @1.2::DppFailureCode;

		/**
		* OcspType: The type of OCSP request.
		@@ -72,3 +74,28 @@ enum WpaDriverCapabilitiesMask : uint32_t {
		*/
		OCE = 1 << 1,
		};

		/**
		* DppProgressCode: Progress codes for DPP (Easy Connect)
		*/
		enum DppProgressCode : @1.2::DppProgressCode {
		CONFIGURATION_SENT_WAITING_RESPONSE,
		CONFIGURATION_ACCEPTED,
		};

		/**
		* DppSuccessCode: Success codes for DPP (Easy Connect) Configurator
		*/
		enum DppSuccessCode : uint32_t {
		CONFIGURATION_SENT, /* Replaces @1.2::onDppSuccessConfigSent() */
		CONFIGURATION_APPLIED,
		};

		/**
		* DppFailureCode: Error codes for DPP (Easy Connect)
		*/
		enum DppFailureCode : @1.2::DppFailureCode {
		CONFIGURATION_REJECTED,
		CANNOT_FIND_NETWORK,
		ENROLLEE_AUTHENTICATION,
		};

wifi/supplicant/1.3/vts/functional/supplicant_sta_iface_hidl_test.cpp

+214 −0

Original line number	Diff line number	Diff line
		@@ -36,13 +36,18 @@ using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatus;
		using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatusCode;
		using ::android::hardware::wifi::supplicant::V1_2::DppAkm;
		using ::android::hardware::wifi::supplicant::V1_2::DppFailureCode;
		using ::android::hardware::wifi::supplicant::V1_2::DppNetRole;
		using ::android::hardware::wifi::supplicant::V1_2::DppProgressCode;
		using ::android::hardware::wifi::supplicant::V1_3::ConnectionCapabilities;
		using ::android::hardware::wifi::supplicant::V1_3::DppSuccessCode;
		using ::android::hardware::wifi::supplicant::V1_3::ISupplicantStaIface;
		using ::android::hardware::wifi::supplicant::V1_3::ISupplicantStaIfaceCallback;
		using ::android::hardware::wifi::supplicant::V1_3::ISupplicantStaNetwork;
		using ::android::hardware::wifi::supplicant::V1_3::WpaDriverCapabilitiesMask;

		#define TIMEOUT_PERIOD 60
		class IfaceDppCallback;

		class SupplicantStaIfaceHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		public:
		virtual void SetUp() override {
		@@ -57,9 +62,64 @@ class SupplicantStaIfaceHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		int64_t pmkCacheExpirationTimeInSec;
		std::vector<uint8_t> serializedPmkCacheEntry;

		enum DppCallbackType {
		ANY_CALLBACK = -2,
		INVALID = -1,

		EVENT_SUCCESS = 0,
		EVENT_PROGRESS,
		EVENT_FAILURE,
		};

		DppCallbackType dppCallbackType;
		uint32_t code;

		/* Used as a mechanism to inform the test about data/event callback */
		inline void notify() {
		std::unique_lock<std::mutex> lock(mtx_);
		count_++;
		cv_.notify_one();
		}

		/* Test code calls this function to wait for data/event callback */
		inline std::cv_status wait(DppCallbackType waitForCallbackType) {
		std::unique_lock<std::mutex> lock(mtx_);
		EXPECT_NE(INVALID, waitForCallbackType); // can't ASSERT in a
		// non-void-returning method
		auto now = std::chrono::system_clock::now();
		std::cv_status status =
		cv_.wait_until(lock, now + std::chrono::seconds(TIMEOUT_PERIOD));
		return status;
		}

		private:
		// synchronization objects
		std::mutex mtx_;
		std::condition_variable cv_;
		int count_;

		protected:
		// ISupplicantStaIface object used for all tests in this fixture.
		sp<ISupplicantStaIface> sta_iface_;
		bool isDppSupported() {
		uint32_t keyMgmtMask = 0;

		// We need to first get the key management capabilities from the device.
		// If DPP is not supported, we just pass the test.
		sta_iface_->getKeyMgmtCapabilities(
		[&](const SupplicantStatus& status, uint32_t keyMgmtMaskInternal) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);

		keyMgmtMask = keyMgmtMaskInternal;
		});

		if (!(keyMgmtMask & ISupplicantStaNetwork::KeyMgmtMask::DPP)) {
		// DPP not supported
		return false;
		}

		return true;
		}
		};

		class IfaceCallback : public ISupplicantStaIfaceCallback {
		@@ -150,6 +210,20 @@ class IfaceCallback : public ISupplicantStaIfaceCallback {
		Return<void> onDppFailure(DppFailureCode /* code */) override {
		return Void();
		}
		Return<void> onDppSuccess(DppSuccessCode /* code */) override {
		return Void();
		}
		Return<void> onDppProgress_1_3(
		::android::hardware::wifi::supplicant::V1_3::DppProgressCode /* code */)
		override {
		return Void();
		}
		Return<void> onDppFailure_1_3(
		::android::hardware::wifi::supplicant::V1_3::DppFailureCode /* code */,
		const hidl_string& /* ssid /, const hidl_string& / channelList */,
		const hidl_vec<uint16_t>& /* bandList */) override {
		return Void();
		}
		Return<void> onPmkCacheAdded(
		int64_t /* expirationTimeInSec */,
		const hidl_vec<uint8_t>& /* serializedEntry */) override {
		@@ -172,6 +246,39 @@ class IfacePmkCacheCallback : public IfaceCallback {
		: parent_(parent) {}
		};

		class IfaceDppCallback : public IfaceCallback {
		SupplicantStaIfaceHidlTest& parent_;
		Return<void> onDppSuccess(DppSuccessCode code) override {
		parent_.code = (uint32_t)code;
		parent_.dppCallbackType =
		SupplicantStaIfaceHidlTest::DppCallbackType::EVENT_SUCCESS;
		parent_.notify();
		return Void();
		}
		Return<void> onDppProgress_1_3(
		::android::hardware::wifi::supplicant::V1_3::DppProgressCode code)
		override {
		parent_.code = (uint32_t)code;
		parent_.dppCallbackType =
		SupplicantStaIfaceHidlTest::DppCallbackType::EVENT_PROGRESS;
		parent_.notify();
		return Void();
		}
		Return<void> onDppFailure_1_3(
		::android::hardware::wifi::supplicant::V1_3::DppFailureCode code,
		const hidl_string& ssid __attribute__((unused)),
		const hidl_string& channelList __attribute__((unused)),
		const hidl_vec<uint16_t>& bandList __attribute__((unused))) override {
		parent_.code = (uint32_t)code;
		parent_.dppCallbackType =
		SupplicantStaIfaceHidlTest::DppCallbackType::EVENT_FAILURE;
		parent_.notify();
		return Void();
		}

		public:
		IfaceDppCallback(SupplicantStaIfaceHidlTest& parent) : parent_(parent){};
		};
		/*
		* RegisterCallback_1_3
		*/
		@@ -246,3 +353,110 @@ TEST_F(SupplicantStaIfaceHidlTest, GetKeyMgmtCapabilities_1_3) {
		}
		});
		}

		/*
		* StartDppEnrolleeInitiator
		*/
		TEST_F(SupplicantStaIfaceHidlTest, StartDppEnrolleeInitiator) {
		// We need to first get the key management capabilities from the device.
		// If DPP is not supported, we just pass the test.
		if (!isDppSupported()) {
		// DPP not supported
		return;
		}

		hidl_string uri =
		"DPP:C:81/1;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"
		"0DAQcDIgAD0edY4X3N//HhMFYsZfMbQJTiNFtNIWF/cIwMB/gzqOM=;;";
		uint32_t peer_id = 0;

		// Register callbacks
		sta_iface_->registerCallback_1_3(
		new IfaceDppCallback(*this), [](const SupplicantStatus& status) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		});

		// Add a peer URI
		sta_iface_->addDppPeerUri(
		uri, [&](const SupplicantStatus& status, uint32_t id) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		EXPECT_NE(0, id);
		EXPECT_NE(-1, id);

		peer_id = id;
		});

		// Start DPP as Enrollee-Initiator. Since this operation requires two
		// devices, we start the operation and expect a timeout.
		sta_iface_->startDppEnrolleeInitiator(
		peer_id, 0, [&](const SupplicantStatus& status) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		});

		// Wait for the timeout callback
		ASSERT_EQ(std::cv_status::no_timeout,
		wait(SupplicantStaIfaceHidlTest::DppCallbackType::EVENT_FAILURE));
		ASSERT_EQ(SupplicantStaIfaceHidlTest::DppCallbackType::EVENT_FAILURE,
		dppCallbackType);

		// ...and then remove the peer URI.
		sta_iface_->removeDppUri(peer_id, [&](const SupplicantStatus& status) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		});
		}

		/*
		* StartDppConfiguratorInitiator
		*/
		TEST_F(SupplicantStaIfaceHidlTest, StartDppConfiguratorInitiator) {
		// We need to first get the key management capabilities from the device.
		// If DPP is not supported, we just pass the test.
		if (!isDppSupported()) {
		// DPP not supported
		return;
		}

		hidl_string uri =
		"DPP:C:81/1;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"
		"0DAQcDIgAD0edY4X3N//HhMFYsZfMbQJTiNFtNIWF/cIwMB/gzqOM=;;";
		uint32_t peer_id = 0;

		// Register callbacks
		sta_iface_->registerCallback_1_3(
		new IfaceDppCallback(*this), [](const SupplicantStatus& status) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		});

		// Add a peer URI
		sta_iface_->addDppPeerUri(
		uri, [&](const SupplicantStatus& status, uint32_t id) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		EXPECT_NE(0, id);
		EXPECT_NE(-1, id);

		peer_id = id;
		});

		std::string ssid =
		"6D795F746573745F73736964"; // 'my_test_ssid' encoded in hex
		std::string password = "746F70736563726574"; // 'topsecret' encoded in hex

		// Start DPP as Configurator-Initiator. Since this operation requires two
		// devices, we start the operation and expect a timeout.
		sta_iface_->startDppConfiguratorInitiator(
		peer_id, 0, ssid, password, NULL, DppNetRole::STA, DppAkm::PSK,
		[&](const SupplicantStatus& status) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		});

		// Wait for the timeout callback
		ASSERT_EQ(std::cv_status::no_timeout,
		wait(SupplicantStaIfaceHidlTest::DppCallbackType::EVENT_FAILURE));
		ASSERT_EQ(SupplicantStaIfaceHidlTest::DppCallbackType::EVENT_FAILURE,
		dppCallbackType);

		// ...and then remove the peer URI.
		sta_iface_->removeDppUri(peer_id, [&](const SupplicantStatus& status) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		});
		}