Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: I9c989065fb62a5aa4df5de76841a1cbdf30a0023
BUG: 129345239
diff --git a/android_keymaster/android_keymaster_messages.cpp b/android_keymaster/android_keymaster_messages.cpp
index 1c5695e..6eb6a5f 100644
--- a/android_keymaster/android_keymaster_messages.cpp
+++ b/android_keymaster/android_keymaster_messages.cpp
@@ -635,13 +635,14 @@
return sizeof(uint32_t) /* wrapped_key_data_length */ + wrapped_key.key_material_size +
sizeof(uint32_t) /* wrapping_key_data_length */ + wrapping_key.key_material_size +
sizeof(uint32_t) /* masking_key_data_length */ + masking_key.key_material_size +
- additional_params.SerializedSize();
+ additional_params.SerializedSize() + sizeof(uint64_t) /* password_sid */ +
+ sizeof(uint64_t) /* biometric_sid */;
}
uint8_t* ImportWrappedKeyRequest::Serialize(uint8_t* buf, const uint8_t* end) const {
- serialize_key_blob(wrapped_key, buf, end);
- serialize_key_blob(wrapping_key, buf, end);
- serialize_key_blob(masking_key, buf, end);
+ buf = serialize_key_blob(wrapped_key, buf, end);
+ buf = serialize_key_blob(wrapping_key, buf, end);
+ buf = serialize_key_blob(masking_key, buf, end);
buf = additional_params.Serialize(buf, end);
buf = append_uint64_to_buf(buf, end, password_sid);
return append_uint64_to_buf(buf, end, biometric_sid);