Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079 am: 35e1be70b4

am: 64978d763d

Change-Id: I9e3f621fb66a357d7f81975bd7fe14ab79e07013
This commit is contained in:
Shawn Willden 2017-09-12 16:37:22 +00:00 committed by android-build-merger
commit b4766e598b

View file

@ -3907,7 +3907,7 @@ TEST_F(AddEntropyTest, AddEmptyEntropy) {
* Verifies that the addRngEntropy method doesn't blow up when given a largish amount of data. * Verifies that the addRngEntropy method doesn't blow up when given a largish amount of data.
*/ */
TEST_F(AddEntropyTest, AddLargeEntropy) { TEST_F(AddEntropyTest, AddLargeEntropy) {
EXPECT_EQ(ErrorCode::OK, keymaster().addRngEntropy(HidlBuf(string(16 * 1024, 'a')))); EXPECT_EQ(ErrorCode::OK, keymaster().addRngEntropy(HidlBuf(string(2 * 1024, 'a'))));
} }
typedef KeymasterHidlTest AttestationTest; typedef KeymasterHidlTest AttestationTest;