From 85a755a03eea1ac16301357e14c92b2f2aceee79 Mon Sep 17 00:00:00 2001 From: Michael Preisach Date: Mon, 13 Sep 2021 12:08:38 +0000 Subject: [PATCH] shorten nonce for debugging reasons --- common.h | 2 +- member-tpm-key.c | 4 ++-- member-tpm.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common.h b/common.h index 9d6ab36..5835792 100644 --- a/common.h +++ b/common.h @@ -20,7 +20,7 @@ /* #define MAX_MSGSIZE ((MAX_BUFSIZE - 1536) / 2) - MAX_CHKSUMSIZE //for bin to hex*/ /* #define MAX_MSGSIZE ((MAX_BUFSIZE - 1536) / 4 * 3) - MAX_CHKSUMSIZE //for base64 */ #define MAX_BSNSIZE 128 -#define NONCE_SIZE 384 +#define NONCE_SIZE 64 #define ISSUER_PUBLIC_KEY_FILE "ipk.bin" #define ISSUER_SECRET_KEY_FILE "isk.bin" diff --git a/member-tpm-key.c b/member-tpm-key.c index 5408119..bed5113 100644 --- a/member-tpm-key.c +++ b/member-tpm-key.c @@ -154,7 +154,7 @@ int save_public_key_info(const struct test_context *ctx, const char* pub_key_fil break; for (unsigned i=0; i < ctx->out_public.publicArea.unique.ecc.x.size; i++) { - if (fprintf(pub_key_file_ptr, "%c", ctx->out_public.publicArea.unique.ecc.x.buffer[i]) != 1) { + if (fprintf(pub_key_file_ptr, "%02X", ctx->out_public.publicArea.unique.ecc.x.buffer[i]) != 2) { write_ret = -1; break; } @@ -163,7 +163,7 @@ int save_public_key_info(const struct test_context *ctx, const char* pub_key_fil break; for (unsigned i=0; i < ctx->out_public.publicArea.unique.ecc.y.size; i++) { - if (fprintf(pub_key_file_ptr, "%c", ctx->out_public.publicArea.unique.ecc.y.buffer[i]) != 1) { + if (fprintf(pub_key_file_ptr, "%02X", ctx->out_public.publicArea.unique.ecc.y.buffer[i]) != 2) { write_ret = -1; break; } diff --git a/member-tpm.c b/member-tpm.c index d9e3752..9bc31c2 100644 --- a/member-tpm.c +++ b/member-tpm.c @@ -306,7 +306,7 @@ int member_joinappend(char *buffer) { bzero(buffer, MAX_BUFSIZE); if (0 != (ret = ecdaa_member_key_pair_TPM_FP256BN_generate(&member.mpk, member.pk_in, member.nonce, NONCE_SIZE, &member.ctx))) { fprintf(stderr, "Error generating member key-pair: ret = %d\n", ret); - strncpy(buffer, "ERR\n", 4); + strncpy(buffer, "ABORT\n", 6); return -1; } strncpy(buffer, "APPEND ", 7);