Skip to content

Support PKCS11 keys for CM4 and other 4 family Pis #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Support PKCS11 keys for CM4 and other 4 family Pis #152

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10a6142
fix: make it so that pkcs11 works
kenanjasim Apr 1, 2025
bee026f
fix: add breaks if pkcs11 is used on pi5s
kenanjasim Apr 1, 2025
a337581
Merge pull request #1 from kenanjasim/fix/pkcs11_provisioning_11654
kenanjasim Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions service/rpi-sb-provisioner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,11 @@ timeout_fatal() {
CUSTOMER_PUBLIC_KEY_FILE=
derivePublicKey() {
CUSTOMER_PUBLIC_KEY_FILE="$(mktemp)"
"${OPENSSL}" rsa -in "${CUSTOMER_KEY_FILE_PEM}" -pubout > "${CUSTOMER_PUBLIC_KEY_FILE}"
if [ -n "${CUSTOMER_KEY_PKCS11_NAME}" ]; then
"${OPENSSL}" pkey -engine pkcs11 -inform engine -in "${CUSTOMER_KEY_PKCS11_NAME}" -pubout -out "${CUSTOMER_PUBLIC_KEY_FILE}"
else
"${OPENSSL}" rsa -in "${CUSTOMER_KEY_FILE_PEM}" -pubout > "${CUSTOMER_PUBLIC_KEY_FILE}"
fi
}

TMP_DIR=""
Expand Down Expand Up @@ -179,7 +183,7 @@ update_eeprom() {

keywriter_log "update_eeprom() src_image: \"${src_image}\""

if [ -n "${pem_file}" ]; then
if [ -n "${pem_file}" ] || [ -n "${CUSTOMER_KEY_PKCS11_NAME}" ]; then
if ! grep -q "SIGNED_BOOT=1" "${RPI_DEVICE_BOOTLOADER_CONFIG_FILE}"; then
# If the OTP bit to require secure boot are set then then
# SIGNED_BOOT=1 is implicitly set in the EEPROM config.
Expand All @@ -206,6 +210,9 @@ update_eeprom() {
cp "${src_image}" "${dst_image}.intermediate"
;;
5)
if [ -n "${CUSTOMER_KEY_PKCS11_NAME}" ]; then
die "PKCS11 keys are not supported for Raspberry Pi 5-class devices"
fi
customer_signed_bootcode_binary_workdir=$(mktemp -d)
cd "${customer_signed_bootcode_binary_workdir}" || return
rpi-eeprom-config -x "${src_image}"
Expand Down Expand Up @@ -678,6 +685,9 @@ case "${RPI_DEVICE_FAMILY}" in
FASTBOOT_SIGN_DIR=$(mktemp -d)
cd "${FASTBOOT_SIGN_DIR}"
tar -vxf /usr/share/rpiboot/mass-storage-gadget64/bootfiles.bin
if [ -n "${CUSTOMER_KEY_PKCS11_NAME}" ]; then
die "PKCS11 keys are not supported for Raspberry Pi 5-class devices"
fi
rpi-sign-bootcode --debug -c 2712 -i 2712/bootcode5.bin -o 2712/bootcode5.bin.signed -k "${CUSTOMER_KEY_FILE_PEM}" -v 0 -n 16
mv -f "2712/bootcode5.bin.signed" "2712/bootcode5.bin"
tar -vcf "${RPI_SB_WORKDIR}/bootfiles.bin" -- *
Expand Down