aboutsummaryrefslogtreecommitdiff
path: root/Rewrap_fp.h
diff options
context:
space:
mode:
authorJocelyn Bohr <bohr@chromium.org>2015-07-30 10:44:16 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-08-10 20:09:27 +0000
commita4ed3aa64664a1241ea982d685db744caaae3ffa (patch)
tree72d1ff6899d2321ca8f53d9d6665e46c8b6f1196 /Rewrap_fp.h
parentd02d5b7076ec51d855c61a67897286b80ef436c2 (diff)
downloadtpm2-a4ed3aa64664a1241ea982d685db744caaae3ffa.tar.gz
Implementation files for command marshaling.
Generated C source and header files which add functions to unmarshal command requests, execute commands, and marshal command responses. This (tenatively) adds all final missing parts of libtpm2. These files are generated from command_generator.py in CL:290556. TEST=$ sudo emerge tpm2 builds libtpm2.a Locally I was able to call ExecCommand to execute TPM2_Startup with success after software TPM initialization. BUG=chromium:501639 CQ-DEPEND=CL:290556 Change-Id: Ieb3f208795a21a172dea25b35027c5aceba7ee08 Reviewed-on: https://chromium-review.googlesource.com/289813 Tested-by: Jocelyn Bohr <bohr@chromium.org> Reviewed-by: Darren Krahn <dkrahn@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Jocelyn Bohr <bohr@chromium.org>
Diffstat (limited to 'Rewrap_fp.h')
-rw-r--r--Rewrap_fp.h59
1 files changed, 45 insertions, 14 deletions
diff --git a/Rewrap_fp.h b/Rewrap_fp.h
index 7912010..5677d2e 100644
--- a/Rewrap_fp.h
+++ b/Rewrap_fp.h
@@ -1,18 +1,20 @@
-/*
- * Copyright 2015 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
+// Copyright 2015 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
-#ifndef __TPM2_REWRAP_FP_H_
-#define __TPM2_REWRAP_FP_H_
+// THIS CODE IS GENERATED - DO NOT MODIFY!
+
+#ifndef TPM2_REWRAP_FP_H
+#define TPM2_REWRAP_FP_H
+
+#include "tpm_generated.h"
typedef struct {
+ TPMI_DH_OBJECT oldParent;
+ TPMI_DH_OBJECT newParent;
TPM2B_PRIVATE inDuplicate;
- TPM_RH newParent;
- TPM_RH oldParent;
- TPM2B_ENCRYPTED_SECRET inSymSeed;
TPM2B_NAME name;
+ TPM2B_ENCRYPTED_SECRET inSymSeed;
} Rewrap_In;
typedef struct {
@@ -20,8 +22,37 @@ typedef struct {
TPM2B_ENCRYPTED_SECRET outSymSeed;
} Rewrap_Out;
-TPM_RC TPM2_Rewrap(Rewrap_In *in, // IN: input parameter list
- Rewrap_Out *out // OUT: output parameter list
- );
+// Executes Rewrap with request handles and parameters from
+// |in| and computes response handles and parameters to |out|.
+TPM_RC TPM2_Rewrap(Rewrap_In* in, Rewrap_Out* out);
+
+// Initializes handle fields in |target| from |req_handles|. Unmarshals
+// parameter fields in |target| from |buffer|.
+TPM_RC Rewrap_In_Unmarshal(Rewrap_In* target,
+ TPM_HANDLE req_handles[],
+ BYTE** buffer,
+ INT32* size);
+
+// Marshals response handles and parameters from |source| to |buffer|. Computes
+// and marshals the size of the parameter area (parameter_size) if |tag| ==
+// TPM_ST_SESSIONS. Returns size of (parameter area + handle area) in bytes.
+// Does not include parameter_size field.
+UINT16 Rewrap_Out_Marshal(Rewrap_Out* source,
+ TPMI_ST_COMMAND_TAG tag,
+ BYTE** buffer,
+ INT32* size);
+
+// Unmarshals any request parameters starting at |req_parameter_buffer|.
+// Executes command. Marshals any response handles and parameters to the
+// global response buffer and computes |*res_handle_buffer_size| and
+// |*res_parameter_buffer_size|. If |tag| == TPM_ST_SESSIONS, marshals
+// parameter_size indicating the size of the parameter area. parameter_size
+// field is located between the handle area and parameter area.
+TPM_RC Exec_Rewrap(TPMI_ST_COMMAND_TAG tag,
+ BYTE** req_parameter_buffer,
+ INT32* req_parameter_buffer_size,
+ TPM_HANDLE req_handles[],
+ UINT32* res_handle_buffer_size,
+ UINT32* res_parameter_buffer_size);
-#endif // __TPM2_REWRAP_FP_H_
+#endif // TPM2_REWRAP_FP_H