Add IV salts

raspberrypi · Feb 26, 2025 · da97d36 · da97d36
1 parent f813af6
commit da97d36
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/bootloaders/encrypted/CMakeLists.txt b/bootloaders/encrypted/CMakeLists.txt
@@ -85,7 +85,7 @@ add_linker_script(hello_serial_enc "0x20000000" "448k")
 # sign, hash, and encrypt
 pico_sign_binary(hello_serial_enc ${CMAKE_CURRENT_LIST_DIR}/private.pem)
 pico_hash_binary(hello_serial_enc)
-pico_encrypt_binary(hello_serial_enc ${CMAKE_CURRENT_LIST_DIR}/privateaes.bin)
+pico_encrypt_binary(hello_serial_enc ${CMAKE_CURRENT_LIST_DIR}/privateaes.bin ${CMAKE_CURRENT_LIST_DIR}/ivsalt.bin)
 
 # package uf2 in flash
 pico_package_uf2_output(hello_serial_enc 0x10000000)

diff --git a/bootloaders/encrypted/ivsalt.bin b/bootloaders/encrypted/ivsalt.bin
@@ -0,0 +1 @@
+���x��%�^��=T�Č
diff --git a/bootloaders/encrypted/otp.json b/bootloaders/encrypted/otp.json
@@ -1,5 +1,6 @@
 {
   "OTP_DATA_KEY1" : [ 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7 ],
   "OTP_DATA_KEY1_VALID" : "0x010101",
-  "PAGE30_LOCK0" : "0x494949"
+  "PAGE30_LOCK0" : "0x494949",
+  "PAGE31_LOCK0" : "0x494949"
 }
diff --git a/encrypted/hello_encrypted/CMakeLists.txt b/encrypted/hello_encrypted/CMakeLists.txt
@@ -34,6 +34,7 @@ pico_sign_binary(hello_encrypted ${CMAKE_CURRENT_LIST_DIR}/private.pem)
 pico_hash_binary(hello_encrypted)
 pico_encrypt_binary(hello_encrypted
     ${CMAKE_CURRENT_LIST_DIR}/privateaes.bin
+    ${CMAKE_CURRENT_LIST_DIR}/ivsalt.bin
     EMBED
     OTP_KEY_PAGE 29)
 

diff --git a/encrypted/hello_encrypted/ivsalt.bin b/encrypted/hello_encrypted/ivsalt.bin
@@ -0,0 +1 @@
+���x��%�^��=T�Č
diff --git a/encrypted/hello_encrypted/otp.json b/encrypted/hello_encrypted/otp.json
@@ -1,5 +1,6 @@
 {
   "OTP_DATA_KEY1" : [ 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7 ],
   "OTP_DATA_KEY1_VALID" : "0x010101",
-  "PAGE29_LOCK0" : "0x494949"
+  "PAGE29_LOCK0" : "0x494949",
+  "PAGE30_LOCK0" : "0x494949"
 }