From 26dc50cefb2b8719846849da389abeb05512c050 Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Fri, 16 Jun 2017 10:03:24 -0600 Subject: [PATCH] Re-enable fuzzing tests A pair of tests that send corrupted data to keymaster were disabled because they cause a reboot on Angler and Bullhead. Because VTS is not being run on those devices, I'm enabling them. Separately, I'm going to get this bug triaged as a security vulnerability, which may result in a fix being forthcoming. As a simple functional defect, the vendor refused to fix the old devices. Bug: 33385206 Test: adb shell data/nativetests64/VtsHalKeymasterV3_0TargetTest/VtsHalKeymasterV3_0TargetTest Change-Id: I3bdea4e9756d3f77d54de09fd7ed2de04edeb1fd --- keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp index 78353eaf25..46b296fb05 100644 --- a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp +++ b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp @@ -2279,8 +2279,7 @@ TEST_F(ExportKeyTest, RsaUnsupportedKeyFormat) { * Verifies that attempting to export RSA keys from corrupted key blobs fails. This is essentially * a poor-man's key blob fuzzer. */ -// Disabled due to b/33385206 -TEST_F(ExportKeyTest, DISABLED_RsaCorruptedKeyBlob) { +TEST_F(ExportKeyTest, RsaCorruptedKeyBlob) { ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder() .Authorization(TAG_NO_AUTH_REQUIRED) .RsaSigningKey(1024, 3) @@ -2303,8 +2302,7 @@ TEST_F(ExportKeyTest, DISABLED_RsaCorruptedKeyBlob) { * Verifies that attempting to export ECDSA keys from corrupted key blobs fails. This is * essentially a poor-man's key blob fuzzer. */ -// Disabled due to b/33385206 -TEST_F(ExportKeyTest, DISABLED_EcCorruptedKeyBlob) { +TEST_F(ExportKeyTest, EcCorruptedKeyBlob) { ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder() .Authorization(TAG_NO_AUTH_REQUIRED) .EcdsaSigningKey(EcCurve::P_256)