From 94273094f6607923f7e52b16717325f6ed7d9d46 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 16 Apr 2017 01:20:43 +0200 Subject: tools: side channel resistant base64 --- src/tools/pubkey.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/tools/pubkey.c') diff --git a/src/tools/pubkey.c b/src/tools/pubkey.c index f567223..009cd15 100644 --- a/src/tools/pubkey.c +++ b/src/tools/pubkey.c @@ -1,7 +1,6 @@ /* Copyright (C) 2015-2017 Jason A. Donenfeld . All Rights Reserved. */ #include -#include #include #include @@ -11,8 +10,8 @@ int pubkey_main(int argc, char *argv[]) { - unsigned char private_key[CURVE25519_POINT_SIZE + 1] = { 0 }, public_key[CURVE25519_POINT_SIZE] = { 0 }; - char private_key_base64[b64_len(CURVE25519_POINT_SIZE)] = { 0 }, public_key_base64[b64_len(CURVE25519_POINT_SIZE)] = { 0 }; + uint8_t key[WG_KEY_LEN]; + char base64[WG_KEY_LEN_BASE64]; int trailing_char; if (argc != 1) { @@ -20,11 +19,12 @@ int pubkey_main(int argc, char *argv[]) return 1; } - if (fread(private_key_base64, 1, sizeof(private_key_base64) - 1, stdin) != sizeof(private_key_base64) - 1) { + if (fread(base64, 1, sizeof(base64) - 1, stdin) != sizeof(base64) - 1) { errno = EINVAL; fprintf(stderr, "%s: Key is not the correct length or format\n", PROG_NAME); return 1; } + base64[WG_KEY_LEN_BASE64 - 1] = '\0'; for (;;) { trailing_char = getc(stdin); @@ -36,15 +36,12 @@ int pubkey_main(int argc, char *argv[]) return 1; } - if (b64_pton(private_key_base64, private_key, sizeof(private_key)) != sizeof(private_key) - 1) { + if (!key_from_base64(key, base64)) { fprintf(stderr, "%s: Key is not the correct length or format\n", PROG_NAME); return 1; } - curve25519_generate_public(public_key, private_key); - if (b64_ntop(public_key, sizeof(public_key), public_key_base64, sizeof(public_key_base64)) != sizeof(public_key_base64) - 1) { - fprintf(stderr, "%s: Could not convert key to base64\n", PROG_NAME); - return 1; - } - puts(public_key_base64); + curve25519_generate_public(key, key); + key_to_base64(base64, key); + puts(base64); return 0; } -- cgit v1.2.3-59-g8ed1b