This extends the keytoc utility to also handle ecdsa keys.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
scripts/keytoc.c | 130 ++++++++++++++++++++++++++++++++++++-----------
1 file changed, 99 insertions(+), 31 deletions(-)
diff --git a/scripts/keytoc.c b/scripts/keytoc.c
index be50ec86b9..b8ad386f9b 100644
--- a/scripts/keytoc.c
+++ b/scripts/keytoc.c
@@ -339,44 +339,70 @@ static int print_bignum(BIGNUM *num, int num_bits)
return 0;
}
-static int gen_key(const char *keyname, const char *path)
+static int gen_key_ecdsa(EVP_PKEY *key, const char *key_name, const char *key_name_c)
{
- BIGNUM *modulus, *r_squared;
- uint64_t exponent = 0;
- uint32_t n0_inv;
- int ret;
- int bits;
- EVP_PKEY *key;
- char *tmp, *key_name_c;
+ char group[128];
+ size_t outlen;
+ int ret, bits;
+ BIGNUM *key_x = NULL, *key_y = NULL;
- tmp = key_name_c = strdup(keyname);
+ ret = EVP_PKEY_get_int_param(key, "bits", &bits);
+ if (!ret)
+ return -EINVAL;
- while (*tmp) {
- if (*tmp == '-')
- *tmp = '_';
- tmp++;
- }
+ ret = EVP_PKEY_get_utf8_string_param(key, "group", group, sizeof(group), &outlen);
+ if (!ret)
+ return -EINVAL;
- if (!strncmp(path, "__ENV__", 7)) {
- const char *var = getenv(path + 7);
- if (!var) {
- fprintf(stderr,
- "environment variable \"%s\" is empty\n", path + 7);
- exit(1);
- }
- path = var;
- }
+ ret = EVP_PKEY_get_bn_param(key, OSSL_PKEY_PARAM_EC_PUB_X, &key_x);
+ if (!ret)
+ return -EINVAL;
- if (!strncmp(path, "pkcs11:", 7)) {
- ret = rsa_engine_get_pub_key(path, "pkcs11", &key);
- if (ret)
- exit(1);
+ ret = EVP_PKEY_get_bn_param(key, OSSL_PKEY_PARAM_EC_PUB_Y, &key_y);
+ if (!ret)
+ return -EINVAL;
+
+ if (dts) {
+ fprintf(outfilep, "\t\tkey-%s {\n", key_name_c);
+ fprintf(outfilep, "\t\t\tecdsa,x-point = <");
+ print_bignum(key_x, bits);
+ fprintf(outfilep, ">;\n");
+ fprintf(outfilep, "\t\t\tecdsa,y-point = <");
+ print_bignum(key_y, bits);
+ fprintf(outfilep, ">;\n");
+ fprintf(outfilep, "\t\t\tecdsa,curve = \"%s\";\n", group);
+ fprintf(outfilep, "\t\t};\n");
} else {
- ret = rsa_pem_get_pub_key(path, &key);
- if (ret)
- exit(1);
+ fprintf(outfilep, "\nstatic uint32_t %s_x[] = {", key_name_c);
+ print_bignum(key_x, bits);
+ fprintf(outfilep, "\n};\n\n");
+
+ fprintf(outfilep, "static uint32_t %s_y[] = {", key_name_c);
+ print_bignum(key_y, bits);
+ fprintf(outfilep, "\n};\n\n");
+
+ fprintf(outfilep, "static struct ecdsa_public_key %s = {\n", key_name_c);
+
+ fprintf(outfilep, "\t.curve_name = \"%s\",\n", group);
+ fprintf(outfilep, "\t.x = %s_x,\n", key_name_c);
+ fprintf(outfilep, "\t.y = %s_y,\n", key_name_c);
+ fprintf(outfilep, "};\n");
+ if (!standalone)
+ fprintf(outfilep, "\nstruct ecdsa_public_key *%s_ecdsa_p __attribute__((section(\".ecdsa_keys.rodata.%s\"))) = &%s;\n",
+ key_name_c, key_name_c, key_name_c);
}
+ return 0;
+}
+
+static int gen_key_rsa(EVP_PKEY *key, const char *key_name, const char *key_name_c)
+{
+ BIGNUM *modulus, *r_squared;
+ uint64_t exponent = 0;
+ uint32_t n0_inv;
+ int bits;
+ int ret;
+
ret = rsa_get_params(key, &exponent, &n0_inv, &modulus, &r_squared);
if (ret)
return ret;
@@ -419,7 +445,7 @@ static int gen_key(const char *keyname, const char *path)
fprintf(outfilep, "\t.modulus = %s_modulus,\n", key_name_c);
fprintf(outfilep, "\t.rr = %s_rr,\n", key_name_c);
fprintf(outfilep, "\t.exponent = 0x%0lx,\n", exponent);
- fprintf(outfilep, "\t.key_name_hint = \"%s\",\n", keyname);
+ fprintf(outfilep, "\t.key_name_hint = \"%s\",\n", key_name);
fprintf(outfilep, "};\n");
if (!standalone)
@@ -430,6 +456,47 @@ static int gen_key(const char *keyname, const char *path)
return 0;
}
+static int gen_key(const char *keyname, const char *path)
+{
+ int ret;
+ EVP_PKEY *key;
+ char *tmp, *key_name_c;
+
+ tmp = key_name_c = strdup(keyname);
+
+ while (*tmp) {
+ if (*tmp == '-')
+ *tmp = '_';
+ tmp++;
+ }
+
+ if (!strncmp(path, "__ENV__", 7)) {
+ const char *var = getenv(path + 7);
+ if (!var) {
+ fprintf(stderr,
+ "environment variable \"%s\" is empty\n", path + 7);
+ exit(1);
+ }
+ path = var;
+ }
+
+ if (!strncmp(path, "pkcs11:", 7)) {
+ ret = rsa_engine_get_pub_key(path, "pkcs11", &key);
+ if (ret)
+ exit(1);
+ } else {
+ ret = rsa_pem_get_pub_key(path, &key);
+ if (ret)
+ exit(1);
+ }
+
+ ret = gen_key_ecdsa(key, keyname, key_name_c);
+ if (ret)
+ ret = gen_key_rsa(key, keyname, key_name_c);
+
+ return 0;
+}
+
int main(int argc, char *argv[])
{
char *path, *keyname;
@@ -477,6 +544,7 @@ int main(int argc, char *argv[])
else
fprintf(outfilep, "\tsignature {\n");
} else if (standalone) {
+ fprintf(outfilep, "#include <ecdsa.h>\n");
fprintf(outfilep, "#include <rsa.h>\n");
}
--
2.39.2
