commit 120e46378a6f1fb00c0bda33a366b06def75376c
author Matthew Maurer <mmaurer@google.com> Thu May 16 17:58:09 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 16 17:58:09 2019 -0700
tree a3188fb3118a7a511cd67fc4798e2fc728550074
parent 36bd239f236da9c07467862a8db7496e158950a6
parent d65e81b1fbac4780fe2d2eb28e481071d965c617

Merge "Allow INVALID_INPUT_LENGTH for oversized messages" am: b397fc8e88 am: 6194c02c64
am: d65e81b1fb

Change-Id: I56bf87c501acc5517d6d6bfbe2cd33aae413a81d

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 c7ec721..3bc4fce 100644
--- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -2545,7 +2545,8 @@
               Begin(KeyPurpose::ENCRYPT,
                     AuthorizationSetBuilder().Padding(PaddingMode::RSA_OAEP).Digest(Digest::SHA_2_256)));
     string result;
-    EXPECT_EQ(ErrorCode::INVALID_ARGUMENT, Finish(message, &result));
+    auto error = Finish(message, &result);
+    EXPECT_TRUE(error == ErrorCode::INVALID_INPUT_LENGTH || error == ErrorCode::INVALID_ARGUMENT);
     EXPECT_EQ(0U, result.size());
 }
 
@@ -2603,7 +2604,8 @@
     auto params = AuthorizationSetBuilder().Padding(PaddingMode::RSA_PKCS1_1_5_ENCRYPT);
     EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::ENCRYPT, params));
     string result;
-    EXPECT_EQ(ErrorCode::INVALID_ARGUMENT, Finish(message, &result));
+    auto error = Finish(message, &result);
+    EXPECT_TRUE(error == ErrorCode::INVALID_INPUT_LENGTH || error == ErrorCode::INVALID_ARGUMENT);
     EXPECT_EQ(0U, result.size());
 }