From 950d90ff633146e462ca44f466752ce3760c56d7 Mon Sep 17 00:00:00 2001 From: Fabian Kaczmarczyck Date: Thu, 9 Jul 2020 11:26:42 +0200 Subject: [PATCH] moves enum-iterator dependency to dev and updates binary reference values --- Cargo.toml | 2 +- .../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 ++++++++-------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 295abe4..6a065a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,6 @@ crypto = { path = "libraries/crypto" } byteorder = { version = "1", default-features = false } arrayref = "0.3.6" subtle = { version = "2.2", default-features = false, features = ["nightly"] } -enum-iterator = "0.6.0" [features] debug_allocations = ["libtock/debug_allocations"] @@ -30,6 +29,7 @@ with_ctap2_1 = [] [dev-dependencies] elf2tab = "0.4.0" +enum-iterator = "0.6.0" [build-dependencies] openssl = "0.10" diff --git a/reproducible/reference_binaries_macos-10.15.sha256sum b/reproducible/reference_binaries_macos-10.15.sha256sum index ee54c1f..a7b4da3 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 -136480e054c13cb3502a78f47b6496f0488adc001a568508f6fbb0bb92715317 target/nrf52840dk_merged.hex +ff9ac2aaab5972d10e0156c18ccf319fc8bd3a9f4ac428c406dfb2a90b63af49 target/nrf52840dk_merged.hex 052eec0ae526038352b9f7573468d0cf7fb5ec331d4dc1a2df75fdbd514ea5ca third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle.bin -21602fe8f25e329e80989e97c637ec8a2f1b02d2a88de636a06632465012a9c9 target/nrf52840_dongle_merged.hex +50dfc3b2e78c3ddd1bbf814368908434b5abdc072488a9022dd100be164fa9c1 target/nrf52840_dongle_merged.hex 908d7f4f40936d968b91ab6e19b2406612fe8c2c273d9c0b71ef1f55116780e0 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle_dfu.bin -40d176b43006dc3b2aaabfffab6210153d99641d9835e953cb48769f58d4cc48 target/nrf52840_dongle_dfu_merged.hex +cf38f8c47556934a7d12753e1a2e9ba5db649a422af99674c6fe9067eb6748b3 target/nrf52840_dongle_dfu_merged.hex 34ecbecaebf1188277f2310fe769c8c60310d8576493242712854deb4ba1036e third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_mdk_dfu.bin -a3cf456e2f8e8216be891d7d4153c72535029c538612395a843bee65e573f8ba target/nrf52840_mdk_dfu_merged.hex -9fcc808b6df7d773cbe8740fbe33fa6522011991a9ed777656ba0ae67d6e8767 target/tab/ctap2.tab +14d03222b622adabeaf2adff9a2588709b8602726672f0730ba16792a260dc67 target/nrf52840_mdk_dfu_merged.hex +84e78ef82f3f77a8d22714de4f0257e5b003473b04f52589bc62c1aa94d85724 target/tab/ctap2.tab diff --git a/reproducible/reference_binaries_ubuntu-18.04.sha256sum b/reproducible/reference_binaries_ubuntu-18.04.sha256sum index bed5f19..0a52512 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 -0c2732e9051d2a920a1b0c8ef1094d920145e34a169af24b25109685b913ba6a target/nrf52840dk_merged.hex +a80bc933736a15f918ec984bbec301e196b445a67656bb937d96a22f24b85990 target/nrf52840dk_merged.hex 30f239390ae9bef0825731e4c82d40470fc5e9bded2bf0d942e92dbb5d4faba1 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle.bin -d99d216f5c231b87e50b193dcb2cbdd8e09c5cee605abd72456da905832fece3 target/nrf52840_dongle_merged.hex +0d999587f229b62cb0d30b23e444a26ff73daa8b5266b5c09e4cd650f42b8302 target/nrf52840_dongle_merged.hex e3acf15d5ae3a22aecff6cc58db5fc311f538f47328d348b7ad7db7f9ab5e72c third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle_dfu.bin -56845828e90e595388a0a219b5a9a5eda6f768d0e5cc7e2b1712ce5b4b2f848d target/nrf52840_dongle_dfu_merged.hex +44447e028aed01a79c024fd77214b2d59d8a4ab0e424a42bb5d05379805ab302 target/nrf52840_dongle_dfu_merged.hex cae312a26a513ada6c198fdc59b2bba3860c51726b817a9fd17a4331ee12c882 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_mdk_dfu.bin -7028d2253d30e5a809f4d3c2deb4cb46953a9de31978834f01a3b1392da38291 target/nrf52840_mdk_dfu_merged.hex -f96c01efac9382c001d0e277247ff20f9b17b0bb34b98a38f0e4e9cc5c3c0b90 target/tab/ctap2.tab +a9e46744083ed71735ebf5d2bfff76eb37249cf7b9bbe2fdd53682454c9e4ded target/nrf52840_mdk_dfu_merged.hex +121b4c9da41012e5037d61435100a45a69f1bd8fc8e3bb9901d4ec5d5185adee target/tab/ctap2.tab diff --git a/reproducible/reference_elf2tab_macos-10.15.txt b/reproducible/reference_elf2tab_macos-10.15.txt index 1972223..428df84 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: 179172 (0x2bbe4) bytes. - Adding .stack section. Offset: 179300 (0x2bc64). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 176676 (0x2b224) bytes. + Adding .stack section. Offset: 176804 (0x2b2a4). 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: 179172 (0x2bbe4) bytes. - Adding .stack section. Offset: 179300 (0x2bc64). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 176676 (0x2b224) bytes. + Adding .stack section. Offset: 176804 (0x2b2a4). 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: 179172 (0x2bbe4) bytes. - Adding .stack section. Offset: 179300 (0x2bc64). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 176676 (0x2b224) bytes. + Adding .stack section. Offset: 176804 (0x2b2a4). 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: 179172 (0x2bbe4) bytes. - Adding .stack section. Offset: 179300 (0x2bc64). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 176676 (0x2b224) bytes. + Adding .stack section. Offset: 176804 (0x2b2a4). 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 2571f3b..c946cec 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: 178740 (0x2ba34) bytes. - Adding .stack section. Offset: 178868 (0x2bab4). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 176036 (0x2afa4) bytes. + Adding .stack section. Offset: 176164 (0x2b024). 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: 178740 (0x2ba34) bytes. - Adding .stack section. Offset: 178868 (0x2bab4). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 176036 (0x2afa4) bytes. + Adding .stack section. Offset: 176164 (0x2b024). 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: 178740 (0x2ba34) bytes. - Adding .stack section. Offset: 178868 (0x2bab4). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 176036 (0x2afa4) bytes. + Adding .stack section. Offset: 176164 (0x2b024). 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: 178740 (0x2ba34) bytes. - Adding .stack section. Offset: 178868 (0x2bab4). Length: 16384 (0x4000) bytes. + Adding .text section. Offset: 128 (0x80). Length: 176036 (0x2afa4) bytes. + Adding .stack section. Offset: 176164 (0x2b024). Length: 16384 (0x4000) bytes. Searching for .rel.X sections to add. TBF Header: version: 2 0x2