AuthorizationSet: Clear() should also reset the error_ field

Clear() should reset the error field or it does not recover
AuthorizationSets that have encountered an error before.

Added test ClearRecoversFromError to authorization_set_test.cpp

Test: host test (run make in keymaster director)
Bug: 72702959
Change-Id: I1c422135cb7d235157d17785f5df927164d1e166

2 files changed, 10 insertions, 0 deletions

diff --git a/android_keymaster/authorization_set.cpp b/android_keymaster/authorization_set.cpp
index c26c7d8..7073b5b 100644
--- a/android_keymaster/authorization_set.cpp
+++ b/android_keymaster/authorization_set.cpp
@@ -501,6 +501,7 @@ void AuthorizationSet::Clear() {
     memset_s(indirect_data_, 0, indirect_data_size_);
     elems_size_ = 0;
     indirect_data_size_ = 0;
+    error_ = OK;
 }
 
 void AuthorizationSet::FreeData() {
diff --git a/tests/authorization_set_test.cpp b/tests/authorization_set_test.cpp
index f3f4412..8c908c3 100644
--- a/tests/authorization_set_test.cpp
+++ b/tests/authorization_set_test.cpp
@@ -247,6 +247,15 @@ TEST(Deserialization, InvalidLengthField) {
     EXPECT_EQ(AuthorizationSet::MALFORMED_DATA, deserialized.is_valid());
 }
 
+TEST(Clear, ClearRecoversFromError) {
+    uint8_t buf[] = {0, 0, 0};
+    AuthorizationSet deserialized(buf, array_length(buf));
+    ASSERT_EQ(AuthorizationSet::MALFORMED_DATA, deserialized.is_valid());
+
+    deserialized.Clear();
+    ASSERT_EQ(AuthorizationSet::OK, deserialized.is_valid());
+}
+
 static uint32_t read_uint32(const uint8_t* buf) {
     uint32_t val;
     memcpy(&val, buf, sizeof(val));