WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #58 from wolfSSL/keytools-fix-pubkey-parser 

Keytools fix pubkey parser
pull/56/head^2
David Garske 2020-06-11 08:21:20 -07:00 committed by GitHub
parent f2ba779f71 e367cd17e0
commit d7639517a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/keytools/keygen.c
View File

@ -301,7 +301,7 @@ int main(int argc, char** argv)
fclose(f);
printf("** Warning: key file already exist! Are you sure you want to generate a new key and overwrite the existing key? [Type 'Yes, I am sure!']: ");
fflush(stdout);
gets(reply);
scanf("%s", reply);
printf("Reply is [%s]\n", reply);
if (strcmp(reply, "Yes, I am sure!") != 0) {
printf("Operation aborted by user.");

46
tools/keytools/sign.c
View File

@ -103,7 +103,7 @@ static void header_append_u16(uint8_t* header, uint32_t* idx, uint16_t tmp16)
memcpy(&header[*idx], &tmp16, sizeof(tmp16));
*idx += sizeof(tmp16);
}
static void header_append_tag(uint8_t* header, uint32_t* idx, uint16_t tag,
static void header_append_tag(uint8_t* header, uint32_t* idx, uint16_t tag,
uint16_t len, void* data)
{
header_append_u16(header, idx, tag);
@ -227,7 +227,7 @@ int main(int argc, char** argv)
if (tmpstr) {
*tmpstr = '\0'; /* null terminate at last "." */
}
snprintf(output_image_file, sizeof(output_image_file), "%s_v%s_%s.bin",
snprintf(output_image_file, sizeof(output_image_file), "%s_v%s_%s.bin",
(char*)buf, fw_version, sha_only ? "digest" : "signed");
printf("Update type: %s\n", self_update ? "wolfBoot" : "Firmware");
@ -256,14 +256,34 @@ int main(int argc, char** argv)
}
/* key type "auto" selection */
if (key_buffer_sz == 64) {
if (sign == SIGN_ECC256) {
printf("Error: key size does not match the cipher selected\n");
if (key_buffer_sz == 32) {
if ((sign != SIGN_ED25519) && !manual_sign && !sha_only ) {
printf("Error: key too short for cipher\n");
goto exit;
}
if (sign == SIGN_AUTO) {
if (sign == SIGN_AUTO && (manual_sign || sha_only)) {
printf("ed25519 public key autodetected\n");
sign = SIGN_ED25519;
printf("ed25519 key autodetected\n");
}
}
else if (key_buffer_sz == 64) {
if (sign == SIGN_ECC256) {
if (!manual_sign && !sha_only) {
printf("Error: key size does not match the cipher selected\n");
goto exit;
} else {
printf("ECC256 public key detected\n");
}
}
if (sign == SIGN_AUTO) {
if (!manual_sign && !sha_only) {
sign = SIGN_ED25519;
printf("ed25519 key autodetected\n");
} else {
sign = SIGN_ECC256;
printf("ecc256 public key autodetected\n");
}
}
}
else if (key_buffer_sz == 96) {
@ -298,7 +318,7 @@ int main(int argc, char** argv)
}
/* get header and signature sizes */
if (sign == SIGN_ED25519) {
if (sign == SIGN_ED25519) {
header_sz = 256;
signature_sz = 64;
}
@ -323,7 +343,7 @@ int main(int argc, char** argv)
if (!sha_only && !manual_sign) {
/* import (decode) private key for signing */
if (sign == SIGN_ED25519) {
#ifdef HAVE_ED25519
#ifdef HAVE_ED25519
ret = wc_ed25519_init(&key.ed);
if (ret == 0) {
pubkey = key_buffer + ED25519_KEY_SIZE;
@ -336,7 +356,7 @@ int main(int argc, char** argv)
#ifdef HAVE_ECC
ret = wc_ecc_init(&key.ecc);
if (ret == 0) {
ret = wc_ecc_import_unsigned(&key.ecc, &key_buffer[0], &key_buffer[32],
ret = wc_ecc_import_unsigned(&key.ecc, &key_buffer[0], &key_buffer[32],
&key_buffer[64], ECC_SECP256R1);
if (ret == 0) {
pubkey = key_buffer; /* first 64 bytes is public porition */
@ -405,7 +425,7 @@ int main(int argc, char** argv)
/* Append Version field */
fw_version32 = strtol(fw_version, NULL, 10);
header_append_tag(header, &header_idx, HDR_VERSION, HDR_VERSION_LEN,
header_append_tag(header, &header_idx, HDR_VERSION, HDR_VERSION_LEN,
&fw_version32);
/* Append Four pad bytes, so timestamp is aligned */
@ -413,14 +433,14 @@ int main(int argc, char** argv)
/* Append Timestamp field */
stat(image_file, &attrib);
header_append_tag(header, &header_idx, HDR_TIMESTAMP, HDR_TIMESTAMP_LEN,
header_append_tag(header, &header_idx, HDR_TIMESTAMP, HDR_TIMESTAMP_LEN,
&attrib.st_ctime);
/* Append Image type field */
image_type = (uint16_t)sign;
if (!self_update)
image_type |= HDR_IMG_TYPE_APP;
header_append_tag(header, &header_idx, HDR_IMG_TYPE, HDR_IMG_TYPE_LEN,
header_append_tag(header, &header_idx, HDR_IMG_TYPE, HDR_IMG_TYPE_LEN,
&image_type);
/* Six pad bytes, Sha-3 requires 8-byte alignment. */

24
tools/keytools/sign.py
View File

@ -135,13 +135,27 @@ else:
kf = open(key_file, "rb")
wolfboot_key_buffer = kf.read(4096)
wolfboot_key_buffer_len = len(wolfboot_key_buffer)
if wolfboot_key_buffer_len == 64:
if (sign == 'ecc256'):
print("Error: key size does not match the cipher selected")
if wolfboot_key_buffer_len == 32:
if (sign != 'ed25519' and not manual_sign and not sha_only):
print("Error: key too short for cipher")
sys.exit(1)
if sign == 'auto':
elif sign == 'auto' and (manual_sign or sha_only):
sign = 'ed25519'
print("'ed25519' key autodetected.")
print("'ed25519' public key autodetected.")
elif wolfboot_key_buffer_len == 64:
if (sign == 'ecc256'):
if not manual_sign and not sha_only:
print("Error: key size does not match the cipher selected")
sys.exit(1)
else:
print("Ecc256 public key detected")
if sign == 'auto':
if (manual_sign or sha_only):
sign = 'ecc256'
print("'ecc256' public key autodetected.")
else:
sign = 'ed25519'
print("'ed25519' key autodetected.")
elif wolfboot_key_buffer_len == 96:
if (sign == 'ed25519'):
print("Error: key size does not match the cipher selected")