Re: [Xen-devel] [PATCH] vtpmmgr: fix build on 32-bit

["Fioravante, Matthew E." <Matthew.Fioravante@xxxxxxxxxx>]

Acked by: Matthew Fioravante <matthew.fioravante@xxxxxxxxxx>

> -----Original Message-----
> From: Ian Campbell [mailto:ian.campbell@xxxxxxxxxx]
> Sent: Monday, January 21, 2013 8:20 AM
> To: xen-devel@xxxxxxxxxxxxx
> Cc: Samuel Thibault; ian.jackson@xxxxxxxxxx; keir@xxxxxxx; Ian Campbell;
> Fioravante, Matthew E.
> Subject: [PATCH] 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>
> Cc: "Fioravante, Matthew E." <Matthew.Fioravante@xxxxxxxxxx>
> ---
>  stubdom/vtpmmgr/Makefile       |    2 +-
>  stubdom/vtpmmgr/vtpm_storage.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/stubdom/vtpmmgr/Makefile b/stubdom/vtpmmgr/Makefile index
> 88c83c3..e41c261 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 abb0dba..de21b4a 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;
>     }
> --
> 1.7.2.5


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel