aboutsummaryrefslogtreecommitdiffstats
path: root/stubdom
diff options
context:
space:
mode:
Diffstat (limited to 'stubdom')
-rw-r--r--stubdom/vtpm/Makefile2
-rw-r--r--stubdom/vtpmmgr/Makefile2
-rw-r--r--stubdom/vtpmmgr/vtpm_storage.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/stubdom/vtpm/Makefile b/stubdom/vtpm/Makefile
index 686c0eab84..30f7a1ab2e 100644
--- a/stubdom/vtpm/Makefile
+++ b/stubdom/vtpm/Makefile
@@ -12,7 +12,7 @@
XEN_ROOT=../..
PSSL_DIR=../polarssl-$(XEN_TARGET_ARCH)/library
-PSSL_OBJS=aes.o sha1.o entropy.o ctr_drbg.o sha4.o
+PSSL_OBJS=aes.o sha1.o entropy.o ctr_drbg.o sha4.o padlock.o
TARGET=vtpm.a
OBJS=vtpm.o vtpm_cmd.o vtpmblk.o vtpm_pcrs.o
diff --git a/stubdom/vtpmmgr/Makefile b/stubdom/vtpmmgr/Makefile
index 88c83c3c63..e41c261099 100644
--- a/stubdom/vtpmmgr/Makefile
+++ b/stubdom/vtpmmgr/Makefile
@@ -12,7 +12,7 @@
XEN_ROOT=../..
PSSL_DIR=../polarssl-$(XEN_TARGET_ARCH)/library
-PSSL_OBJS=aes.o sha1.o entropy.o ctr_drbg.o bignum.o sha4.o havege.o timing.o entropy_poll.o
+PSSL_OBJS=aes.o sha1.o entropy.o ctr_drbg.o bignum.o sha4.o havege.o timing.o entropy_poll.o padlock.o
TARGET=vtpmmgr.a
OBJS=vtpmmgr.o vtpm_cmd_handler.o vtpm_storage.o init.o tpmrsa.o tpm.o log.o
diff --git a/stubdom/vtpmmgr/vtpm_storage.c b/stubdom/vtpmmgr/vtpm_storage.c
index abb0dba297..de21b4ac94 100644
--- a/stubdom/vtpmmgr/vtpm_storage.c
+++ b/stubdom/vtpmmgr/vtpm_storage.c
@@ -655,7 +655,7 @@ TPM_RESULT vtpm_storage_load_header(void)
/* Validate the length of the output buffer */
if(datalen < AES_KEY_SIZE + sizeof(UINT32)) {
- vtpmlogerror(VTPM_LOG_VTPM, "Unbound AES key size (%d) was too small! expected (%ld)\n", datalen, AES_KEY_SIZE + sizeof(UINT32));
+ vtpmlogerror(VTPM_LOG_VTPM, "Unbound AES key size (%d) was too small! expected (%zu)\n", datalen, AES_KEY_SIZE + sizeof(UINT32));
status = TPM_IOERROR;
goto abort_egress;
}