summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Sukhomlinov <sukhomlinov@google.com>2019-10-15 14:00:48 -0700
committerCommit Bot <commit-bot@chromium.org>2019-10-17 04:51:36 +0000
commit3db43fe342f4423cb450cb9fb14e69d1bc0a7b56 (patch)
treee7183285cc56e3b48f23abdb2a620698c8e3cc11
parentc654e71e4909f2913a12bf444fb83dcbf442043d (diff)
downloadchrome-ec-3db43fe342f4423cb450cb9fb14e69d1bc0a7b56.tar.gz
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 <sukhomlinov@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1863813 Tested-by: Andrey Pronin <apronin@chromium.org> Commit-Queue: Andrey Pronin <apronin@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-by: Andrey Pronin <apronin@chromium.org>
-rw-r--r--board/cr50/tpm2/aes.c3
-rw-r--r--chip/g/dcrypto/dcrypto_bn.c2
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));
}