diff options
| -rw-r--r-- | meta-oe/classes/signing.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/classes/signing.bbclass b/meta-oe/classes/signing.bbclass index 79944e3fe9..553d74e283 100644 --- a/meta-oe/classes/signing.bbclass +++ b/meta-oe/classes/signing.bbclass | |||
| @@ -161,11 +161,11 @@ signing_import_pubkey_from_pem() { | |||
| 161 | local pem="${2}" | 161 | local pem="${2}" |
| 162 | 162 | ||
| 163 | if [ -n "${IMPORT_PASS_FILE}" ]; then | 163 | if [ -n "${IMPORT_PASS_FILE}" ]; then |
| 164 | openssl rsa \ | 164 | openssl pkey \ |
| 165 | -passin "file:${IMPORT_PASS_FILE}" \ | 165 | -passin "file:${IMPORT_PASS_FILE}" \ |
| 166 | -in "${pem}" -inform pem -pubout -outform der | 166 | -in "${pem}" -inform pem -pubout -outform der |
| 167 | else | 167 | else |
| 168 | openssl rsa \ | 168 | openssl pkey \ |
| 169 | -in "${pem}" -inform pem -pubout -outform der | 169 | -in "${pem}" -inform pem -pubout -outform der |
| 170 | fi | | 170 | fi | |
| 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}" |
| @@ -189,11 +189,11 @@ signing_import_privkey_from_pem() { | |||
| 189 | local pem="${2}" | 189 | local pem="${2}" |
| 190 | 190 | ||
| 191 | if [ -n "${IMPORT_PASS_FILE}" ]; then | 191 | if [ -n "${IMPORT_PASS_FILE}" ]; then |
| 192 | openssl rsa \ | 192 | openssl pkey \ |
| 193 | -passin "file:${IMPORT_PASS_FILE}" \ | 193 | -passin "file:${IMPORT_PASS_FILE}" \ |
| 194 | -in "${pem}" -inform pem -outform der | 194 | -in "${pem}" -inform pem -outform der |
| 195 | else | 195 | else |
| 196 | openssl rsa \ | 196 | openssl pkey \ |
| 197 | -in "${pem}" -inform pem -outform der | 197 | -in "${pem}" -inform pem -outform der |
| 198 | fi | | 198 | fi | |
| 199 | signing_pkcs11_tool --type privkey --write-object /proc/self/fd/0 --label "${role}" | 199 | signing_pkcs11_tool --type privkey --write-object /proc/self/fd/0 --label "${role}" |
