Trusty keymaster AOSP rebase

ipc/keymaster_ipc.cpp

@@ -29,6 +29,8 @@
 
 #include "trusty_keymaster.h"
 #include "trusty_logger.h"
+#include <trusty_std.h>
+#include <trusty_uuid.h>
 
 using namespace keymaster;
 
@@ -505,6 +507,11 @@ static long keymaster_dispatch_non_secure(keymaster_chan_ctx* ctx,
         return do_dispatch(&TrustyKeymaster::SetBootParams, msg, payload_size,
                            out, out_size);
 
+    case KM_PROVISION_KEYBOX:
+        LOG_D("Dispatching KM_PROVISION_KEYBOX, size %d", payload_size);
+        return do_dispatch(&TrustyKeymaster::ProvisionAttesationKeybox, msg, payload_size,
+                           out, out_size);
+
     case KM_SET_ATTESTATION_KEY:
         LOG_D("Dispatching SET_ATTESTION_KEY, size %d", payload_size);
         return do_dispatch(&TrustyKeymaster::SetAttestationKey, msg,

ipc/keymaster_ipc.h

@@ -54,6 +54,7 @@ enum keymaster_command {
 
     // Bootloader calls.
     KM_SET_BOOT_PARAMS = (0x1000 << KEYMASTER_REQ_SHIFT),
+    KM_PROVISION_KEYBOX = (0x1001 << KEYMASTER_REQ_SHIFT),
     KM_SET_ATTESTATION_KEY = (0x2000 << KEYMASTER_REQ_SHIFT),
     KM_APPEND_ATTESTATION_CERT_CHAIN = (0x3000 << KEYMASTER_REQ_SHIFT),
     KM_ATAP_GET_CA_REQUEST = (0x4000 << KEYMASTER_REQ_SHIFT),

ipc/rules.mk

@@ -17,6 +17,6 @@ CUR_DIR := $(GET_LOCAL_DIR)
 
 MODULE_SRCS += $(CUR_DIR)/keymaster_ipc.cpp
 
-MODULE_DEPS += trusty/user/base/interface/keymaster
+MODULE_DEPS += interface/keymaster
 
 CUR_DIR =