[Xen-changelog] [xen-unstable] vtpmmgr: fix build on 32-bit

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1358784296 0
# Node ID 0369fd99e9529bedcd72539575cd04a279765137
# Parent  b5212ea378292bb6564c215c733d81433a5b5083
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@xxxxxxxxxx>
Acked by: Matthew Fioravante <matthew.fioravante@xxxxxxxxxx>
[ ijc -- applied same fix to stubdom/vtpm/Makefile ]
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r b5212ea37829 -r 0369fd99e952 stubdom/vtpm/Makefile
--- a/stubdom/vtpm/Makefile     Mon Jan 21 12:40:31 2013 +0000
+++ b/stubdom/vtpm/Makefile     Mon Jan 21 16:04:56 2013 +0000
@@ -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 -r b5212ea37829 -r 0369fd99e952 stubdom/vtpmmgr/Makefile
--- a/stubdom/vtpmmgr/Makefile  Mon Jan 21 12:40:31 2013 +0000
+++ b/stubdom/vtpmmgr/Makefile  Mon Jan 21 16:04:56 2013 +0000
@@ -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 -r b5212ea37829 -r 0369fd99e952 stubdom/vtpmmgr/vtpm_storage.c
--- a/stubdom/vtpmmgr/vtpm_storage.c    Mon Jan 21 12:40:31 2013 +0000
+++ b/stubdom/vtpmmgr/vtpm_storage.c    Mon Jan 21 16:04:56 2013 +0000
@@ -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;
    }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog