diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-01-21 16:04:56 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-01-21 16:04:56 +0000 |
| commit | 18867baab7179673bf0715e895718c66d09fcd1d (patch) | |
| tree | e3a0056dec794bfad2fe99aac3fedd323e6d7b68 /stubdom | |
| parent | c60209d77e2c02de110ca0fdaa2582ef4e53d8fd (diff) | |
| download | xen-18867baab7179673bf0715e895718c66d09fcd1d.tar.gz xen-18867baab7179673bf0715e895718c66d09fcd1d.tar.bz2 xen-18867baab7179673bf0715e895718c66d09fcd1d.zip | |
vtpmmgr: fix build on 32-bit
Correct format string, fixing:
vtpm_storage.c: In function 'vtpm_storage_load_header': vtpm_storage.c:658: error: format '%ld' expects type 'long int', but argument 5 has type 'unsigned int'
vtpm_storage.c:658: error: format '%ld' expects type 'long int', but argument 5 has type 'unsigned int' make[2]: *** [vtpm_storage.o] Error 1
Add padlock.o to PSSL_OBJS, fixing:
/local/scratch/ianc/devel/xen-unstable.git/stubdom/mini-os-x86_32-vtpmmgr/mini-os.o: In function `aes_crypt_ecb': /local/scratch/ianc/devel/xen-unstable.git/stubdom/polarssl-x86_32/library/aes.c:659: undefined reference to `padlock_supports'
/local/scratch/ianc/devel/xen-unstable.git/stubdom/polarssl-x86_32/library/aes.c:661: undefined reference to `padlock_xcryptecb' /local/scratch/ianc/devel/xen-unstable.git/stubdom/mini-os-x86_32-vtpmmgr/mini-os.o: In function `aes_crypt_cbc': /local/scratch/ianc/devel/xen-unstable.git/stubdom/polarssl-x86_32/library/aes.c:771: undefined reference to `padlock_supports'
/local/scratch/ianc/devel/xen-unstable.git/stubdom/polarssl-x86_32/library/aes.c:773: undefined reference to `padlock_xcryptcbc'
make[1]: ***
[/local/scratch/ianc/devel/xen-unstable.git/stubdom/mini-os-x86_32-vtpmmgr/mini-os]
Error 1
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
[ ijc -- applied same fix to stubdom/vtpm/Makefile ]
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'stubdom')
| -rw-r--r-- | stubdom/vtpm/Makefile | 2 | ||||
| -rw-r--r-- | stubdom/vtpmmgr/Makefile | 2 | ||||
| -rw-r--r-- | stubdom/vtpmmgr/vtpm_storage.c | 2 |
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; } |