commit c4ccbc1a77ee2da8cad4e303a83f1dadcc55f7b8
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 06 22:22:46 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 06 22:22:46 2020 +0000
tree ecf6d857211fd506b547c1b661fcbd33367facdb
parent a4bffdbeb00a21f245b77ecdf8d9d91035966153
parent ae643ae705144d1eef60671f19d2999218e37b61

Merge changes from topics "dequantize_signed", "nnapi-1.3-IPreparedModel-2"

* changes:
  Add TENSOR_QUANT8_ASYMM_SIGNED support for DEQUANTIZE
  NN HAL: Upgrade IPreparedModel::executeSynchronously to 1.3.

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
index 194c438..66132ad 100644
--- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -2607,8 +2607,10 @@
                                    .Padding(PaddingMode::NONE));
     ASSERT_EQ(ErrorCode::OK, err) << "Got " << err;
 
-    err = Begin(KeyPurpose::DECRYPT,
-                AuthorizationSetBuilder().BlockMode(BlockMode::GCM).Padding(PaddingMode::NONE));
+    err = Begin(KeyPurpose::DECRYPT, AuthorizationSetBuilder()
+                                             .BlockMode(BlockMode::GCM)
+                                             .Padding(PaddingMode::NONE)
+                                             .Authorization(TAG_MAC_LENGTH, 128));
     EXPECT_EQ(ErrorCode::INCOMPATIBLE_PURPOSE, err) << "Got " << err;
 
     CheckedDeleteKey();
@@ -2621,8 +2623,10 @@
                                                  .Authorization(TAG_MIN_MAC_LENGTH, 128)
                                                  .Padding(PaddingMode::NONE)));
 
-    err = Begin(KeyPurpose::ENCRYPT,
-                AuthorizationSetBuilder().BlockMode(BlockMode::GCM).Padding(PaddingMode::NONE));
+    err = Begin(KeyPurpose::ENCRYPT, AuthorizationSetBuilder()
+                                             .BlockMode(BlockMode::GCM)
+                                             .Padding(PaddingMode::NONE)
+                                             .Authorization(TAG_MAC_LENGTH, 128));
     EXPECT_EQ(ErrorCode::INCOMPATIBLE_PURPOSE, err) << "Got " << err;
 }