commit bd6610378dd0bae0aeb58547e5ec1bea344ae7c8
author Janis Danisevskis <jdanis@google.com> Thu Aug 23 11:03:45 2018 -0700
committer Janis Danisevskis <jdanis@google.com> Tue Sep 04 19:42:10 2018 +0000
tree 5f7812b23802909febcb9f8b734c0a6ae5a6a403
parent 094973763cf18fcd2b558687e671d0089000d108

Fix disagreement of client_id/app_data pointer semantic

KM1/KM2 implementations should treat nullptr and KeymasterBlob{nullptr, 0}
equally when passed in as client_id or app_data. However, trusty KM1
treats them differently.

Bug: 113110105
Bug: 113084196
Change-Id: Ie0e2b5d60d808e4f7a8e48aeb4c694268f9bc0a1

trusty/keymaster/legacy/trusty_keymaster_device.cpp

diff --git a/trusty/keymaster/legacy/trusty_keymaster_device.cpp b/trusty/keymaster/legacy/trusty_keymaster_device.cpp
index ea00a92..afdf43b 100644
--- a/trusty/keymaster/legacy/trusty_keymaster_device.cpp
+++ b/trusty/keymaster/legacy/trusty_keymaster_device.cpp
@@ -122,10 +122,10 @@
 void AddClientAndAppData(const keymaster_blob_t* client_id, const keymaster_blob_t* app_data,
                          RequestType* request) {
     request->additional_params.Clear();
-    if (client_id) {
+    if (client_id && client_id->data_length > 0) {
         request->additional_params.push_back(TAG_APPLICATION_ID, *client_id);
     }
-    if (app_data) {
+    if (app_data && app_data->data_length > 0) {
         request->additional_params.push_back(TAG_APPLICATION_DATA, *app_data);
     }
 }