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

Jump to bottom

bootutil: Add support for Ed25519 using SHA-512 with mbedTLS #2066

Merged
merged 2 commits into from
Oct 10, 2024
Merged

bootutil: Add support for Ed25519 using SHA-512 with mbedTLS #2066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
553af34
bootutil: Add SHA-512 support with mbedTLS
taltenbach Sep 6, 2024
e051c46
bootutil: Add SHA-512 support to Ed25519
taltenbach Sep 9, 2024
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
45 changes: 42 additions & 3 deletions boot/bootutil/include/bootutil/crypto/sha.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@

#elif defined(MCUBOOT_USE_MBED_TLS)

#ifdef MCUBOOT_SHA512
#include <mbedtls/sha512.h>
#else
#include <mbedtls/sha256.h>
#endif

#include <mbedtls/version.h>
#if MBEDTLS_VERSION_NUMBER >= 0x03000000
#include <mbedtls/compat-2.x.h>
Expand Down Expand Up @@ -123,31 +128,65 @@ static inline int bootutil_sha_finish(bootutil_sha_context *ctx,

#elif defined(MCUBOOT_USE_MBED_TLS)

#ifdef MCUBOOT_SHA512
typedef mbedtls_sha512_context bootutil_sha_context;
#else
typedef mbedtls_sha256_context bootutil_sha_context;
#endif

static inline int bootutil_sha_init(bootutil_sha_context *ctx)
{
int ret;

#ifdef MCUBOOT_SHA512
mbedtls_sha512_init(ctx);
ret = mbedtls_sha512_starts_ret(ctx, 0);
#else
mbedtls_sha256_init(ctx);
return mbedtls_sha256_starts_ret(ctx, 0);
ret = mbedtls_sha256_starts_ret(ctx, 0);
#endif

return ret;
}

static inline int bootutil_sha_drop(bootutil_sha_context *ctx)
{
#ifdef MCUBOOT_SHA512
mbedtls_sha512_free(ctx);
#else
mbedtls_sha256_free(ctx);
#endif

return 0;
}

static inline int bootutil_sha_update(bootutil_sha_context *ctx,
const void *data,
uint32_t data_len)
{
return mbedtls_sha256_update_ret(ctx, data, data_len);
int ret;

#ifdef MCUBOOT_SHA512
ret = mbedtls_sha512_update_ret(ctx, data, data_len);
#else
ret = mbedtls_sha256_update_ret(ctx, data, data_len);
#endif

return ret;
}

static inline int bootutil_sha_finish(bootutil_sha_context *ctx,
uint8_t *output)
{
return mbedtls_sha256_finish_ret(ctx, output);
int ret;

#ifdef MCUBOOT_SHA512
ret = mbedtls_sha512_finish_ret(ctx, output);
#else
ret = mbedtls_sha256_finish_ret(ctx, output);
#endif

return ret;
}

#endif /* MCUBOOT_USE_MBED_TLS */
Expand Down
5 changes: 3 additions & 2 deletions boot/bootutil/src/image_ed25519.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include "bootutil_priv.h"
#include "bootutil/crypto/common.h"
#include "bootutil/crypto/sha.h"

static const uint8_t ed25519_pubkey_oid[] = MBEDTLS_OID_ISO_IDENTIFIED_ORG "\x65\x70";
#define NUM_ED25519_BYTES 32
Expand Down Expand Up @@ -73,7 +74,7 @@ bootutil_verify_sig(uint8_t *hash, uint32_t hlen, uint8_t *sig, size_t slen,
uint8_t *pubkey;
uint8_t *end;

if (hlen != 32 || slen != 64) {
if (hlen != IMAGE_HASH_SIZE || slen != 64) {
FIH_SET(fih_rc, FIH_FAILURE);
goto out;
}
Expand All @@ -87,7 +88,7 @@ bootutil_verify_sig(uint8_t *hash, uint32_t hlen, uint8_t *sig, size_t slen,
goto out;
}

rc = ED25519_verify(hash, 32, sig, pubkey);
rc = ED25519_verify(hash, IMAGE_HASH_SIZE, sig, pubkey);

if (rc == 0) {
/* if verify returns 0, there was an error. */
Expand Down
Loading