Merge "wpa_supplicant(sta_network): Support encrypted imsi identity API for EAP-AKA/SIM" (18691383) · Commits · e / os / android_hardware_interfaces

wifi/supplicant/1.1/vts/functional/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ cc_test {
		srcs: [
		"VtsHalWifiSupplicantV1_1TargetTest.cpp",
		"supplicant_hidl_test.cpp",
		"supplicant_sta_network_hidl_test.cpp",
		],
		static_libs: [
		"VtsHalWifiV1_0TargetTestUtil",

wifi/supplicant/1.1/vts/functional/supplicant_hidl_test_utils_1_1.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -21,8 +21,13 @@
		#include "supplicant_hidl_test_utils_1_1.h"

		using ::android::hardware::wifi::supplicant::V1_1::ISupplicant;
		using ::android::hardware::wifi::supplicant::V1_1::ISupplicantStaNetwork;
		using ::android::sp;

		sp<ISupplicant> getSupplicant_1_1() {
		return ISupplicant::castFrom(getSupplicant());
		}

		sp<ISupplicantStaNetwork> createSupplicantStaNetwork_1_1() {
		return ISupplicantStaNetwork::castFrom(createSupplicantStaNetwork());
		}

wifi/supplicant/1.1/vts/functional/supplicant_hidl_test_utils_1_1.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -18,8 +18,12 @@
		#define SUPPLICANT_HIDL_TEST_UTILS_1_1_H

		#include <android/hardware/wifi/supplicant/1.1/ISupplicant.h>
		#include <android/hardware/wifi/supplicant/1.1/ISupplicantStaNetwork.h>

		android::sp<android::hardware::wifi::supplicant::V1_1::ISupplicant>
		getSupplicant_1_1();

		android::sp<android::hardware::wifi::supplicant::V1_1::ISupplicantStaNetwork>
		createSupplicantStaNetwork_1_1();

		#endif /* SUPPLICANT_HIDL_TEST_UTILS_1_1_H */

wifi/supplicant/1.1/vts/functional/supplicant_sta_network_hidl_test.cpp

0 → 100644

+89 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <android-base/logging.h>

		#include <VtsHalHidlTargetTestBase.h>
		#include <android/hardware/wifi/supplicant/1.1/ISupplicantStaNetwork.h>

		#include "supplicant_hidl_test_utils.h"
		#include "supplicant_hidl_test_utils_1_1.h"

		using ::android::sp;
		using ::android::hardware::hidl_vec;
		using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatus;
		using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatusCode;
		using ::android::hardware::wifi::supplicant::V1_1::ISupplicantStaNetwork;
		namespace {
		constexpr uint8_t kTestIdentity[] = {0x45, 0x67, 0x98, 0x67, 0x56};
		constexpr uint8_t kTestEncryptedIdentity[] = {0x35, 0x37, 0x58, 0x57, 0x26};
		} // namespace

		class SupplicantStaNetworkHidlTest
		: public ::testing::VtsHalHidlTargetTestBase {
		public:
		virtual void SetUp() override {
		startSupplicantAndWaitForHidlService();
		EXPECT_TRUE(turnOnExcessiveLogging());
		sta_network_ = createSupplicantStaNetwork_1_1();
		ASSERT_NE(sta_network_.get(), nullptr);
		}

		virtual void TearDown() override { stopSupplicant(); }

		protected:
		// ISupplicantStaNetwork object used for all tests in this fixture.
		sp<ISupplicantStaNetwork> sta_network_;
		};

		/*
		* Create:
		* Ensures that an instance of the ISupplicantStaNetwork proxy object is
		* successfully created.
		*/
		TEST(SupplicantStaNetworkHidlTestNoFixture, Create) {
		startSupplicantAndWaitForHidlService();
		EXPECT_NE(nullptr, createSupplicantStaNetwork_1_1().get());
		stopSupplicant();
		}

		/*
		* Ensure that the encrypted imsi identity is set successfully.
		*/
		TEST_F(SupplicantStaNetworkHidlTest, setEapEncryptedImsiIdentity) {
		std::vector<uint8_t> encrypted_identity(
		kTestEncryptedIdentity,
		kTestEncryptedIdentity + sizeof(kTestEncryptedIdentity));
		sta_network_->setEapEncryptedImsiIdentity(
		encrypted_identity, [](const SupplicantStatus &status) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		});
		}

		/*
		* Ensure that the identity and the encrypted imsi identity are sent
		* successfully.
		*/
		TEST_F(SupplicantStaNetworkHidlTest, SendNetworkEapIdentityResponse_1_1) {
		sta_network_->sendNetworkEapIdentityResponse_1_1(
		std::vector<uint8_t>(kTestIdentity,
		kTestIdentity + sizeof(kTestIdentity)),
		std::vector<uint8_t>(kTestEncryptedIdentity,
		kTestIdentity + sizeof(kTestEncryptedIdentity)),
		[](const SupplicantStatus &status) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		});
		}