summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <sha@pengutronix.de>2024-02-23 09:45:44 +0100
committerKhem Raj <raj.khem@gmail.com>2024-02-23 09:17:42 -0800
commit30d1eb08b42e9eeb76037fdc8613610878ba1092 (patch)
treedee4e2f4e83def4ff89d05e68a1f4b4514001ce5
parentb757ba3028af9dda48e3d516bcbb30525d1369d5 (diff)
downloadmeta-openembedded-30d1eb08b42e9eeb76037fdc8613610878ba1092.tar.gz
signing.bbclass: fix wrong function name
The function signing_import_pubkey_from_pem is defined twice, one of them should really be named signing_import_pubkey_from_der. Fix this and while at it fix some argument names in the comments above the functions as well. Reported-by: Miklos Toth <Miklos.Toth@knorr-bremse.com> Fixes: 4a6ac691f ("add signing.bbclass as infrastructure for build artifact signing") Signed-off-by: Sascha Hauer <sha@pengutronix.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/classes/signing.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/classes/signing.bbclass b/meta-oe/classes/signing.bbclass
index 553d74e28..ec076d968 100644
--- a/meta-oe/classes/signing.bbclass
+++ b/meta-oe/classes/signing.bbclass
@@ -142,10 +142,10 @@ signing_import_cert_from_pem() {
142 signing_pkcs11_tool --type cert --write-object /proc/self/fd/0 --label "${role}" 142 signing_pkcs11_tool --type cert --write-object /proc/self/fd/0 --label "${role}"
143} 143}
144 144
145# signing_import_pubkey_from_der <role> <pem> 145# signing_import_pubkey_from_der <role> <der>
146# 146#
147# Import a public key from DER file to a role. To be used with SoftHSM. 147# Import a public key from DER file to a role. To be used with SoftHSM.
148signing_import_pubkey_from_pem() { 148signing_import_pubkey_from_der() {
149 local role="${1}" 149 local role="${1}"
150 local der="${2}" 150 local der="${2}"
151 151
@@ -171,7 +171,7 @@ signing_import_pubkey_from_pem() {
171 signing_pkcs11_tool --type pubkey --write-object /proc/self/fd/0 --label "${role}" 171 signing_pkcs11_tool --type pubkey --write-object /proc/self/fd/0 --label "${role}"
172} 172}
173 173
174# signing_import_privkey_from_der <role> <pem> 174# signing_import_privkey_from_der <role> <der>
175# 175#
176# Import a private key from DER file to a role. To be used with SoftHSM. 176# Import a private key from DER file to a role. To be used with SoftHSM.
177signing_import_privkey_from_der() { 177signing_import_privkey_from_der() {