Merge "Fix RKP support assumptions for keymint VTS" (f84593a4) · Commits · e / os / android_hardware_interfaces

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp

+13 −0

Original line number	Diff line number	Diff line
		@@ -1292,6 +1292,19 @@ std::pair<ErrorCode, vector<uint8_t>> KeyMintAidlTestBase::UpgradeKey(

		return retval;
		}

		bool KeyMintAidlTestBase::IsRkpSupportRequired() const {
		if (get_vsr_api_level() >= __ANDROID_API_T__) {
		return true;
		}

		if (get_vsr_api_level() >= __ANDROID_API_S__) {
		return SecLevel() != SecurityLevel::STRONGBOX;
		}

		return false;
		}

		vector<uint32_t> KeyMintAidlTestBase::ValidKeySizes(Algorithm algorithm) {
		switch (algorithm) {
		case Algorithm::RSA:

+1 −0

Original line number	Diff line number	Diff line
		@@ -309,6 +309,7 @@ class KeyMintAidlTestBase : public ::testing::TestWithParam<string> {
		}
		bool IsSecure() const { return securityLevel_ != SecurityLevel::SOFTWARE; }
		SecurityLevel SecLevel() const { return securityLevel_; }
		bool IsRkpSupportRequired() const;

		vector<uint32_t> ValidKeySizes(Algorithm algorithm);
		vector<uint32_t> InvalidKeySizes(Algorithm algorithm);

+4 −4

Original line number	Diff line number	Diff line
		@@ -1136,8 +1136,8 @@ TEST_P(NewKeyGenerationTest, RsaWithAttestation) {
		* that has been generated using an associate IRemotelyProvisionedComponent.
		*/
		TEST_P(NewKeyGenerationTest, RsaWithRkpAttestation) {
		if (get_vsr_api_level() < __ANDROID_API_T__ \|\| AidlVersion() < 2) {
		GTEST_SKIP() << "Only required for VSR 12+ and KeyMint 2+";
		if (!IsRkpSupportRequired()) {
		GTEST_SKIP() << "RKP support is not required on this platform";
		}

		// There should be an IRemotelyProvisionedComponent instance associated with the KeyMint
		@@ -1214,8 +1214,8 @@ TEST_P(NewKeyGenerationTest, RsaWithRkpAttestation) {
		* that has been generated using an associate IRemotelyProvisionedComponent.
		*/
		TEST_P(NewKeyGenerationTest, EcdsaWithRkpAttestation) {
		if (get_vsr_api_level() < __ANDROID_API_T__ \|\| AidlVersion() < 2) {
		GTEST_SKIP() << "Only required for VSR 12+ and KeyMint 2+";
		if (!IsRkpSupportRequired()) {
		GTEST_SKIP() << "RKP support is not required on this platform";
		}

		// There should be an IRemotelyProvisionedComponent instance associated with the KeyMint