Prevent GenerateKeyResponse from adding tags to created keys.
This change was already reviewed, merged and reverted, so I'm skipping
the review step this time.
Change-Id: I85ef23050ee0beb0eb8ab7d4db4e3b9c40d1fe81
diff --git a/authorization_set.cpp b/authorization_set.cpp
index e4d8ba3..74758cc 100644
--- a/authorization_set.cpp
+++ b/authorization_set.cpp
@@ -344,18 +344,22 @@
return true;
}
-void AuthorizationSet::FreeData() {
+void AuthorizationSet::Clear() {
memset_s(elems_, 0, elems_size_ * sizeof(keymaster_key_param_t));
memset_s(indirect_data_, 0, indirect_data_size_);
+ elems_size_ = 0;
+ indirect_data_size_ = 0;
+}
+
+void AuthorizationSet::FreeData() {
+ Clear();
delete[] elems_;
delete[] indirect_data_;
elems_ = NULL;
indirect_data_ = NULL;
- elems_size_ = 0;
elems_capacity_ = 0;
- indirect_data_size_ = 0;
indirect_data_capacity_ = 0;
error_ = OK;
}