From 52d276671de491e2a3425e92a1f118e2246f4ea7 Mon Sep 17 00:00:00 2001 From: Guillaume Endignoux Date: Thu, 23 Jul 2020 15:06:16 +0200 Subject: [PATCH 1/3] Pin Tockloader to version 1.4, as a temporary workaround until we migrate to 1.5. --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 493297f..ad9cbd1 100755 --- a/setup.sh +++ b/setup.sh @@ -86,7 +86,7 @@ source tools/gen_key_materials.sh generate_crypto_materials N rustup install $(head -n 1 rust-toolchain) -pip3 install --user --upgrade 'tockloader~=1.4' six intelhex +pip3 install --user --upgrade 'tockloader==1.4' six intelhex rustup target add thumbv7em-none-eabi # Install dependency to create applications. From b6c6392aaa3c04a8cf19bc87901f527fd124a314 Mon Sep 17 00:00:00 2001 From: Guillaume Endignoux Date: Thu, 23 Jul 2020 15:11:11 +0200 Subject: [PATCH 2/3] Pin tockloader in workflows. --- .github/workflows/python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 6df27d9..19b0d97 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -22,7 +22,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel - pip install 'tockloader~=1.4' pylint + pip install 'tockloader==1.4' pylint - name: Register matcher run: echo ::add-matcher::./.github/python_matcher.json - name: Test code with pylint From d70cc7f8ea5559758ab58a44f3c07db9b0b0d1c9 Mon Sep 17 00:00:00 2001 From: Guillaume Endignoux Date: Fri, 24 Jul 2020 10:34:26 +0200 Subject: [PATCH 3/3] Update reference binaries. --- .../reference_binaries_macos-10.15.sha256sum | 10 +++++----- .../reference_binaries_ubuntu-18.04.sha256sum | 10 +++++----- reproducible/reference_elf2tab_macos-10.15.txt | 16 ++++++++-------- reproducible/reference_elf2tab_ubuntu-18.04.txt | 16 ++++++++-------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/reproducible/reference_binaries_macos-10.15.sha256sum b/reproducible/reference_binaries_macos-10.15.sha256sum index 5d79023..d2311bf 100644 --- a/reproducible/reference_binaries_macos-10.15.sha256sum +++ b/reproducible/reference_binaries_macos-10.15.sha256sum @@ -1,9 +1,9 @@ 0b54df6d548849e24d67b9b022ca09cb33c51f078ce85d0c9c4635ffc69902e1 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840dk.bin -8a804b9a1f60f47c315cf5b41e0457f43c74c9e8a4809d22d40d7696f927e41a target/nrf52840dk_merged.hex +9726082139399889fde1d5aa4005596eecd60726201e02a522aa25870109d252 target/nrf52840dk_merged.hex 052eec0ae526038352b9f7573468d0cf7fb5ec331d4dc1a2df75fdbd514ea5ca third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle.bin -557fc612af0cd8f7684a4016fe73f1db64da1b4786b4621149f66084426b2b79 target/nrf52840_dongle_merged.hex +5cf5599d001a9f7be80132b3e83c2a5e28e9c6a70b79058b266a23527e754d41 target/nrf52840_dongle_merged.hex 908d7f4f40936d968b91ab6e19b2406612fe8c2c273d9c0b71ef1f55116780e0 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle_dfu.bin -e101d1b0c61bff363279c4cef61d10fd1ca1d9626fb5106bc7dacea29678a611 target/nrf52840_dongle_dfu_merged.hex +69524a8538ae65637dfaf8709b9cfb4730858dea56d96ae304163d6f5d0dabe0 target/nrf52840_dongle_dfu_merged.hex 34ecbecaebf1188277f2310fe769c8c60310d8576493242712854deb4ba1036e third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_mdk_dfu.bin -ee2ba07f4de6cbabd5086f18e7774dab03ad4ba9cc1e0a40c4b512de71eb1e27 target/nrf52840_mdk_dfu_merged.hex -fcebf94765240c91fc9af727470bad5179f4b41fca49a6afdc09899eab25c0cd target/tab/ctap2.tab +276bec775183524eb7dbbd107416d90dbadb853771deaa8f49f1baf9d0f216e1 target/nrf52840_mdk_dfu_merged.hex +8e7ad6778dbb86e13613a30487c41b9086f7fe55dc0db234968eb52750b8a94c target/tab/ctap2.tab diff --git a/reproducible/reference_binaries_ubuntu-18.04.sha256sum b/reproducible/reference_binaries_ubuntu-18.04.sha256sum index ca4a333..d54ddc1 100644 --- a/reproducible/reference_binaries_ubuntu-18.04.sha256sum +++ b/reproducible/reference_binaries_ubuntu-18.04.sha256sum @@ -1,9 +1,9 @@ 29382e72d0f3c6a72ce9517211952ff29ea270193d7f0ddc48ca69009ee29925 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840dk.bin -40ac6af2fd714c0edd8dded04ca86a13f0d99eb7ec4342e417e0786a97971f2b target/nrf52840dk_merged.hex +f48b98125b06b81ba3c62657bfd9aee9c2b81a1307173d2a73f110f7cdb29513 target/nrf52840dk_merged.hex 30f239390ae9bef0825731e4c82d40470fc5e9bded2bf0d942e92dbb5d4faba1 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle.bin -67e98f4e5d3905870ea56dffb0be98609b15d571ebc5281bee14e580daf0f972 target/nrf52840_dongle_merged.hex +97f0998c06c622c92a4504b6f416f548e5b47a1a9b592c6a98ca338450990419 target/nrf52840_dongle_merged.hex e3acf15d5ae3a22aecff6cc58db5fc311f538f47328d348b7ad7db7f9ab5e72c third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle_dfu.bin -e86d6eb6aa23b71deee451dbf927ae29cce3c0f8fa4463620188e9adfdec968d target/nrf52840_dongle_dfu_merged.hex +bf5a5745d76eeeb38908f6179d5ba07ac2578dd1b55f95e9440cdf893d850ffc target/nrf52840_dongle_dfu_merged.hex cae312a26a513ada6c198fdc59b2bba3860c51726b817a9fd17a4331ee12c882 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_mdk_dfu.bin -4e507329a04f16928ae02e39a4e4984783cfe8ed20a56988250d57d64c0ab848 target/nrf52840_mdk_dfu_merged.hex -cd262c3ef11ba5e69cf8033271b15c91ef6b88e25e9ec25af1b39248fb0a0574 target/tab/ctap2.tab +6b2da0ff3af55e7fe86177a8d795baab3752a59c55bf0bb0af2fcfec1c983e57 target/nrf52840_mdk_dfu_merged.hex +26706e2fefe6894ffbaa0681454aeda24c69d8aeb5289f8c0e4428cdc7c4fc59 target/tab/ctap2.tab diff --git a/reproducible/reference_elf2tab_macos-10.15.txt b/reproducible/reference_elf2tab_macos-10.15.txt index e86f0fe..c5fc225 100644 --- a/reproducible/reference_elf2tab_macos-10.15.txt +++ b/reproducible/reference_elf2tab_macos-10.15.txt @@ -5,8 +5,8 @@ Min RAM size from sections in ELF: 16 bytes Number of writeable flash regions: 0 Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Entry point is in .text section - Adding .text section. Offset: 128 (0x80). Length: 178804 (0x2ba74) bytes. - Adding .stack section. Offset: 178932 (0x2baf4). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 179332 (0x2bc84) bytes. + Adding .stack section. Offset: 179460 (0x2bd04). Length: 16384 (0x4000) bytes. Searching for .rel.X sections to add. TBF Header: version: 2 0x2 @@ -24,8 +24,8 @@ Min RAM size from sections in ELF: 16 bytes Number of writeable flash regions: 0 Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Entry point is in .text section - Adding .text section. Offset: 128 (0x80). Length: 178804 (0x2ba74) bytes. - Adding .stack section. Offset: 178932 (0x2baf4). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 179332 (0x2bc84) bytes. + Adding .stack section. Offset: 179460 (0x2bd04). Length: 16384 (0x4000) bytes. Searching for .rel.X sections to add. TBF Header: version: 2 0x2 @@ -43,8 +43,8 @@ Min RAM size from sections in ELF: 16 bytes Number of writeable flash regions: 0 Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Entry point is in .text section - Adding .text section. Offset: 128 (0x80). Length: 178804 (0x2ba74) bytes. - Adding .stack section. Offset: 178932 (0x2baf4). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 179332 (0x2bc84) bytes. + Adding .stack section. Offset: 179460 (0x2bd04). Length: 16384 (0x4000) bytes. Searching for .rel.X sections to add. TBF Header: version: 2 0x2 @@ -62,8 +62,8 @@ Min RAM size from sections in ELF: 16 bytes Number of writeable flash regions: 0 Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Entry point is in .text section - Adding .text section. Offset: 128 (0x80). Length: 178804 (0x2ba74) bytes. - Adding .stack section. Offset: 178932 (0x2baf4). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 179332 (0x2bc84) bytes. + Adding .stack section. Offset: 179460 (0x2bd04). Length: 16384 (0x4000) bytes. Searching for .rel.X sections to add. TBF Header: version: 2 0x2 diff --git a/reproducible/reference_elf2tab_ubuntu-18.04.txt b/reproducible/reference_elf2tab_ubuntu-18.04.txt index c57cb24..8a50445 100644 --- a/reproducible/reference_elf2tab_ubuntu-18.04.txt +++ b/reproducible/reference_elf2tab_ubuntu-18.04.txt @@ -5,8 +5,8 @@ Min RAM size from sections in ELF: 16 bytes Number of writeable flash regions: 0 Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Entry point is in .text section - Adding .text section. Offset: 128 (0x80). Length: 180148 (0x2bfb4) bytes. - Adding .stack section. Offset: 180276 (0x2c034). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 178788 (0x2ba64) bytes. + Adding .stack section. Offset: 178916 (0x2bae4). Length: 16384 (0x4000) bytes. Searching for .rel.X sections to add. TBF Header: version: 2 0x2 @@ -24,8 +24,8 @@ Min RAM size from sections in ELF: 16 bytes Number of writeable flash regions: 0 Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Entry point is in .text section - Adding .text section. Offset: 128 (0x80). Length: 180148 (0x2bfb4) bytes. - Adding .stack section. Offset: 180276 (0x2c034). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 178788 (0x2ba64) bytes. + Adding .stack section. Offset: 178916 (0x2bae4). Length: 16384 (0x4000) bytes. Searching for .rel.X sections to add. TBF Header: version: 2 0x2 @@ -43,8 +43,8 @@ Min RAM size from sections in ELF: 16 bytes Number of writeable flash regions: 0 Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Entry point is in .text section - Adding .text section. Offset: 128 (0x80). Length: 180148 (0x2bfb4) bytes. - Adding .stack section. Offset: 180276 (0x2c034). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 178788 (0x2ba64) bytes. + Adding .stack section. Offset: 178916 (0x2bae4). Length: 16384 (0x4000) bytes. Searching for .rel.X sections to add. TBF Header: version: 2 0x2 @@ -62,8 +62,8 @@ Min RAM size from sections in ELF: 16 bytes Number of writeable flash regions: 0 Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Entry point is in .text section - Adding .text section. Offset: 128 (0x80). Length: 180148 (0x2bfb4) bytes. - Adding .stack section. Offset: 180276 (0x2c034). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 178788 (0x2ba64) bytes. + Adding .stack section. Offset: 178916 (0x2bae4). Length: 16384 (0x4000) bytes. Searching for .rel.X sections to add. TBF Header: version: 2 0x2