Skip to content

Commit 206b914

Browse files
Roland Mikheldavidvincze
Roland Mikhel
authored and
davidvincze
committed
bootutil: Remove P224 curve
Signed-off-by: Roland Mikhel <roland.mikhel@arm.com> Change-Id: I49fad7ede202de4e3c710bf4aa1df195a310b037
1 parent a97f009 commit 206b914

File tree

17 files changed

+29
-239
lines changed

17 files changed

+29
-239
lines changed

‎boot/bootutil/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#------------------------------------------------------------------------------
2-
# Copyright (c) 2020, Arm Limited. All rights reserved.
2+
# Copyright (c) 2020-2023, Arm Limited. All rights reserved.
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -23,7 +23,6 @@ target_sources(bootutil
2323
src/encrypted.c
2424
src/fault_injection_hardening.c
2525
src/fault_injection_hardening_delay_rng_mbedtls.c
26-
src/image_ec.c
2726
src/image_ec256.c
2827
src/image_ed25519.c
2928
src/image_rsa.c

‎boot/bootutil/include/bootutil/caps.h

+17-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2017 Linaro Limited
3-
* Copyright (c) 2021 Arm Limited
3+
* Copyright (c) 2021-2023 Arm Limited
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -34,23 +34,22 @@ extern "C" {
3434
uint32_t bootutil_get_caps(void);
3535

3636
#define BOOTUTIL_CAP_RSA2048 (1<<0)
37-
#define BOOTUTIL_CAP_ECDSA_P224 (1<<1)
38-
#define BOOTUTIL_CAP_ECDSA_P256 (1<<2)
39-
#define BOOTUTIL_CAP_SWAP_USING_SCRATCH (1<<3)
40-
#define BOOTUTIL_CAP_OVERWRITE_UPGRADE (1<<4)
41-
#define BOOTUTIL_CAP_ENC_RSA (1<<5)
42-
#define BOOTUTIL_CAP_ENC_KW (1<<6)
43-
#define BOOTUTIL_CAP_VALIDATE_PRIMARY_SLOT (1<<7)
44-
#define BOOTUTIL_CAP_RSA3072 (1<<8)
45-
#define BOOTUTIL_CAP_ED25519 (1<<9)
46-
#define BOOTUTIL_CAP_ENC_EC256 (1<<10)
47-
#define BOOTUTIL_CAP_SWAP_USING_MOVE (1<<11)
48-
#define BOOTUTIL_CAP_DOWNGRADE_PREVENTION (1<<12)
49-
#define BOOTUTIL_CAP_ENC_X25519 (1<<13)
50-
#define BOOTUTIL_CAP_BOOTSTRAP (1<<14)
51-
#define BOOTUTIL_CAP_AES256 (1<<15)
52-
#define BOOTUTIL_CAP_RAM_LOAD (1<<16)
53-
#define BOOTUTIL_CAP_DIRECT_XIP (1<<17)
37+
#define BOOTUTIL_CAP_ECDSA_P256 (1<<1)
38+
#define BOOTUTIL_CAP_SWAP_USING_SCRATCH (1<<2)
39+
#define BOOTUTIL_CAP_OVERWRITE_UPGRADE (1<<3)
40+
#define BOOTUTIL_CAP_ENC_RSA (1<<4)
41+
#define BOOTUTIL_CAP_ENC_KW (1<<5)
42+
#define BOOTUTIL_CAP_VALIDATE_PRIMARY_SLOT (1<<6)
43+
#define BOOTUTIL_CAP_RSA3072 (1<<7)
44+
#define BOOTUTIL_CAP_ED25519 (1<<8)
45+
#define BOOTUTIL_CAP_ENC_EC256 (1<<9)
46+
#define BOOTUTIL_CAP_SWAP_USING_MOVE (1<<10)
47+
#define BOOTUTIL_CAP_DOWNGRADE_PREVENTION (1<<11)
48+
#define BOOTUTIL_CAP_ENC_X25519 (1<<12)
49+
#define BOOTUTIL_CAP_BOOTSTRAP (1<<13)
50+
#define BOOTUTIL_CAP_AES256 (1<<14)
51+
#define BOOTUTIL_CAP_RAM_LOAD (1<<15)
52+
#define BOOTUTIL_CAP_DIRECT_XIP (1<<16)
5453

5554
/*
5655
* Query the number of images this bootloader is configured for. This

‎boot/bootutil/include/bootutil/image.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2016-2019 Linaro LTD
55
* Copyright (c) 2016-2019 JUUL Labs
6-
* Copyright (c) 2019-2021 Arm Limited
6+
* Copyright (c) 2019-2023 Arm Limited
77
*
88
* Original license:
99
*
@@ -85,7 +85,7 @@ struct flash_area;
8585
#define IMAGE_TLV_PUBKEY 0x02 /* public key */
8686
#define IMAGE_TLV_SHA256 0x10 /* SHA256 of image hdr and body */
8787
#define IMAGE_TLV_RSA2048_PSS 0x20 /* RSA2048 of hash output */
88-
#define IMAGE_TLV_ECDSA224 0x21 /* ECDSA of hash output */
88+
#define IMAGE_TLV_ECDSA224 0x21 /* ECDSA of hash output - Not supported anymore */
8989
#define IMAGE_TLV_ECDSA256 0x22 /* ECDSA of hash output */
9090
#define IMAGE_TLV_RSA3072_PSS 0x23 /* RSA3072 of hash output */
9191
#define IMAGE_TLV_ED25519 0x24 /* ed25519 of hash output */

‎boot/bootutil/src/caps.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-License-Identifier: Apache-2.0
33
*
44
* Copyright (c) 2017 Linaro Limited
5-
* Copyright (c) 2021 Arm Limited
5+
* Copyright (c) 2021-2023 Arm Limited
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -32,9 +32,6 @@ uint32_t bootutil_get_caps(void)
3232
res |= BOOTUTIL_CAP_RSA3072;
3333
#endif
3434
#endif
35-
#if defined(MCUBOOT_SIGN_EC)
36-
res |= BOOTUTIL_CAP_ECDSA_P224;
37-
#endif
3835
#if defined(MCUBOOT_SIGN_EC256)
3936
res |= BOOTUTIL_CAP_ECDSA_P256;
4037
#endif

‎boot/bootutil/src/image_ec.c

-130
This file was deleted.

‎boot/bootutil/src/image_validate.c

+3-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2017-2019 Linaro LTD
55
* Copyright (c) 2016-2019 JUUL Labs
6-
* Copyright (c) 2019-2020 Arm Limited
6+
* Copyright (c) 2019-2023 Arm Limited
77
*
88
* Original license:
99
*
@@ -46,11 +46,11 @@
4646
#if defined(MCUBOOT_SIGN_RSA)
4747
#include "mbedtls/rsa.h"
4848
#endif
49-
#if defined(MCUBOOT_SIGN_EC) || defined(MCUBOOT_SIGN_EC256)
49+
#if defined(MCUBOOT_SIGN_EC256)
5050
#include "mbedtls/ecdsa.h"
5151
#endif
5252
#if defined(MCUBOOT_ENC_IMAGES) || defined(MCUBOOT_SIGN_RSA) || \
53-
defined(MCUBOOT_SIGN_EC) || defined(MCUBOOT_SIGN_EC256)
53+
defined(MCUBOOT_SIGN_EC256)
5454
#include "mbedtls/asn1.h"
5555
#endif
5656

@@ -169,7 +169,6 @@ bootutil_img_hash(struct enc_key_data *enc_state, int image_index,
169169
* configured for any signature, don't define this macro.
170170
*/
171171
#if (defined(MCUBOOT_SIGN_RSA) + \
172-
defined(MCUBOOT_SIGN_EC) + \
173172
defined(MCUBOOT_SIGN_EC256) + \
174173
defined(MCUBOOT_SIGN_ED25519)) > 1
175174
#error "Only a single signature type is supported!"
@@ -185,10 +184,6 @@ bootutil_img_hash(struct enc_key_data *enc_state, int image_index,
185184
# endif
186185
# define SIG_BUF_SIZE (MCUBOOT_SIGN_RSA_LEN / 8)
187186
# define EXPECTED_SIG_LEN(x) ((x) == SIG_BUF_SIZE) /* 2048 bits */
188-
#elif defined(MCUBOOT_SIGN_EC)
189-
# define EXPECTED_SIG_TLV IMAGE_TLV_ECDSA224
190-
# define SIG_BUF_SIZE 128
191-
# define EXPECTED_SIG_LEN(x) (1) /* always true, ASN.1 will validate */
192187
#elif defined(MCUBOOT_SIGN_EC256)
193188
# define EXPECTED_SIG_TLV IMAGE_TLV_ECDSA256
194189
# define SIG_BUF_SIZE 128

‎boot/cypress/MCUBootApp/config/mcuboot_config/mcuboot_config.h

-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
/* Uncomment for ECDSA signatures using curve P-256. */
3838
#define MCUBOOT_SIGN_EC256
3939

40-
// #define MCUBOOT_SIGN_EC
41-
4240
/*
4341
* Upgrade mode
4442
*

‎boot/cypress/MCUBootApp/keys.c

+1-28
Original file line numberDiff line numberDiff line change
@@ -85,31 +85,6 @@ const unsigned char rsa_pub_key[] = {
8585
0xc9, 0x02, 0x03, 0x01, 0x00, 0x01
8686
};
8787
const unsigned int rsa_pub_key_len = 270;
88-
#elif defined(MCUBOOT_SIGN_EC)
89-
/* Format of PEM :
90-
* -----BEGIN PUBLIC KEY-----
91-
* base64encode(DER)
92-
* -----END PUBLIC KEY----- */
93-
#if defined(ECC224_KEY_FILE)
94-
#include ECC224_KEY_FILE
95-
#else
96-
#warning "Used default ECC224 ecdsa_pub_key"
97-
/* It is OEM_PUB_KEY at this moment for debug purposes */
98-
/* Autogenerated by imgtool.py, do not edit. */
99-
const unsigned char ecdsa_pub_key[] = {
100-
0x30, 0x4e, 0x30, 0x10, 0x06, 0x07, 0x2a, 0x86,
101-
0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x05, 0x2b,
102-
0x81, 0x04, 0x00, 0x21, 0x03, 0x3a, 0x00, 0x04,
103-
0xa5, 0x8b, 0x18, 0xa4, 0x60, 0x37, 0xf7, 0x0d,
104-
0x2b, 0x06, 0xba, 0x4b, 0x4c, 0xd7, 0x8d, 0xec,
105-
0x2a, 0x32, 0x5a, 0x0e, 0x52, 0xf4, 0x1b, 0x7c,
106-
0x99, 0xec, 0x68, 0x5d, 0x05, 0xc3, 0x6b, 0x7b,
107-
0x40, 0x9c, 0xaa, 0xac, 0x90, 0xf4, 0xfc, 0xbe,
108-
0x98, 0xe5, 0x3e, 0x86, 0x3d, 0x37, 0xbf, 0x45,
109-
0x78, 0x92, 0x27, 0xca, 0x69, 0xe6, 0xf2, 0xc5,
110-
};
111-
const unsigned int ecdsa_pub_key_len = 80;
112-
#endif
11388
#elif defined(MCUBOOT_SIGN_EC256)
11489
/* Format of PEM :
11590
* -----BEGIN PUBLIC KEY-----
@@ -141,16 +116,14 @@ const unsigned int ecdsa_pub_key_len = 91;
141116
#endif
142117

143118
#if defined(MCUBOOT_SIGN_RSA) || \
144-
defined(MCUBOOT_SIGN_EC) || \
145119
defined(MCUBOOT_SIGN_EC256)
146120
const struct bootutil_key bootutil_keys[] = {
147121
#if defined(MCUBOOT_SIGN_RSA)
148122
{
149123
.key = rsa_pub_key,
150124
.len = &rsa_pub_key_len,
151125
},
152-
#elif defined(MCUBOOT_SIGN_EC) || \
153-
defined(MCUBOOT_SIGN_EC256)
126+
#elif defined(MCUBOOT_SIGN_EC256)
154127
{
155128
.key = ecdsa_pub_key,
156129
.len = &ecdsa_pub_key_len,

‎boot/espressif/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ set(bootutil_srcs
134134
${BOOTUTIL_DIR}/src/encrypted.c
135135
${BOOTUTIL_DIR}/src/fault_injection_hardening.c
136136
${BOOTUTIL_DIR}/src/fault_injection_hardening_delay_rng_mbedtls.c
137-
${BOOTUTIL_DIR}/src/image_ec.c
138137
${BOOTUTIL_DIR}/src/image_ec256.c
139138
${BOOTUTIL_DIR}/src/image_ed25519.c
140139
${BOOTUTIL_DIR}/src/image_rsa.c

‎boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h

-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848
#if MYNEWT_VAL(BOOTUTIL_SIGN_ED25519)
4949
#define MCUBOOT_SIGN_ED25519 1
5050
#endif
51-
#if MYNEWT_VAL(BOOTUTIL_SIGN_EC)
52-
#define MCUBOOT_SIGN_EC 1
53-
#endif
5451
#if MYNEWT_VAL(BOOTUTIL_ENCRYPT_RSA)
5552
#define MCUBOOT_ENCRYPT_RSA 1
5653
#endif

‎boot/mynewt/mcuboot_config/syscfg.yml

-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ syscfg.defs:
3131
BOOTUTIL_SIGN_RSA_LEN:
3232
description: 'Key size for RSA keys (2048 or 3072).'
3333
value: 2048
34-
BOOTUTIL_SIGN_EC:
35-
description: 'Images are signed using ECDSA NIST P-224.'
36-
value: 0
3734
BOOTUTIL_SIGN_EC256:
3835
description: 'Images are signed using ECDSA NIST P-256.'
3936
value: 0

‎docs/design.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
- Copyright (c) 2017-2020 Linaro LTD
55
- Copyright (c) 2017-2019 JUUL Labs
6-
- Copyright (c) 2019-2021 Arm Limited
6+
- Copyright (c) 2019-2023 Arm Limited
77
88
- Original license:
99
@@ -107,7 +107,7 @@ struct image_tlv {
107107
#define IMAGE_TLV_KEYHASH 0x01 /* hash of the public key */
108108
#define IMAGE_TLV_SHA256 0x10 /* SHA256 of image hdr and body */
109109
#define IMAGE_TLV_RSA2048_PSS 0x20 /* RSA2048 of hash output */
110-
#define IMAGE_TLV_ECDSA224 0x21 /* ECDSA of hash output */
110+
#define IMAGE_TLV_ECDSA224 0x21 /* ECDSA of hash output - Not supported anymore */
111111
#define IMAGE_TLV_ECDSA256 0x22 /* ECDSA of hash output */
112112
#define IMAGE_TLV_RSA3072_PSS 0x23 /* RSA3072 of hash output */
113113
#define IMAGE_TLV_ED25519 0x24 /* ED25519 of hash output */

‎docs/ecdsa.md

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ shortcut was taken, and these signatures were padded to make them
55
always a fixed length. Unfortunately, this padding was done in a way
66
that is not easily reversible. Some crypto libraries (specifically, Mbed
77
TLS) are fairly strict about the formatting of the ECDSA signature.
8-
This currently means that the ECDSA SECP224R1 (EC) signature
9-
checking code will fail to boot about 1 out of every 256 images,
10-
because the signature itself will end in a 0x00 byte, and the code
11-
will remove too much data, invalidating the signature.
128

139
There are two ways to fix this:
1410

0 commit comments

Comments
 (0)