Merge synchronized up to de51807 (5f004461) · Commits · Wenxi XU / Mcuboot

boot/bootutil/include/bootutil/crypto/ecdh_p256.h

+81 −4

Original line number	Diff line number	Diff line
		@@ -12,10 +12,17 @@

		#include "mcuboot_config/mcuboot_config.h"

		#if (defined(MCUBOOT_USE_TINYCRYPT)) != 1
		#error "One crypto backend must be defined: TINYCRYPT"
		#if (defined(MCUBOOT_USE_MBED_TLS) + \
		defined(MCUBOOT_USE_TINYCRYPT)) != 1
		#error "One crypto backend must be defined: either MBED_TLS or TINYCRYPT"
		#endif

		#if defined(MCUBOOT_USE_MBED_TLS)
		#include <mbedtls/ecp.h>
		#include <mbedtls/ecdh.h>
		#define EC256_PUBK_LEN (65)
		#endif /* MCUBOOT_USE_MBED_TLS */

		#if defined(MCUBOOT_USE_TINYCRYPT)
		#include <tinycrypt/ecc_dh.h>
		#include <tinycrypt/constants.h>
		@@ -43,12 +50,16 @@ static inline int bootutil_ecdh_p256_shared_secret(bootutil_ecdh_p256_context *c
		int rc;
		(void)ctx;

		rc = uECC_valid_public_key(pk, uECC_secp256r1());
		if (pk[0] != 0x04) {
		return -1;
		}

		rc = uECC_valid_public_key(&pk[1], uECC_secp256r1());
		if (rc != 0) {
		return -1;
		}

		rc = uECC_shared_secret(pk, sk, z, uECC_secp256r1());
		rc = uECC_shared_secret(&pk[1], sk, z, uECC_secp256r1());
		if (rc != TC_CRYPTO_SUCCESS) {
		return -1;
		}
		@@ -56,6 +67,72 @@ static inline int bootutil_ecdh_p256_shared_secret(bootutil_ecdh_p256_context *c
		}
		#endif /* MCUBOOT_USE_TINYCRYPT */

		#if defined(MCUBOOT_USE_MBED_TLS)
		typedef struct bootutil_ecdh_p256_context {
		mbedtls_ecp_group grp;
		mbedtls_ecp_point P;
		mbedtls_mpi z;
		mbedtls_mpi d;
		} bootutil_ecdh_p256_context;

		static inline void bootutil_ecdh_p256_init(bootutil_ecdh_p256_context *ctx)
		{
		mbedtls_mpi_init(&ctx->z);
		mbedtls_mpi_init(&ctx->d);

		mbedtls_ecp_group_init(&ctx->grp);
		mbedtls_ecp_point_init(&ctx->P);

		if (mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1) != 0) {
		mbedtls_ecp_group_free(&ctx->grp);
		mbedtls_ecp_point_free(&ctx->P);
		}
		}

		static inline void bootutil_ecdh_p256_drop(bootutil_ecdh_p256_context *ctx)
		{
		mbedtls_mpi_free(&ctx->d);
		mbedtls_mpi_free(&ctx->z);
		mbedtls_ecp_group_free(&ctx->grp);
		mbedtls_ecp_point_free(&ctx->P);
		}

		static inline int bootutil_ecdh_p256_shared_secret(bootutil_ecdh_p256_context ctx, const uint8_t pk, const uint8_t sk, uint8_t z)
		{
		int rc;

		rc = mbedtls_ecp_point_read_binary(&ctx->grp,
		&ctx->P,
		pk,
		EC256_PUBK_LEN);
		if (rc != 0) {
		mbedtls_ecp_group_free(&ctx->grp);
		mbedtls_ecp_point_free(&ctx->P);
		return -1;
		}

		rc = mbedtls_ecp_check_pubkey(&ctx->grp, &ctx->P);
		if (rc != 0) {
		mbedtls_ecp_group_free(&ctx->grp);
		mbedtls_ecp_point_free(&ctx->P);
		return -1;
		}

		mbedtls_mpi_read_binary(&ctx->d, sk, NUM_ECC_BYTES);

		rc = mbedtls_ecdh_compute_shared(&ctx->grp,
		&ctx->z,
		&ctx->P,
		&ctx->d,
		NULL,
		NULL);

		mbedtls_mpi_write_binary(&ctx->z, z, NUM_ECC_BYTES);

		return rc;
		}
		#endif /* MCUBOOT_USE_MBED_TLS */

		#ifdef __cplusplus
		}
		#endif

boot/bootutil/include/bootutil/crypto/hmac_sha256.h

+54 −2

Original line number	Diff line number	Diff line
		@@ -12,10 +12,19 @@

		#include "mcuboot_config/mcuboot_config.h"

		#if (defined(MCUBOOT_USE_TINYCRYPT)) != 1
		#error "One crypto backend must be defined: TINYCRYPT"
		#if (defined(MCUBOOT_USE_MBED_TLS) + \
		defined(MCUBOOT_USE_TINYCRYPT)) != 1
		#error "One crypto backend must be defined: either MBED_TLS or TINYCRYPT"
		#endif

		#if defined(MCUBOOT_USE_MBED_TLS)
		#include <stdint.h>
		#include <stddef.h>
		#include <mbedtls/cmac.h>
		#include <mbedtls/md.h>
		#include <mbedtls/md_internal.h>
		#endif /* MCUBOOT_USE_MBED_TLS */

		#if defined(MCUBOOT_USE_TINYCRYPT)
		#include <tinycrypt/sha256.h>
		#include <tinycrypt/utils.h>
		@@ -76,6 +85,49 @@ static inline int bootutil_hmac_sha256_finish(bootutil_hmac_sha256_context *ctx,
		}
		#endif /* MCUBOOT_USE_TINYCRYPT */

		#if defined(MCUBOOT_USE_MBED_TLS)
		/**
		* The generic message-digest context.
		*/
		typedef mbedtls_md_context_t bootutil_hmac_sha256_context;

		static inline void bootutil_hmac_sha256_init(bootutil_hmac_sha256_context *ctx)
		{
		mbedtls_md_init(ctx);
		}

		static inline void bootutil_hmac_sha256_drop(bootutil_hmac_sha256_context *ctx)
		{
		mbedtls_md_free(ctx);
		}

		static inline int bootutil_hmac_sha256_set_key(bootutil_hmac_sha256_context ctx, const uint8_t key, unsigned int key_size)
		{
		int rc;

		rc = mbedtls_md_setup(ctx, mbedtls_md_info_from_string("SHA256"), 1);
		if (rc != 0) {
		return rc;
		}
		rc = mbedtls_md_hmac_starts(ctx, key, key_size);
		return rc;
		}

		static inline int bootutil_hmac_sha256_update(bootutil_hmac_sha256_context ctx, const void data, unsigned int data_length)
		{
		return mbedtls_md_hmac_update(ctx, data, data_length);
		}

		static inline int bootutil_hmac_sha256_finish(bootutil_hmac_sha256_context ctx, uint8_t tag, unsigned int taglen)
		{
		(void)taglen;
		/*
		* HMAC the key and check that our received MAC matches the generated tag
		*/
		return mbedtls_md_hmac_finish(ctx, tag);
		}
		#endif /* MCUBOOT_USE_MBED_TLS */

		#ifdef __cplusplus
		}
		#endif

boot/bootutil/src/encrypted.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -437,7 +437,7 @@ boot_enc_set_key(struct enc_key_data *enc_state, uint8_t slot,
		# define EXPECTED_ENC_TLV IMAGE_TLV_ENC_KW128
		#elif defined(MCUBOOT_ENCRYPT_EC256)
		# define EXPECTED_ENC_TLV IMAGE_TLV_ENC_EC256
		# define EC_PUBK_INDEX (1)
		# define EC_PUBK_INDEX (0)
		# define EC_TAG_INDEX (65)
		# define EC_CIPHERKEY_INDEX (65 + 32)
		_Static_assert(EC_CIPHERKEY_INDEX + 16 == EXPECTED_ENC_LEN,
		@@ -526,11 +526,6 @@ boot_enc_decrypt(const uint8_t buf, uint8_t enckey)
		return rc;
		}

		/* is EC point uncompressed? */
		if (buf[0] != 0x04) {
		return -1;
		}

		/*
		* First "element" in the TLV is the curve point (public key)
		*/
		@@ -603,7 +598,7 @@ boot_enc_decrypt(const uint8_t buf, uint8_t enckey)
		return -1;
		}

		/* Assumes the tag bufer is at least sizeof(hmac_tag_size(state)) bytes */
		/* Assumes the tag buffer is at least sizeof(hmac_tag_size(state)) bytes */
		rc = bootutil_hmac_sha256_finish(&hmac, tag, BOOTUTIL_CRYPTO_SHA256_DIGEST_SIZE);
		if (rc != 0) {
		(void)bootutil_hmac_sha256_drop(&hmac);

boot/bootutil/src/image_ec256.c

+62 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,53 @@ static const uint8_t ec_secp256r1_oid[] = MBEDTLS_OID_EC_GRP_SECP256R1;
		/*
		* Parse the public key used for signing.
		*/
		#ifdef CY_MBEDTLS_HW_ACCELERATION
		static int
		bootutil_parse_eckey(mbedtls_ecdsa_context ctx, uint8_t p, uint8_t end)
		{
		size_t len;
		mbedtls_asn1_buf alg;
		mbedtls_asn1_buf param;

		if (mbedtls_asn1_get_tag(p, end, &len,
		MBEDTLS_ASN1_CONSTRUCTED \| MBEDTLS_ASN1_SEQUENCE)) {
		return -1;
		}
		end = *p + len;

		if (mbedtls_asn1_get_alg(p, end, &alg, &param)) {
		return -2;
		}
		if (alg.len != sizeof(ec_pubkey_oid) - 1 \|\|
		memcmp(alg.p, ec_pubkey_oid, sizeof(ec_pubkey_oid) - 1)) {
		return -3;
		}
		if (param.len != sizeof(ec_secp256r1_oid) - 1\|\|
		memcmp(param.p, ec_secp256r1_oid, sizeof(ec_secp256r1_oid) - 1)) {
		return -4;
		}

		if (mbedtls_ecp_group_load(&ctx->grp, MBEDTLS_ECP_DP_SECP256R1)) {
		return -5;
		}

		if (mbedtls_asn1_get_bitstring_null(p, end, &len)) {
		return -6;
		}
		if (*p + len != end) {
		return -7;
		}

		if (mbedtls_ecp_point_read_binary(&ctx->grp, &ctx->Q, p, end - p)) {
		return -8;
		}

		if (mbedtls_ecp_check_pubkey(&ctx->grp, &ctx->Q)) {
		return -9;
		}
		return 0;
		}
		#endif /* CY_MBEDTLS_HW_ACCELERATION */
		static int
		bootutil_import_key(uint8_t *cp, uint8_t end)
		{
		@@ -163,7 +210,12 @@ bootutil_verify_sig(uint8_t hash, uint32_t hlen, uint8_t sig, size_t slen,
		pubkey = (uint8_t *)bootutil_keys[key_id].key;
		end = pubkey + *bootutil_keys[key_id].len;

		#ifdef CY_MBEDTLS_HW_ACCELERATION
		mbedtls_ecdsa_init(&ctx);
		rc = bootutil_parse_eckey(&ctx, &pubkey, end);
		#else
		rc = bootutil_import_key(&pubkey, end);
		#endif
		if (rc) {
		return -1;
		}
		@@ -178,6 +230,13 @@ bootutil_verify_sig(uint8_t hash, uint32_t hlen, uint8_t sig, size_t slen,
		/*
		* This is simplified, as the hash length is also 32 bytes.
		*/
		#ifdef CY_MBEDTLS_HW_ACCELERATION
		while (sig[slen - 1] == '\0') {
		slen--;
		}
		rc = mbedtls_ecdsa_read_signature(&ctx, hash, hlen, sig, slen);

		#else /* CY_MBEDTLS_HW_ACCELERATION */
		if (hlen != NUM_ECC_BYTES) {
		return -1;
		}
		@@ -189,7 +248,10 @@ bootutil_verify_sig(uint8_t hash, uint32_t hlen, uint8_t sig, size_t slen,
		rc = bootutil_ecdsa_p256_verify(&ctx, pubkey, end - pubkey, hash, signature,
		2 * NUM_ECC_BYTES);
		#endif
		#endif /* CY_MBEDTLS_HW_ACCELERATION */

		bootutil_ecdsa_p256_drop(&ctx);

		return rc;
		}

boot/cypress/BlinkyApp/BlinkyApp.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,9 @@ OUT_CFG := $(OUT_TARGET)/$(BUILDCFG)

		# Set build directory for BOOT and UPGRADE images
		ifeq ($(IMG_TYPE), UPGRADE)
		ifeq ($(ENC_IMG), 1)
		SIGN_ARGS += --encrypt ../../$(ENC_KEY_FILE).pem
		endif
		SIGN_ARGS += --pad
		UPGRADE_SUFFIX :=_upgrade
		OUT_CFG := $(OUT_CFG)/upgrade

Admin message