commit b21f9f9e3f87f3c568886fed89ab2f57a874ca99
author Tadeusz Struk <tadeusz.struk@intel.com> Mon Oct 09 13:51:19 2017 -0700
committer Tadeusz Struk <tadeusz.struk@intel.com> Tue Oct 10 08:08:57 2017 -0700
tree 8b60028b81fa32b89bb19f351335d109dd799028
parent cd419acafca4522d17672b935201294624859208

libmu: convert names to comply with TCG spec

The function signatures and header file names have to be updated
to comply with TCG marshaling specification [1].

[1] https://trustedcomputinggroup.org/wp-content/uploads/TSS_Marshaling_v1.0_r03_Public-Review.pdf

Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>

tcti/tcti_socket.c

diff --git a/tcti/tcti_socket.c b/tcti/tcti_socket.c
index c186208..630905e 100644
--- a/tcti/tcti_socket.c
+++ b/tcti/tcti_socket.c
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 
 #include "sapi/tpm20.h"
-#include "sapi/marshal.h"
+#include "sapi/tss2_mu.h"
 #include "tcti/tcti_socket.h"
 #include "sysapi_util.h"
 #include "common/debug.h"
@@ -88,7 +88,7 @@
         sock = TCTI_CONTEXT_INTEL->otherSock;
     }
 
-    rval = UINT32_Marshal (TPM_SESSION_END, buffer, sizeof (buffer), NULL);
+    rval = Tss2_MU_UINT32_Marshal (TPM_SESSION_END, buffer, sizeof (buffer), NULL);
     if (rval == TSS2_RC_SUCCESS) {
         return rval;
     }
@@ -129,7 +129,7 @@
     {
         TCTI_LOG( tctiContext, rmPrefix, "" );
         offset = sizeof (TPM_ST) + sizeof (UINT32);
-        rval = TPM_CC_Unmarshal (command_buffer,
+        rval = Tss2_MU_TPM_CC_Unmarshal (command_buffer,
                                  command_size,
                                  &offset,
                                  &commandCode);
@@ -143,10 +143,10 @@
     // Size TPM 1.2 and TPM 2.0 headers overlap exactly, we can use
     // either 1.2 or 2.0 header to get the size.
     offset = sizeof (TPM_ST);
-    rval = UINT32_Unmarshal (command_buffer, command_size, &offset, &cnt);
+    rval = Tss2_MU_UINT32_Unmarshal (command_buffer, command_size, &offset, &cnt);
 
     // Send TPM_SEND_COMMAND
-    rval = UINT32_Marshal (MS_SIM_TPM_SEND_COMMAND,
+    rval = Tss2_MU_UINT32_Marshal (MS_SIM_TPM_SEND_COMMAND,
                            (uint8_t*)&tpmSendCommand,
                            sizeof (tpmSendCommand),
                            NULL);  // Value for "send command" to MS simulator.