Restore ImportKeyRequest::SetKeyMaterial
This is used by the tegra R keymaster
Change-Id: Iedef9e682cb64cf98e1a9d4200e27ca286648f0d
diff --git a/android_keymaster/android_keymaster_messages.cpp b/android_keymaster/android_keymaster_messages.cpp
index 3dfd529..7c08fa2 100644
--- a/android_keymaster/android_keymaster_messages.cpp
+++ b/android_keymaster/android_keymaster_messages.cpp
@@ -545,6 +545,10 @@
&& deserialize_blob(&issuer_subject, buf_ptr, end);
}
+void ImportKeyRequest::SetKeyMaterial(const void* key_material, size_t length) {
+ key_data = KeymasterKeyBlob(static_cast<const uint8_t*>(key_material), length);
+}
+
void ImportKeyResponse::SetKeyMaterial(const void* key_material, size_t length) {
set_key_blob(&key_blob, key_material, length);
}
diff --git a/include/keymaster/android_keymaster_messages.h b/include/keymaster/android_keymaster_messages.h
index 6e38860..bd04ef7 100644
--- a/include/keymaster/android_keymaster_messages.h
+++ b/include/keymaster/android_keymaster_messages.h
@@ -572,6 +572,7 @@
size_t SerializedSize() const override;
uint8_t* Serialize(uint8_t* buf, const uint8_t* end) const override;
bool Deserialize(const uint8_t** buf_ptr, const uint8_t* end) override;
+ void SetKeyMaterial(const void* key_material, size_t length);
AuthorizationSet key_description;
keymaster_key_format_t key_format;