From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: "Fioravante, Matthew E." <Matthew.Fioravante@jhuapl.edu>,
Samuel Thibault <samuel.thibault@ens-lyon.org>,
keir@xen.org, Ian Campbell <ian.campbell@citrix.com>,
ian.jackson@citrix.com
Subject: [PATCH] vtpmmgr: fix build on 32-bit
Date: Mon, 21 Jan 2013 13:19:43 +0000 [thread overview]
Message-ID: <1358774383-2695-1-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1358773989.3279.205.camel@zakaz.uk.xensource.com>
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>
Cc: "Fioravante, Matthew E." <Matthew.Fioravante@jhuapl.edu>
---
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
next prev parent reply other threads:[~2013-01-21 13:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-19 12:41 [xen-unstable test] 15136: regressions - FAIL xen.org
2013-01-19 12:52 ` Ian Campbell
2013-01-21 13:13 ` Ian Campbell
2013-01-21 13:19 ` Ian Campbell [this message]
2013-01-21 13:22 ` [PATCH] vtpmmgr: fix build on 32-bit Ian Campbell
2013-01-21 13:24 ` Samuel Thibault
2013-01-21 13:42 ` Ian Campbell
2013-01-21 14:33 ` Fioravante, Matthew E.
2013-01-21 14:51 ` Ian Campbell
2013-01-21 15:08 ` Fioravante, Matthew E.
2013-01-21 15:12 ` Ian Campbell
2013-01-21 15:14 ` Fioravante, Matthew E.
2013-01-21 16:16 ` Ian Campbell
2013-01-21 16:17 ` Fioravante, Matthew E.
2013-01-21 16:26 ` Ian Campbell
2013-01-21 18:27 ` Fioravante, Matthew E.
2013-01-24 13:07 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358774383-2695-1-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=Matthew.Fioravante@jhuapl.edu \
--cc=ian.jackson@citrix.com \
--cc=keir@xen.org \
--cc=samuel.thibault@ens-lyon.org \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).