From 23b958af057a5eefbe553c2c03aad9deacabdc02 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Mon, 7 Dec 2015 19:14:30 -0500 Subject: [PATCH] Move TPM1.2 code to src/tpm12 directory Move all TPM1.2 code to src/tpm12 directory. Adapt the Makefile.am to point to tpm12 directory for the TPM1.2 sources. Signed-off-by: Stefan Berger --- configure.ac | 2 +- src/Makefile.am | 233 +++++++++++++++------------- src/{ => tpm12}/tpm_admin.c | 0 src/{ => tpm12}/tpm_admin.h | 0 src/{ => tpm12}/tpm_audit.c | 0 src/{ => tpm12}/tpm_audit.h | 0 src/{ => tpm12}/tpm_auth.c | 0 src/{ => tpm12}/tpm_auth.h | 0 src/{ => tpm12}/tpm_commands.h | 0 src/{ => tpm12}/tpm_constants.h | 0 src/{ => tpm12}/tpm_counter.c | 0 src/{ => tpm12}/tpm_counter.h | 0 src/{ => tpm12}/tpm_crypto.c | 0 src/{ => tpm12}/tpm_crypto.h | 0 src/{ => tpm12}/tpm_crypto_freebl.c | 0 src/{ => tpm12}/tpm_cryptoh.c | 0 src/{ => tpm12}/tpm_cryptoh.h | 0 src/{ => tpm12}/tpm_daa.c | 0 src/{ => tpm12}/tpm_daa.h | 0 src/{ => tpm12}/tpm_debug.c | 0 src/{ => tpm12}/tpm_debug.h | 0 src/{ => tpm12}/tpm_delegate.c | 0 src/{ => tpm12}/tpm_delegate.h | 0 src/{ => tpm12}/tpm_digest.c | 0 src/{ => tpm12}/tpm_digest.h | 0 src/{ => tpm12}/tpm_error.c | 0 src/{ => tpm12}/tpm_global.c | 0 src/{ => tpm12}/tpm_global.h | 0 src/{ => tpm12}/tpm_identity.c | 0 src/{ => tpm12}/tpm_identity.h | 0 src/{ => tpm12}/tpm_init.c | 0 src/{ => tpm12}/tpm_init.h | 0 src/{ => tpm12}/tpm_io.h | 0 src/{ => tpm12}/tpm_key.c | 0 src/{ => tpm12}/tpm_key.h | 0 src/{ => tpm12}/tpm_libtpms_io.c | 0 src/{ => tpm12}/tpm_load.c | 0 src/{ => tpm12}/tpm_load.h | 0 src/{ => tpm12}/tpm_maint.c | 0 src/{ => tpm12}/tpm_maint.h | 0 src/{ => tpm12}/tpm_memory.c | 0 src/{ => tpm12}/tpm_migration.c | 0 src/{ => tpm12}/tpm_migration.h | 0 src/{ => tpm12}/tpm_nonce.c | 0 src/{ => tpm12}/tpm_nonce.h | 0 src/{ => tpm12}/tpm_nvfile.c | 0 src/{ => tpm12}/tpm_nvfile.h | 0 src/{ => tpm12}/tpm_nvram.c | 0 src/{ => tpm12}/tpm_nvram.h | 0 src/{ => tpm12}/tpm_nvram_const.h | 0 src/{ => tpm12}/tpm_owner.c | 0 src/{ => tpm12}/tpm_owner.h | 0 src/{ => tpm12}/tpm_pcr.c | 0 src/{ => tpm12}/tpm_pcr.h | 0 src/{ => tpm12}/tpm_permanent.c | 0 src/{ => tpm12}/tpm_permanent.h | 0 src/{ => tpm12}/tpm_platform.c | 0 src/{ => tpm12}/tpm_platform.h | 0 src/{ => tpm12}/tpm_process.c | 0 src/{ => tpm12}/tpm_process.h | 0 src/{ => tpm12}/tpm_secret.c | 0 src/{ => tpm12}/tpm_secret.h | 0 src/{ => tpm12}/tpm_session.c | 0 src/{ => tpm12}/tpm_session.h | 0 src/{ => tpm12}/tpm_sizedbuffer.c | 0 src/{ => tpm12}/tpm_sizedbuffer.h | 0 src/{ => tpm12}/tpm_startup.c | 0 src/{ => tpm12}/tpm_startup.h | 0 src/{ => tpm12}/tpm_storage.c | 0 src/{ => tpm12}/tpm_storage.h | 0 src/{ => tpm12}/tpm_store.c | 0 src/{ => tpm12}/tpm_store.h | 0 src/{ => tpm12}/tpm_structures.h | 0 src/{ => tpm12}/tpm_svnrevision.c | 0 src/{ => tpm12}/tpm_svnrevision.h | 0 src/{ => tpm12}/tpm_ticks.c | 0 src/{ => tpm12}/tpm_ticks.h | 0 src/{ => tpm12}/tpm_time.c | 0 src/{ => tpm12}/tpm_time.h | 0 src/{ => tpm12}/tpm_tis.c | 0 src/{ => tpm12}/tpm_transport.c | 0 src/{ => tpm12}/tpm_transport.h | 0 src/{ => tpm12}/tpm_ver.c | 0 src/{ => tpm12}/tpm_ver.h | 0 src/tpm_library.c | 10 +- 85 files changed, 132 insertions(+), 113 deletions(-) rename src/{ => tpm12}/tpm_admin.c (100%) rename src/{ => tpm12}/tpm_admin.h (100%) rename src/{ => tpm12}/tpm_audit.c (100%) rename src/{ => tpm12}/tpm_audit.h (100%) rename src/{ => tpm12}/tpm_auth.c (100%) rename src/{ => tpm12}/tpm_auth.h (100%) rename src/{ => tpm12}/tpm_commands.h (100%) rename src/{ => tpm12}/tpm_constants.h (100%) rename src/{ => tpm12}/tpm_counter.c (100%) rename src/{ => tpm12}/tpm_counter.h (100%) rename src/{ => tpm12}/tpm_crypto.c (100%) rename src/{ => tpm12}/tpm_crypto.h (100%) rename src/{ => tpm12}/tpm_crypto_freebl.c (100%) rename src/{ => tpm12}/tpm_cryptoh.c (100%) rename src/{ => tpm12}/tpm_cryptoh.h (100%) rename src/{ => tpm12}/tpm_daa.c (100%) rename src/{ => tpm12}/tpm_daa.h (100%) rename src/{ => tpm12}/tpm_debug.c (100%) rename src/{ => tpm12}/tpm_debug.h (100%) rename src/{ => tpm12}/tpm_delegate.c (100%) rename src/{ => tpm12}/tpm_delegate.h (100%) rename src/{ => tpm12}/tpm_digest.c (100%) rename src/{ => tpm12}/tpm_digest.h (100%) rename src/{ => tpm12}/tpm_error.c (100%) rename src/{ => tpm12}/tpm_global.c (100%) rename src/{ => tpm12}/tpm_global.h (100%) rename src/{ => tpm12}/tpm_identity.c (100%) rename src/{ => tpm12}/tpm_identity.h (100%) rename src/{ => tpm12}/tpm_init.c (100%) rename src/{ => tpm12}/tpm_init.h (100%) rename src/{ => tpm12}/tpm_io.h (100%) rename src/{ => tpm12}/tpm_key.c (100%) rename src/{ => tpm12}/tpm_key.h (100%) rename src/{ => tpm12}/tpm_libtpms_io.c (100%) rename src/{ => tpm12}/tpm_load.c (100%) rename src/{ => tpm12}/tpm_load.h (100%) rename src/{ => tpm12}/tpm_maint.c (100%) rename src/{ => tpm12}/tpm_maint.h (100%) rename src/{ => tpm12}/tpm_memory.c (100%) rename src/{ => tpm12}/tpm_migration.c (100%) rename src/{ => tpm12}/tpm_migration.h (100%) rename src/{ => tpm12}/tpm_nonce.c (100%) rename src/{ => tpm12}/tpm_nonce.h (100%) rename src/{ => tpm12}/tpm_nvfile.c (100%) rename src/{ => tpm12}/tpm_nvfile.h (100%) rename src/{ => tpm12}/tpm_nvram.c (100%) rename src/{ => tpm12}/tpm_nvram.h (100%) rename src/{ => tpm12}/tpm_nvram_const.h (100%) rename src/{ => tpm12}/tpm_owner.c (100%) rename src/{ => tpm12}/tpm_owner.h (100%) rename src/{ => tpm12}/tpm_pcr.c (100%) rename src/{ => tpm12}/tpm_pcr.h (100%) rename src/{ => tpm12}/tpm_permanent.c (100%) rename src/{ => tpm12}/tpm_permanent.h (100%) rename src/{ => tpm12}/tpm_platform.c (100%) rename src/{ => tpm12}/tpm_platform.h (100%) rename src/{ => tpm12}/tpm_process.c (100%) rename src/{ => tpm12}/tpm_process.h (100%) rename src/{ => tpm12}/tpm_secret.c (100%) rename src/{ => tpm12}/tpm_secret.h (100%) rename src/{ => tpm12}/tpm_session.c (100%) rename src/{ => tpm12}/tpm_session.h (100%) rename src/{ => tpm12}/tpm_sizedbuffer.c (100%) rename src/{ => tpm12}/tpm_sizedbuffer.h (100%) rename src/{ => tpm12}/tpm_startup.c (100%) rename src/{ => tpm12}/tpm_startup.h (100%) rename src/{ => tpm12}/tpm_storage.c (100%) rename src/{ => tpm12}/tpm_storage.h (100%) rename src/{ => tpm12}/tpm_store.c (100%) rename src/{ => tpm12}/tpm_store.h (100%) rename src/{ => tpm12}/tpm_structures.h (100%) rename src/{ => tpm12}/tpm_svnrevision.c (100%) rename src/{ => tpm12}/tpm_svnrevision.h (100%) rename src/{ => tpm12}/tpm_ticks.c (100%) rename src/{ => tpm12}/tpm_ticks.h (100%) rename src/{ => tpm12}/tpm_time.c (100%) rename src/{ => tpm12}/tpm_time.h (100%) rename src/{ => tpm12}/tpm_tis.c (100%) rename src/{ => tpm12}/tpm_transport.c (100%) rename src/{ => tpm12}/tpm_transport.h (100%) rename src/{ => tpm12}/tpm_ver.c (100%) rename src/{ => tpm12}/tpm_ver.h (100%) diff --git a/configure.ac b/configure.ac index df4fd74e..8a7e9e69 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AM_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([foreign 1.6]) +AM_INIT_AUTOMAKE([foreign 1.6 subdir-objects]) LIBTPMS_VER_MAJOR=`echo $PACKAGE_VERSION | awk -F. '{print $1}'` LIBTPMS_VER_MINOR=`echo $PACKAGE_VERSION | awk -F. '{print $2}'` diff --git a/src/Makefile.am b/src/Makefile.am index 9459e09f..c89b612a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,149 +6,168 @@ lib_LTLIBRARIES=libtpms.la -libtpms_la_LIBADD= +# +# TPM1.2 +# -libtpms_la_LDFLAGS = -Wl,--version-script=./libtpms.syms \ - -version-info $(LIBTPMS_VERSION_INFO) \ - -no-undefined +noinst_LTLIBRARIES = libtpms_tpm12.la -libtpms_la_CFLAGS = -include tpm_library_conf.h -I$(top_srcdir)/include/libtpms \ - $(HARDENING_CFLAGS) +libtpms_la_LIBADD = libtpms_tpm12.la + +libtpms_tpm12_la_LIBADD = + +libtpms_tpm12_la_CFLAGS = -include tpm_library_conf.h \ + -I$(top_srcdir)/include/libtpms \ + $(HARDENING_CFLAGS) #Build 1.2 TPM -libtpms_la_CFLAGS += -DTPM_V12 +libtpms_tpm12_la_CFLAGS += -DTPM_V12 # build a PC Client TPM -libtpms_la_CFLAGS += -DTPM_PCCLIENT +libtpms_tpm12_la_CFLAGS += -DTPM_PCCLIENT # upon initialization have the TPM load the volatile state -libtpms_la_CFLAGS += -DTPM_VOLATILE_LOAD +libtpms_tpm12_la_CFLAGS += -DTPM_VOLATILE_LOAD # build the TPM enabled and activated -libtpms_la_CFLAGS += -DTPM_ENABLE_ACTIVATE +libtpms_tpm12_la_CFLAGS += -DTPM_ENABLE_ACTIVATE # build with AES support for symmetric crypto -libtpms_la_CFLAGS += -DTPM_AES +libtpms_tpm12_la_CFLAGS += -DTPM_AES # build with libtpms callback support -libtpms_la_CFLAGS += -DTPM_LIBTPMS_CALLBACKS +libtpms_tpm12_la_CFLAGS += -DTPM_LIBTPMS_CALLBACKS # let the default NVRAM write to disk -libtpms_la_CFLAGS += -DTPM_NV_DISK +libtpms_tpm12_la_CFLAGS += -DTPM_NV_DISK # build a POSIX type of TPM -libtpms_la_CFLAGS += -DTPM_POSIX +libtpms_tpm12_la_CFLAGS += -DTPM_POSIX -libtpms_la_CFLAGS += @DEBUG_DEFINES@ +libtpms_tpm12_la_CFLAGS += @DEBUG_DEFINES@ CRYPTO_OBJFILES = -libtpms_la_SOURCES = \ - tpm_admin.c \ - tpm_audit.c \ - tpm_auth.c \ - tpm_cryptoh.c \ - tpm_counter.c \ - tpm_daa.c \ - tpm_debug.c \ - tpm_delegate.c \ - tpm_digest.c \ - tpm_error.c \ - tpm_global.c \ - tpm_identity.c \ - tpm_init.c \ - tpm_libtpms_io.c \ - tpm_key.c \ - tpm_library.c \ - tpm_load.c \ - tpm_maint.c \ - tpm_memory.c \ - tpm_migration.c \ - tpm_nonce.c \ - tpm_nvfile.c \ - tpm_nvram.c \ - tpm_owner.c \ - tpm_pcr.c \ - tpm_permanent.c \ - tpm_platform.c \ - tpm_process.c \ - tpm_secret.c \ - tpm_session.c \ - tpm_sizedbuffer.c \ - tpm_startup.c \ - tpm_store.c \ - tpm_storage.c \ - tpm_ticks.c \ - tpm_time.c \ - tpm_tis.c \ - tpm_transport.c \ - tpm_ver.c \ - tpm_svnrevision.c +libtpms_tpm12_la_SOURCES = \ + tpm12/tpm_admin.c \ + tpm12/tpm_audit.c \ + tpm12/tpm_auth.c \ + tpm12/tpm_cryptoh.c \ + tpm12/tpm_counter.c \ + tpm12/tpm_daa.c \ + tpm12/tpm_debug.c \ + tpm12/tpm_delegate.c \ + tpm12/tpm_digest.c \ + tpm12/tpm_error.c \ + tpm12/tpm_global.c \ + tpm12/tpm_identity.c \ + tpm12/tpm_init.c \ + tpm12/tpm_libtpms_io.c \ + tpm12/tpm_key.c \ + tpm12/tpm_load.c \ + tpm12/tpm_maint.c \ + tpm12/tpm_memory.c \ + tpm12/tpm_migration.c \ + tpm12/tpm_nonce.c \ + tpm12/tpm_nvfile.c \ + tpm12/tpm_nvram.c \ + tpm12/tpm_owner.c \ + tpm12/tpm_pcr.c \ + tpm12/tpm_permanent.c \ + tpm12/tpm_platform.c \ + tpm12/tpm_process.c \ + tpm12/tpm_secret.c \ + tpm12/tpm_session.c \ + tpm12/tpm_sizedbuffer.c \ + tpm12/tpm_startup.c \ + tpm12/tpm_store.c \ + tpm12/tpm_storage.c \ + tpm12/tpm_ticks.c \ + tpm12/tpm_time.c \ + tpm12/tpm_tis.c \ + tpm12/tpm_transport.c \ + tpm12/tpm_ver.c \ + tpm12/tpm_svnrevision.c noinst_HEADERS = \ - tpm_admin.h \ - tpm_audit.h \ - tpm_auth.h \ - tpm_commands.h \ - tpm_constants.h \ - tpm_counter.h \ - tpm_crypto.h \ - tpm_cryptoh.h \ - tpm_daa.h \ - tpm_debug.h \ - tpm_delegate.h \ - tpm_digest.h \ - tpm_global.h \ - tpm_identity.h \ - tpm_init.h \ - tpm_io.h \ - tpm_key.h \ + tpm12/tpm_admin.h \ + tpm12/tpm_audit.h \ + tpm12/tpm_auth.h \ + tpm12/tpm_commands.h \ + tpm12/tpm_constants.h \ + tpm12/tpm_counter.h \ + tpm12/tpm_crypto.h \ + tpm12/tpm_cryptoh.h \ + tpm12/tpm_daa.h \ + tpm12/tpm_debug.h \ + tpm12/tpm_delegate.h \ + tpm12/tpm_digest.h \ + tpm12/tpm_global.h \ + tpm12/tpm_identity.h \ + tpm12/tpm_init.h \ + tpm12/tpm_io.h \ + tpm12/tpm_key.h \ tpm_library_conf.h \ tpm_library_intern.h \ - tpm_load.h \ - tpm_maint.h \ - tpm_migration.h \ - tpm_nonce.h \ - tpm_nvfile.h \ - tpm_nvram_const.h \ - tpm_nvram.h \ - tpm_owner.h \ - tpm_pcr.h \ - tpm_permanent.h \ - tpm_platform.h \ - tpm_process.h \ - tpm_secret.h \ - tpm_session.h \ - tpm_sizedbuffer.h \ - tpm_startup.h \ - tpm_storage.h \ - tpm_store.h \ - tpm_structures.h \ - tpm_svnrevision.h \ - tpm_ticks.h \ - tpm_time.h \ - tpm_transport.h \ - tpm_ver.h + tpm12/tpm_load.h \ + tpm12/tpm_maint.h \ + tpm12/tpm_migration.h \ + tpm12/tpm_nonce.h \ + tpm12/tpm_nvfile.h \ + tpm12/tpm_nvram_const.h \ + tpm12/tpm_nvram.h \ + tpm12/tpm_owner.h \ + tpm12/tpm_pcr.h \ + tpm12/tpm_permanent.h \ + tpm12/tpm_platform.h \ + tpm12/tpm_process.h \ + tpm12/tpm_secret.h \ + tpm12/tpm_session.h \ + tpm12/tpm_sizedbuffer.h \ + tpm12/tpm_startup.h \ + tpm12/tpm_storage.h \ + tpm12/tpm_store.h \ + tpm12/tpm_structures.h \ + tpm12/tpm_svnrevision.h \ + tpm12/tpm_ticks.h \ + tpm12/tpm_time.h \ + tpm12/tpm_transport.h \ + tpm12/tpm_ver.h if LIBTPMS_USE_FREEBL -libtpms_la_SOURCES += tpm_crypto_freebl.c -libtpms_la_LIBADD += -lfreebl -lgmp -lnspr4 -lnssutil3 -lnss3 +libtpms_tpm12_la_SOURCES += tpm12/tpm_crypto_freebl.c +libtpms_tpm12_la_LIBADD += -lfreebl -lgmp -lnspr4 -lnssutil3 -lnss3 #work-around broken freebl includes -libtpms_la_CFLAGS += $(shell [ ! -r /usr/include/nss3/alghmac.h ] && \ +libtpms_tpm12_la_CFLAGS += $(shell [ ! -r /usr/include/nss3/alghmac.h ] && \ touch alghmac.h && \ echo -I./) -# tpm_crypto_freebl.c: work around #include "blapi.h" : should be -libtpms_la_CFLAGS += $(shell nss-config --cflags) +# tpm12/tpm_crypto_freebl.c: work around #include "blapi.h" : should be +libtpms_tpm12_la_CFLAGS += $(shell nss-config --cflags) #including nss3/blapi.h requires a look into nspr4 dir -libtpms_la_CFLAGS += $(shell nspr-config --cflags) +libtpms_tpm12_la_CFLAGS += $(shell nspr-config --cflags) else if LIBTPMS_USE_OPENSSL -libtpms_la_SOURCES += tpm_crypto.c -libtpms_la_LIBADD += -lcrypto +libtpms_tpm12_la_SOURCES += tpm12/tpm_crypto.c +libtpms_tpm12_la_LIBADD += -lcrypto endif # LIBTPMS_USE_OPENSSL endif # LIBTPMS_USE_FREEBL +# +# Library API layer +# + +libtpms_la_SOURCES = \ + tpm_library.c + +libtpms_la_CFLAGS = \ + $(libtpms_tpm12_la_CFLAGS) + +libtpms_la_LDFLAGS = -Wl,--version-script=./libtpms.syms \ + -version-info $(LIBTPMS_VERSION_INFO) \ + -no-undefined + + LDFLAGS_ARCH = $(findstring -m32, $(CFLAGS)) LDFLAGS_ARCH += $(findstring -m64, $(CFLAGS)) LDFLAGS_ARCH += $(findstring -m32, $(LDFLAGS)) @@ -161,6 +180,6 @@ check-local: @$(CC) $(LDFLAGS_ARCH) -nostdlib -L./.libs -ltpms 2>/dev/null EXTRA_DIST = \ - tpm_crypto_freebl.c \ - tpm_crypto.c \ + tpm12/tpm_crypto_freebl.c \ + tpm12/tpm_crypto.c \ libtpms.syms diff --git a/src/tpm_admin.c b/src/tpm12/tpm_admin.c similarity index 100% rename from src/tpm_admin.c rename to src/tpm12/tpm_admin.c diff --git a/src/tpm_admin.h b/src/tpm12/tpm_admin.h similarity index 100% rename from src/tpm_admin.h rename to src/tpm12/tpm_admin.h diff --git a/src/tpm_audit.c b/src/tpm12/tpm_audit.c similarity index 100% rename from src/tpm_audit.c rename to src/tpm12/tpm_audit.c diff --git a/src/tpm_audit.h b/src/tpm12/tpm_audit.h similarity index 100% rename from src/tpm_audit.h rename to src/tpm12/tpm_audit.h diff --git a/src/tpm_auth.c b/src/tpm12/tpm_auth.c similarity index 100% rename from src/tpm_auth.c rename to src/tpm12/tpm_auth.c diff --git a/src/tpm_auth.h b/src/tpm12/tpm_auth.h similarity index 100% rename from src/tpm_auth.h rename to src/tpm12/tpm_auth.h diff --git a/src/tpm_commands.h b/src/tpm12/tpm_commands.h similarity index 100% rename from src/tpm_commands.h rename to src/tpm12/tpm_commands.h diff --git a/src/tpm_constants.h b/src/tpm12/tpm_constants.h similarity index 100% rename from src/tpm_constants.h rename to src/tpm12/tpm_constants.h diff --git a/src/tpm_counter.c b/src/tpm12/tpm_counter.c similarity index 100% rename from src/tpm_counter.c rename to src/tpm12/tpm_counter.c diff --git a/src/tpm_counter.h b/src/tpm12/tpm_counter.h similarity index 100% rename from src/tpm_counter.h rename to src/tpm12/tpm_counter.h diff --git a/src/tpm_crypto.c b/src/tpm12/tpm_crypto.c similarity index 100% rename from src/tpm_crypto.c rename to src/tpm12/tpm_crypto.c diff --git a/src/tpm_crypto.h b/src/tpm12/tpm_crypto.h similarity index 100% rename from src/tpm_crypto.h rename to src/tpm12/tpm_crypto.h diff --git a/src/tpm_crypto_freebl.c b/src/tpm12/tpm_crypto_freebl.c similarity index 100% rename from src/tpm_crypto_freebl.c rename to src/tpm12/tpm_crypto_freebl.c diff --git a/src/tpm_cryptoh.c b/src/tpm12/tpm_cryptoh.c similarity index 100% rename from src/tpm_cryptoh.c rename to src/tpm12/tpm_cryptoh.c diff --git a/src/tpm_cryptoh.h b/src/tpm12/tpm_cryptoh.h similarity index 100% rename from src/tpm_cryptoh.h rename to src/tpm12/tpm_cryptoh.h diff --git a/src/tpm_daa.c b/src/tpm12/tpm_daa.c similarity index 100% rename from src/tpm_daa.c rename to src/tpm12/tpm_daa.c diff --git a/src/tpm_daa.h b/src/tpm12/tpm_daa.h similarity index 100% rename from src/tpm_daa.h rename to src/tpm12/tpm_daa.h diff --git a/src/tpm_debug.c b/src/tpm12/tpm_debug.c similarity index 100% rename from src/tpm_debug.c rename to src/tpm12/tpm_debug.c diff --git a/src/tpm_debug.h b/src/tpm12/tpm_debug.h similarity index 100% rename from src/tpm_debug.h rename to src/tpm12/tpm_debug.h diff --git a/src/tpm_delegate.c b/src/tpm12/tpm_delegate.c similarity index 100% rename from src/tpm_delegate.c rename to src/tpm12/tpm_delegate.c diff --git a/src/tpm_delegate.h b/src/tpm12/tpm_delegate.h similarity index 100% rename from src/tpm_delegate.h rename to src/tpm12/tpm_delegate.h diff --git a/src/tpm_digest.c b/src/tpm12/tpm_digest.c similarity index 100% rename from src/tpm_digest.c rename to src/tpm12/tpm_digest.c diff --git a/src/tpm_digest.h b/src/tpm12/tpm_digest.h similarity index 100% rename from src/tpm_digest.h rename to src/tpm12/tpm_digest.h diff --git a/src/tpm_error.c b/src/tpm12/tpm_error.c similarity index 100% rename from src/tpm_error.c rename to src/tpm12/tpm_error.c diff --git a/src/tpm_global.c b/src/tpm12/tpm_global.c similarity index 100% rename from src/tpm_global.c rename to src/tpm12/tpm_global.c diff --git a/src/tpm_global.h b/src/tpm12/tpm_global.h similarity index 100% rename from src/tpm_global.h rename to src/tpm12/tpm_global.h diff --git a/src/tpm_identity.c b/src/tpm12/tpm_identity.c similarity index 100% rename from src/tpm_identity.c rename to src/tpm12/tpm_identity.c diff --git a/src/tpm_identity.h b/src/tpm12/tpm_identity.h similarity index 100% rename from src/tpm_identity.h rename to src/tpm12/tpm_identity.h diff --git a/src/tpm_init.c b/src/tpm12/tpm_init.c similarity index 100% rename from src/tpm_init.c rename to src/tpm12/tpm_init.c diff --git a/src/tpm_init.h b/src/tpm12/tpm_init.h similarity index 100% rename from src/tpm_init.h rename to src/tpm12/tpm_init.h diff --git a/src/tpm_io.h b/src/tpm12/tpm_io.h similarity index 100% rename from src/tpm_io.h rename to src/tpm12/tpm_io.h diff --git a/src/tpm_key.c b/src/tpm12/tpm_key.c similarity index 100% rename from src/tpm_key.c rename to src/tpm12/tpm_key.c diff --git a/src/tpm_key.h b/src/tpm12/tpm_key.h similarity index 100% rename from src/tpm_key.h rename to src/tpm12/tpm_key.h diff --git a/src/tpm_libtpms_io.c b/src/tpm12/tpm_libtpms_io.c similarity index 100% rename from src/tpm_libtpms_io.c rename to src/tpm12/tpm_libtpms_io.c diff --git a/src/tpm_load.c b/src/tpm12/tpm_load.c similarity index 100% rename from src/tpm_load.c rename to src/tpm12/tpm_load.c diff --git a/src/tpm_load.h b/src/tpm12/tpm_load.h similarity index 100% rename from src/tpm_load.h rename to src/tpm12/tpm_load.h diff --git a/src/tpm_maint.c b/src/tpm12/tpm_maint.c similarity index 100% rename from src/tpm_maint.c rename to src/tpm12/tpm_maint.c diff --git a/src/tpm_maint.h b/src/tpm12/tpm_maint.h similarity index 100% rename from src/tpm_maint.h rename to src/tpm12/tpm_maint.h diff --git a/src/tpm_memory.c b/src/tpm12/tpm_memory.c similarity index 100% rename from src/tpm_memory.c rename to src/tpm12/tpm_memory.c diff --git a/src/tpm_migration.c b/src/tpm12/tpm_migration.c similarity index 100% rename from src/tpm_migration.c rename to src/tpm12/tpm_migration.c diff --git a/src/tpm_migration.h b/src/tpm12/tpm_migration.h similarity index 100% rename from src/tpm_migration.h rename to src/tpm12/tpm_migration.h diff --git a/src/tpm_nonce.c b/src/tpm12/tpm_nonce.c similarity index 100% rename from src/tpm_nonce.c rename to src/tpm12/tpm_nonce.c diff --git a/src/tpm_nonce.h b/src/tpm12/tpm_nonce.h similarity index 100% rename from src/tpm_nonce.h rename to src/tpm12/tpm_nonce.h diff --git a/src/tpm_nvfile.c b/src/tpm12/tpm_nvfile.c similarity index 100% rename from src/tpm_nvfile.c rename to src/tpm12/tpm_nvfile.c diff --git a/src/tpm_nvfile.h b/src/tpm12/tpm_nvfile.h similarity index 100% rename from src/tpm_nvfile.h rename to src/tpm12/tpm_nvfile.h diff --git a/src/tpm_nvram.c b/src/tpm12/tpm_nvram.c similarity index 100% rename from src/tpm_nvram.c rename to src/tpm12/tpm_nvram.c diff --git a/src/tpm_nvram.h b/src/tpm12/tpm_nvram.h similarity index 100% rename from src/tpm_nvram.h rename to src/tpm12/tpm_nvram.h diff --git a/src/tpm_nvram_const.h b/src/tpm12/tpm_nvram_const.h similarity index 100% rename from src/tpm_nvram_const.h rename to src/tpm12/tpm_nvram_const.h diff --git a/src/tpm_owner.c b/src/tpm12/tpm_owner.c similarity index 100% rename from src/tpm_owner.c rename to src/tpm12/tpm_owner.c diff --git a/src/tpm_owner.h b/src/tpm12/tpm_owner.h similarity index 100% rename from src/tpm_owner.h rename to src/tpm12/tpm_owner.h diff --git a/src/tpm_pcr.c b/src/tpm12/tpm_pcr.c similarity index 100% rename from src/tpm_pcr.c rename to src/tpm12/tpm_pcr.c diff --git a/src/tpm_pcr.h b/src/tpm12/tpm_pcr.h similarity index 100% rename from src/tpm_pcr.h rename to src/tpm12/tpm_pcr.h diff --git a/src/tpm_permanent.c b/src/tpm12/tpm_permanent.c similarity index 100% rename from src/tpm_permanent.c rename to src/tpm12/tpm_permanent.c diff --git a/src/tpm_permanent.h b/src/tpm12/tpm_permanent.h similarity index 100% rename from src/tpm_permanent.h rename to src/tpm12/tpm_permanent.h diff --git a/src/tpm_platform.c b/src/tpm12/tpm_platform.c similarity index 100% rename from src/tpm_platform.c rename to src/tpm12/tpm_platform.c diff --git a/src/tpm_platform.h b/src/tpm12/tpm_platform.h similarity index 100% rename from src/tpm_platform.h rename to src/tpm12/tpm_platform.h diff --git a/src/tpm_process.c b/src/tpm12/tpm_process.c similarity index 100% rename from src/tpm_process.c rename to src/tpm12/tpm_process.c diff --git a/src/tpm_process.h b/src/tpm12/tpm_process.h similarity index 100% rename from src/tpm_process.h rename to src/tpm12/tpm_process.h diff --git a/src/tpm_secret.c b/src/tpm12/tpm_secret.c similarity index 100% rename from src/tpm_secret.c rename to src/tpm12/tpm_secret.c diff --git a/src/tpm_secret.h b/src/tpm12/tpm_secret.h similarity index 100% rename from src/tpm_secret.h rename to src/tpm12/tpm_secret.h diff --git a/src/tpm_session.c b/src/tpm12/tpm_session.c similarity index 100% rename from src/tpm_session.c rename to src/tpm12/tpm_session.c diff --git a/src/tpm_session.h b/src/tpm12/tpm_session.h similarity index 100% rename from src/tpm_session.h rename to src/tpm12/tpm_session.h diff --git a/src/tpm_sizedbuffer.c b/src/tpm12/tpm_sizedbuffer.c similarity index 100% rename from src/tpm_sizedbuffer.c rename to src/tpm12/tpm_sizedbuffer.c diff --git a/src/tpm_sizedbuffer.h b/src/tpm12/tpm_sizedbuffer.h similarity index 100% rename from src/tpm_sizedbuffer.h rename to src/tpm12/tpm_sizedbuffer.h diff --git a/src/tpm_startup.c b/src/tpm12/tpm_startup.c similarity index 100% rename from src/tpm_startup.c rename to src/tpm12/tpm_startup.c diff --git a/src/tpm_startup.h b/src/tpm12/tpm_startup.h similarity index 100% rename from src/tpm_startup.h rename to src/tpm12/tpm_startup.h diff --git a/src/tpm_storage.c b/src/tpm12/tpm_storage.c similarity index 100% rename from src/tpm_storage.c rename to src/tpm12/tpm_storage.c diff --git a/src/tpm_storage.h b/src/tpm12/tpm_storage.h similarity index 100% rename from src/tpm_storage.h rename to src/tpm12/tpm_storage.h diff --git a/src/tpm_store.c b/src/tpm12/tpm_store.c similarity index 100% rename from src/tpm_store.c rename to src/tpm12/tpm_store.c diff --git a/src/tpm_store.h b/src/tpm12/tpm_store.h similarity index 100% rename from src/tpm_store.h rename to src/tpm12/tpm_store.h diff --git a/src/tpm_structures.h b/src/tpm12/tpm_structures.h similarity index 100% rename from src/tpm_structures.h rename to src/tpm12/tpm_structures.h diff --git a/src/tpm_svnrevision.c b/src/tpm12/tpm_svnrevision.c similarity index 100% rename from src/tpm_svnrevision.c rename to src/tpm12/tpm_svnrevision.c diff --git a/src/tpm_svnrevision.h b/src/tpm12/tpm_svnrevision.h similarity index 100% rename from src/tpm_svnrevision.h rename to src/tpm12/tpm_svnrevision.h diff --git a/src/tpm_ticks.c b/src/tpm12/tpm_ticks.c similarity index 100% rename from src/tpm_ticks.c rename to src/tpm12/tpm_ticks.c diff --git a/src/tpm_ticks.h b/src/tpm12/tpm_ticks.h similarity index 100% rename from src/tpm_ticks.h rename to src/tpm12/tpm_ticks.h diff --git a/src/tpm_time.c b/src/tpm12/tpm_time.c similarity index 100% rename from src/tpm_time.c rename to src/tpm12/tpm_time.c diff --git a/src/tpm_time.h b/src/tpm12/tpm_time.h similarity index 100% rename from src/tpm_time.h rename to src/tpm12/tpm_time.h diff --git a/src/tpm_tis.c b/src/tpm12/tpm_tis.c similarity index 100% rename from src/tpm_tis.c rename to src/tpm12/tpm_tis.c diff --git a/src/tpm_transport.c b/src/tpm12/tpm_transport.c similarity index 100% rename from src/tpm_transport.c rename to src/tpm12/tpm_transport.c diff --git a/src/tpm_transport.h b/src/tpm12/tpm_transport.h similarity index 100% rename from src/tpm_transport.h rename to src/tpm12/tpm_transport.h diff --git a/src/tpm_ver.c b/src/tpm12/tpm_ver.c similarity index 100% rename from src/tpm_ver.c rename to src/tpm12/tpm_ver.c diff --git a/src/tpm_ver.h b/src/tpm12/tpm_ver.h similarity index 100% rename from src/tpm_ver.h rename to src/tpm12/tpm_ver.h diff --git a/src/tpm_library.c b/src/tpm_library.c index 0bd8595c..a115fa17 100644 --- a/src/tpm_library.c +++ b/src/tpm_library.c @@ -54,15 +54,15 @@ # include #endif -#include "tpm_debug.h" +#include "tpm12/tpm_debug.h" #include "tpm_error.h" -#include "tpm_init.h" +#include "tpm12/tpm_init.h" #include "tpm_library.h" #include "tpm_library_intern.h" -#include "tpm_key.h" +#include "tpm12/tpm_key.h" #include "tpm_memory.h" -#include "tpm_process.h" -#include "tpm_startup.h" +#include "tpm12/tpm_process.h" +#include "tpm12/tpm_startup.h" #define ROUNDUP(VAL, SIZE) \ ( ( (VAL) + (SIZE) - 1 ) / (SIZE) ) * (SIZE)