From 3db43fe342f4423cb450cb9fb14e69d1bc0a7b56 Mon Sep 17 00:00:00 2001 From: Vadim Sukhomlinov Date: Tue, 15 Oct 2019 14:00:48 -0700 Subject: cr50: Fix building with CRYPTO_TEST=1 1. Recent change https://crrev/1730605 introduced syntax error which is only affecting build with CRYPTO_TEST=1. This patch fixes it. 2. -Wformat which was turned on for /platform/ec caught another issue with CPRINTF() not receiving right number of parameters. BUG=none BRANCH=cr50 TEST=make BOARD=cr50 CRYPTO_TEST=1 Change-Id: Id5e61f7633d6e93aff761771c22b888aebd87265 Signed-off-by: Vadim Sukhomlinov Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1863813 Tested-by: Andrey Pronin Commit-Queue: Andrey Pronin Reviewed-by: Vadim Bendebury Reviewed-by: Andrey Pronin --- board/cr50/tpm2/aes.c | 3 +-- chip/g/dcrypto/dcrypto_bn.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/board/cr50/tpm2/aes.c b/board/cr50/tpm2/aes.c index 7223c71fc0..cc4d83d7e7 100644 --- a/board/cr50/tpm2/aes.c +++ b/board/cr50/tpm2/aes.c @@ -443,8 +443,7 @@ static void aes_command_handler(void *cmd_body, &ctx, out_local.b, sizeof(out_local.b), data_local.b, data_len); if (count < 0) { - CPRINTF( - "%s: gcm encrypt failed\n"); + CPRINTF("%s: gcm encrypt failed\n", __func__); break; } total = count; diff --git a/chip/g/dcrypto/dcrypto_bn.c b/chip/g/dcrypto/dcrypto_bn.c index ef90b47463..b8f8fef4f4 100644 --- a/chip/g/dcrypto/dcrypto_bn.c +++ b/chip/g/dcrypto/dcrypto_bn.c @@ -1485,7 +1485,7 @@ static int command_genp(int argc, char **argv) if (result == EC_SUCCESS) { ccprintf("prime: %ph (lsb first)\n", - HEX_BUF(prime_buf, sizeof(prime_buf)); + HEX_BUF(prime_buf, sizeof(prime_buf))); ccprintf("μs : %llu\n", (long long)(genp_end.val - genp_start.val)); } -- cgit v1.2.1