Hi,

On 1/11/21 4:41 PM, Alexandru Gagniuc wrote:

Prepare the source tree for accepting implementations of the ECDSA algorithm. This patch deals with the boring aspects of Makefiles and Kconfig files.

Signed-off-by: Alexandru Gagniucmr.nuke.me@gmail.com

include/image.h | 10 +++++----- include/u-boot/rsa.h | 2 +- lib/Kconfig | 1 + lib/Makefile | 1 + lib/ecdsa/Kconfig | 23 +++++++++++++++++++++++ lib/ecdsa/Makefile | 1 + lib/ecdsa/ecdsa-verify.c | 13 +++++++++++++ 7 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 lib/ecdsa/Kconfig create mode 100644 lib/ecdsa/Makefile create mode 100644 lib/ecdsa/ecdsa-verify.c

diff --git a/include/image.h b/include/image.h index 6628173dca..1d70ba0ece 100644 --- a/include/image.h +++ b/include/image.h @@ -1198,20 +1198,20 @@ int calculate_hash(const void *data, int data_len, const char *algo, #if defined(USE_HOSTCC) # if defined(CONFIG_FIT_SIGNATURE) # define IMAGE_ENABLE_SIGN 1 -# define IMAGE_ENABLE_VERIFY 1 +# define IMAGE_ENABLE_VERIFY_RSA 1 # define IMAGE_ENABLE_VERIFY_ECDSA 1 # define FIT_IMAGE_ENABLE_VERIFY 1 # include <openssl/evp.h> # else # define IMAGE_ENABLE_SIGN 0 -# define IMAGE_ENABLE_VERIFY 0 +# define IMAGE_ENABLE_VERIFY_RSA 0 # define IMAGE_ENABLE_VERIFY_ECDSA 0 # define FIT_IMAGE_ENABLE_VERIFY 0 # endif #else # define IMAGE_ENABLE_SIGN 0 -# define IMAGE_ENABLE_VERIFY CONFIG_IS_ENABLED(RSA_VERIFY) -# define IMAGE_ENABLE_VERIFY_ECDSA 0 +# define IMAGE_ENABLE_VERIFY_RSA CONFIG_IS_ENABLED(RSA_VERIFY) +# define IMAGE_ENABLE_VERIFY_ECDSA CONFIG_IS_ENABLED(ECDSA_VERIFY)

here you are using CONFIG_IS_ENABLED.

This macro imply to test CONFIG_ECDSA_VERIFY or CONFIG_SPL_ECDSA_VERIFY (for SPL build)

=> but CONFIG_SPL_ECDSA_VERIFY is missing, I think you need to add it, as RSA

# define FIT_IMAGE_ENABLE_VERIFY CONFIG_IS_ENABLED(FIT_SIGNATURE) #endif

@@ -1260,7 +1260,7 @@ struct image_region { int size; };

-#if IMAGE_ENABLE_VERIFY +#if FIT_IMAGE_ENABLE_VERIFY # include <u-boot/hash-checksum.h> #endif struct checksum_algo { diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h index bed1c097c2..eb258fca4c 100644 --- a/include/u-boot/rsa.h +++ b/include/u-boot/rsa.h @@ -81,7 +81,7 @@ static inline int rsa_add_verify_data(struct image_sign_info *info, } #endif

-#if IMAGE_ENABLE_VERIFY +#if IMAGE_ENABLE_VERIFY_RSA /**

• rsa_verify_hash() - Verify a signature against a hash

diff --git a/lib/Kconfig b/lib/Kconfig index 7673d2e4e0..e2cb846fc0 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -292,6 +292,7 @@ config AES supported by the algorithm but only a 128-bit key is supported at present.

+source lib/ecdsa/Kconfig source lib/rsa/Kconfig source lib/crypto/Kconfig

diff --git a/lib/Makefile b/lib/Makefile index cf64188ba5..ab86be2678 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -59,6 +59,7 @@ endif

obj-$(CONFIG_$(SPL_)ACPIGEN) += acpi/ obj-$(CONFIG_$(SPL_)MD5) += md5.o +obj-$(CONFIG_ECDSA) += ecdsa/

obj-$(CONFIG_$(SPL_)ECDSA) += ecdsa/

obj-$(CONFIG_$(SPL_)RSA) += rsa/ obj-$(CONFIG_FIT_SIGNATURE) += hash-checksum.o obj-$(CONFIG_SHA1) += sha1.o diff --git a/lib/ecdsa/Kconfig b/lib/ecdsa/Kconfig new file mode 100644 index 0000000000..1244d6b6ea --- /dev/null +++ b/lib/ecdsa/Kconfig @@ -0,0 +1,23 @@ +config ECDSA

• bool "Enable ECDSA support"
• depends on DM
• help

•  This enables the ECDSA algorithm for FIT image verification in U-Boot.
  

•  See doc/uImage.FIT/signature.txt for more details.
  

•  The ECDSA algorithm is implemented using the driver model. So
  

•  CONFIG_DM is required by this library.
  

•  ECDSA is enabled for mkimage regardless of this  option.
  

+if ECDSA

Add CONFIG_SPL_ECDSA to select independently support in SPL et/or in U-Boot

as it is done for RSA

+ config SPL_ECDSA + bool "Use ECDSA library within in SPL"

+config ECDSA_VERIFY

• bool "Enable ECDSA verification support in U-Boot."

+ select SPL_ECDSA

• help

•  Allow ECDSA signatures to be recognized and verified in U-Boot.
  

+config SPL_ECDSA_VERIFY

• bool "Enable ECDSA verification support in SPL"
• help

•  Allow ECDSA signatures to be recognized and verified in SPL.
  

+endif diff --git a/lib/ecdsa/Makefile b/lib/ecdsa/Makefile new file mode 100644 index 0000000000..771d6d3135 --- /dev/null +++ b/lib/ecdsa/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_$(SPL_)ECDSA_VERIFY) += ecdsa-verify.o diff --git a/lib/ecdsa/ecdsa-verify.c b/lib/ecdsa/ecdsa-verify.c new file mode 100644 index 0000000000..d2e6a40f4a --- /dev/null +++ b/lib/ecdsa/ecdsa-verify.c @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*

• • Copyright (c) 2020, Alexandru Gagniucmr.nuke.me@gmail.com
• */

+#include <u-boot/ecdsa.h>

+int ecdsa_verify(struct image_sign_info *info,

•  const struct image_region region[], int region_count,
  

•  uint8_t *sig, uint sig_len)
  

+{

• return -EOPNOTSUPP;

+}

Regards,

Patrick

Hi,

On 1/11/21 4:41 PM, Alexandru Gagniuc wrote:

Implement the crypto_algo .verify() function for ecdsa256. Because it backends on UCLASS_ECDSA, this change is focused on parsing the keys from devicetree and passing this information to the specific UCLASS driver.

Signed-off-by: Alexandru Gagniucmr.nuke.me@gmail.com

lib/ecdsa/ecdsa-verify.c | 117 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-)

diff --git a/lib/ecdsa/ecdsa-verify.c b/lib/ecdsa/ecdsa-verify.c index d2e6a40f4a..d84f6eb093 100644 --- a/lib/ecdsa/ecdsa-verify.c +++ b/lib/ecdsa/ecdsa-verify.c @@ -1,13 +1,128 @@ // SPDX-License-Identifier: GPL-2.0+ /*

• • ECDSA signature verification for u-boot
• • This implements the firmware-side wrapper for ECDSA verification. It bridges
• • the struct crypto_algo API to the ECDSA uclass implementations.
• • Copyright (c) 2020, Alexandru Gagniucmr.nuke.me@gmail.com
  */

http://www.denx.de/wiki/U-Boot/CodingStyle #Include files

#include <crypto/ecdsa-uclass.h>

it is normally the first in alphabetic order of directory

+#include <dm/uclass.h> #include <u-boot/ecdsa.h> +#include <crypto/ecdsa-uclass.h>

+/*

• • Derive size of an ECDSA key from the curve name
• • While it's possible to extract the key size by using string manipulation,
• • use a list of known curves for the time being.
• */

+static int ecdsa_key_size(const char *curve_name) +{

• if (!strcmp(curve_name, "prime256v1"))

• return 256;
  

• else

• return 0;
  

+}

To prepare the future can you parse a array of supported curves with associated ID

used as parameter of ECDSA parameter = enum ECDSA_CURVES

for example: char * name, int size, enum ECDSA_CURVES

const [] = { {"prime256v1", 256, ECDSA_PRIME256V1 },

}

+static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) +{

• int x_len, y_len;
• key->curve_name = fdt_getprop(fdt, node, "ecdsa,curve", NULL);
• key->size_bits = ecdsa_key_size(key->curve_name);
• if (key->size_bits == 0) {

• debug("Unknown ECDSA curve '%s'", key->curve_name);
  

• return -EINVAL;
  

• }
• key->x = fdt_getprop(fdt, node, "ecdsa,x-point", &x_len);
• key->y = fdt_getprop(fdt, node, "ecdsa,y-point", &y_len);
• if (!key->x || !key->y)

• return -EINVAL;
  

• if (x_len != (key->size_bits / 8) || y_len != (key->size_bits / 8)) {

• printf("%s: node=%d, curve@%p x@%p+%i y@%p+%i\n", __func__,
  

•        node, key->curve_name, key->x, x_len, key->y, y_len);
  

• return -EINVAL;
  

• }
• return 0;

+}

+static int ecdsa_verify_hash(struct udevice *dev,

• 	     const struct image_sign_info *info,
  

• 	     const void *hash, const void *sig, uint sig_len)
  

+{

• const struct ecdsa_ops *ops = device_get_ops(dev);
• const struct checksum_algo *algo = info->checksum;
• struct ecdsa_public_key key;
• int sig_node, key_node, ret;
• if (!ops || !ops->verify)

• return -ENODEV;
  

• if (info->required_keynode > 0) {

• ret = fdt_get_key(&key, info->fdt_blob, info->required_keynode);
  

• if (ret < 0)
  

• 	return ret;
  

• return ops->verify(dev, &key, hash, algo->checksum_len,
  

• 		   sig, sig_len);
  

Need to indicate the used curve here as parameter of the verify opts ?

• }
• sig_node = fdt_subnode_offset(info->fdt_blob, 0, FIT_SIG_NODENAME);
• if (sig_node < 0)

• return -ENOENT;
  

• /* Try all possible keys under the "/signature" node */
• fdt_for_each_subnode(key_node, info->fdt_blob, sig_node) {

• ret = fdt_get_key(&key, info->fdt_blob, key_node);
  

• if (ret < 0)
  

• 	continue;
  

• ret = ops->verify(dev, &key, hash, algo->checksum_len,
  

• 		  sig, sig_len);
  

• /* On success, don't worry about remaining keys */
  

• if (ret == 0)
  

issue raised by chekpatch I think

if (!ret)

• 	return 0;
  

• }
• return -EPERM;

+}

int ecdsa_verify(struct image_sign_info *info, const struct image_region region[], int region_count, uint8_t *sig, uint sig_len) {

• return -EOPNOTSUPP;

• const struct checksum_algo *algo = info->checksum;
• uint8_t hash[algo->checksum_len];
• struct udevice *dev;
• int ret;
• ret = uclass_first_device(UCLASS_ECDSA, &dev);
• if (ret) {

• debug("ECDSA: Could not find ECDSA implementation: %d\n", ret);
  

• return ret;
  

• }
• ret = algo->calculate(algo->name, region, region_count, hash);
• if (ret < 0)

• return -EINVAL;
  

• return ecdsa_verify_hash(dev, info, hash, sig, sig_len); }

+/*

• • uclass definition for ECDSA API
• • We don't implement any wrappers around ecdsa_ops->verify() because it's
• • trivial to call ops->verify().
• */

+UCLASS_DRIVER(ecdsa) = {

• .id = UCLASS_ECDSA,
• .name = "ecdsa_verifier",

+};

Regards

Patrick