diff options
| author | ChromeOS Developer <bohr@chromium.org> | 2015-07-10 10:12:43 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-07-27 21:39:29 +0000 |
| commit | e85c65bf85bc6251895cdfe6bb6213d125cc2366 (patch) | |
| tree | a9c83cabfebb094cdf898fccb8dc4955e9ad4f65 /InternalRoutines.h | |
| parent | 4152d0da7bebd2ff77d2b093252f1389edb48091 (diff) | |
| download | tpm2-e85c65bf85bc6251895cdfe6bb6213d125cc2366.tar.gz | |
Changes to allow for libtpm2 compilation with marshaling code.
- New files tpm_generated.c and tpm_generated.h files add
functions to marshal and unmarshal TPM structures.
- New file marshal_test.c contains unit tests for
tpm_generated.c.
- Added missing types to TPM_Types.h and renamed structure
fields to match the spec.
- Made changes to scraped *.c files to match renaming changes
made to TPM_Types.h.
- Added tpm_generated.c to Makefile.
TEST=$ sudo emerge tpm2
builds libtpm2 with tpm_generated.c
$ gcc marshal_test.c -ltpm2 -lssl -lcrypto marshal-test
builds test exutable
$ ./marshal-test
passes all test cases
BUG=chromium:501639
Change-Id: Iea20a9d77f236bb5aee55a8b86dc39b58e340912
Reviewed-on: https://chromium-review.googlesource.com/282042
Reviewed-by: Utkarsh Sanghi <usanghi@chromium.org>
Commit-Queue: Jocelyn Bohr <bohr@chromium.org>
Tested-by: Jocelyn Bohr <bohr@chromium.org>
Diffstat (limited to 'InternalRoutines.h')
| -rw-r--r-- | InternalRoutines.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/InternalRoutines.h b/InternalRoutines.h index fe8c5f4..cbef44d 100644 --- a/InternalRoutines.h +++ b/InternalRoutines.h @@ -31,41 +31,41 @@ // // DRTM functions // -#include "_TPM_Hash_Start_fp.h" #include "_TPM_Hash_Data_fp.h" #include "_TPM_Hash_End_fp.h" +#include "_TPM_Hash_Start_fp.h" // // Internal subsystem functions // -#include "Object_fp.h" +#include "DA_fp.h" #include "Entity_fp.h" -#include "Session_fp.h" #include "Hierarchy_fp.h" #include "NV_fp.h" +#include "Object_fp.h" #include "PCR_fp.h" -#include "DA_fp.h" +#include "Session_fp.h" #include "TpmFail_fp.h" // // Internal support functions // +#include "AlgorithmCap_fp.h" +#include "Bits_fp.h" +#include "CommandAudit_fp.h" #include "CommandCodeAttributes_fp.h" -#include "MemoryLib_fp.h" -#include "marshal_fp.h" -#include "Time_fp.h" +#include "Commands_fp.h" +#include "Handle_fp.h" #include "Locality_fp.h" -#include "PP_fp.h" -#include "CommandAudit_fp.h" #include "Manufacture_fp.h" +#include "MemoryLib_fp.h" #include "Power_fp.h" -#include "Handle_fp.h" -#include "Commands_fp.h" -#include "AlgorithmCap_fp.h" #include "PropertyCap_fp.h" -#include "Bits_fp.h" +#include "PP_fp.h" +#include "Time_fp.h" +#include "tpm_generated.h" // // Internal crypto functions // -#include "Ticket_fp.h" -#include "CryptUtil_fp.h" #include "CryptSelfTest_fp.h" +#include "CryptUtil_fp.h" +#include "Ticket_fp.h" #endif |