Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrf fromlist] boot_serial: Support sha256, sha384 and sha512 #376

Merged
merged 1 commit into from
Nov 13, 2024
+18 −7
Merged

[nrf fromlist] boot_serial: Support sha256, sha384 and sha512 #376

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions boot/boot_serial/src/boot_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,17 @@ BOOT_LOG_MODULE_DECLARE(mcuboot);
#define ARRAY_SIZE ZCBOR_ARRAY_SIZE
#endif

#if defined(MCUBOOT_SHA512)
#define IMAGE_HASH_SIZE (64)
#define IMAGE_SHA_TLV IMAGE_TLV_SHA512
#elif defined(MCUBOOT_SIGN_EC384)
#define IMAGE_HASH_SIZE (48)
#define IMAGE_SHA_TLV IMAGE_TLV_SHA384
#else
#define IMAGE_HASH_SIZE (32)
#define IMAGE_SHA_TLV IMAGE_TLV_SHA256
#endif

#ifndef MCUBOOT_SERIAL_MAX_RECEIVE_SIZE
#define MCUBOOT_SERIAL_MAX_RECEIVE_SIZE 512
#endif
Expand All @@ -91,7 +102,7 @@ BOOT_LOG_MODULE_DECLARE(mcuboot);
#define BOOT_SERIAL_IMAGE_STATE_SIZE_MAX 0
#endif
#ifdef MCUBOOT_SERIAL_IMG_GRP_HASH
#define BOOT_SERIAL_HASH_SIZE_MAX 36
#define BOOT_SERIAL_HASH_SIZE_MAX (IMAGE_HASH_SIZE + 4)
#else
#define BOOT_SERIAL_HASH_SIZE_MAX 0
#endif
Expand Down Expand Up @@ -263,7 +274,7 @@ bs_list(char *buf, int len)
const struct flash_area *fap;
uint8_t image_index;
#ifdef MCUBOOT_SERIAL_IMG_GRP_HASH
uint8_t hash[32];
uint8_t hash[IMAGE_HASH_SIZE];
#endif

zcbor_map_start_encode(cbor_state, 1);
Expand Down Expand Up @@ -336,7 +347,7 @@ bs_list(char *buf, int len)
}

#ifdef MCUBOOT_SERIAL_IMG_GRP_HASH
/* Retrieve SHA256 hash of image for identification */
/* Retrieve hash of image for identification */
rc = boot_serial_get_hash(&hdr, fap, hash);
#endif

Expand Down Expand Up @@ -440,7 +451,7 @@ bs_set(char *buf, int len)
*/
uint8_t image_index = 0;
size_t decoded = 0;
uint8_t hash[32];
uint8_t hash[IMAGE_HASH_SIZE];
bool confirm;
struct zcbor_string img_hash;
bool ok;
Expand Down Expand Up @@ -523,7 +534,7 @@ bs_set(char *buf, int len)
}
}

/* Retrieve SHA256 hash of image for identification */
/* Retrieve hash of image for identification */
rc = boot_serial_get_hash(&hdr, fap, hash);
flash_area_close(fap);

Expand Down Expand Up @@ -1467,9 +1478,9 @@ static int boot_serial_get_hash(const struct image_header *hdr,
break;
}

if (type == IMAGE_TLV_SHA256) {
if (type == IMAGE_SHA_TLV) {
/* Get the image's hash value from the manifest section. */
if (len != 32) {
if (len != IMAGE_HASH_SIZE) {
return -1;
}

Expand Down
Loading