Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 13:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

rsa: use pkcs11 uri as defined in rfc7512

Browse source 
pkcs11 : change engine uri to use full pk11-URI as defined in:

https://www.rfc-editor.org/rfc/rfc7512.html
Signed-off-by: Ayoub Zaki <ayoub.zaki@embetrix.com>
This commit is contained in:
Ayoub Zaki 2023-08-26 13:53:29 +02:00 committed by Tom Rini
parent 05e8e2403c
commit ece85cc020
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/usage/fit/signature.rst
View file

@ -671,7 +671,7 @@ Create the fitImage::
Sign the fitImage with the hardware key:: Sign the fitImage with the hardware key::
$ ./tools/mkimage -F -k \ $ ./tools/mkimage -F -k \
"model=PKCS%2315%20emulated;manufacturer=ZeitControl;serial=000xxxxxxxxx;token=OpenPGP%20card%20%28User%20PIN%20%28sig%29%29" \ "pkcs11:model=PKCS%2315%20emulated;manufacturer=ZeitControl;serial=000xxxxxxxxx;token=OpenPGP%20card%20%28User%20PIN%20%28sig%29%29" \
-K u-boot.dtb -N pkcs11 -r fitImage -K u-boot.dtb -N pkcs11 -r fitImage

12
lib/rsa/rsa-sign.c
View file

@ -116,15 +116,15 @@ static int rsa_engine_get_pub_key(const char *keydir, const char *name,
if (keydir) if (keydir)
if (strstr(keydir, "object=")) if (strstr(keydir, "object="))
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"pkcs11:%s;type=public", "%s;type=public",
keydir); keydir);
else else
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"pkcs11:%s;object=%s;type=public", "%s;object=%s;type=public",
keydir, name); keydir, name);
else else
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"pkcs11:object=%s;type=public", "object=%s;type=public",
name); name);
} else if (engine_id) { } else if (engine_id) {
if (keydir) if (keydir)
@ -238,15 +238,15 @@ static int rsa_engine_get_priv_key(const char *keydir, const char *name,
if (keydir) if (keydir)
if (strstr(keydir, "object=")) if (strstr(keydir, "object="))
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"pkcs11:%s;type=private", "%s;type=private",
keydir); keydir);
else else
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"pkcs11:%s;object=%s;type=private", "%s;object=%s;type=private",
keydir, name); keydir, name);
else else
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"pkcs11:object=%s;type=private", "object=%s;type=private",
name); name);
} else if (engine_id) { } else if (engine_id) {
if (keydir && name) if (keydir && name)