commit c11fad6ab46656dfac104ea13758dd6a5a111e9c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 15 03:17:33 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 15 03:17:33 2021 +0000
tree dd818f80bd6ae78ccb1d7c508cb437df9a1df197
parent d1d45c441e953b3440c0f97769c73e6e71b70a9b
parent ff6b20c2211093957d4a45cc84b131186ce41a5f

Merge "Vts: thermal: Test notification with an unregistered local callback" into stage-aosp-sc-ts-dev

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

diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
index 9797e0e..2a0ee7f 100644
--- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -1841,12 +1841,13 @@
     if (SecLevel() == SecurityLevel::STRONGBOX) return;
 
     auto result = GenerateKey(AuthorizationSetBuilder()
+                                      .Authorization(TAG_ALGORITHM, Algorithm::EC)
                                       .Authorization(TAG_KEY_SIZE, 224)
                                       .Authorization(TAG_EC_CURVE, EcCurve::P_256)
+                                      .SigningKey()
                                       .Digest(Digest::NONE)
                                       .SetDefaultValidity());
-    ASSERT_TRUE(result == ErrorCode::INVALID_ARGUMENT ||
-                result == ErrorCode::UNSUPPORTED_ALGORITHM);
+    ASSERT_TRUE(result == ErrorCode::INVALID_ARGUMENT);
 }
 
 /*