From 39f7549c27cdfc5eb2f0456841d9427b55ea47c3 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 10 Aug 2016 19:25:31 -0400 Subject: Updated tamper code; new port of libcli; libhal / PKCS #11 bugfixes. --- .gitmodules | 12 ++++++------ Makefile | 2 +- source/sw/libhal | 2 +- source/sw/pkcs11 | 2 +- source/sw/stm32 | 2 +- source/sw/tamper | 1 + source/user/ft/libcli | 1 - source/user/ln5/tamper | 1 - source/user/paul/libcli | 1 + 9 files changed, 12 insertions(+), 12 deletions(-) create mode 160000 source/sw/tamper delete mode 160000 source/user/ft/libcli delete mode 160000 source/user/ln5/tamper create mode 160000 source/user/paul/libcli diff --git a/.gitmodules b/.gitmodules index 5736430..96d9f30 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,9 +52,9 @@ [submodule "source/sw/thirdparty/libtfm"] path = source/sw/thirdparty/libtfm url = https://git.cryptech.is/sw/thirdparty/libtfm.git -[submodule "source/user/ft/libcli"] - path = source/user/ft/libcli - url = https://git.cryptech.is/user/ft/libcli.git -[submodule "source/user/ln5/tamper"] - path = source/user/ln5/tamper - url = https://git.cryptech.is/user/ln5/tamper.git +[submodule "source/sw/tamper"] + path = source/sw/tamper + url = https://git.cryptech.is/sw/tamper.git +[submodule "source/user/paul/libcli"] + path = source/user/paul/libcli + url = https://git.cryptech.is/user/paul/libcli.git diff --git a/Makefile b/Makefile index 66282c8..17f6f10 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ REPO_UPLOAD_DIRS := apt brew FIRMWARE_TARBALL := source/cryptech-alpha-firmware.tar.gz BITSTREAM := build/core/platform/alpha/build/alpha_fmc.bit ELVES := build/sw/stm32/projects/bootloader/bootloader.elf build/sw/stm32/projects/hsm/hsm.elf -TAMPER := build/user/ln5/tamper/tamper.hex +TAMPER := build/sw/tamper/tamper.hex # Command to generate a new changelog containing one entry. # Does nothing if the changelog already exists. diff --git a/source/sw/libhal b/source/sw/libhal index 9960e43..3822886 160000 --- a/source/sw/libhal +++ b/source/sw/libhal @@ -1 +1 @@ -Subproject commit 9960e43c1a6b7f83b4a345acedbda56fbeaaae0c +Subproject commit 3822886e6e945d45b3c5b0a3d6fa4758dad07487 diff --git a/source/sw/pkcs11 b/source/sw/pkcs11 index 9cfb3fb..133bb39 160000 --- a/source/sw/pkcs11 +++ b/source/sw/pkcs11 @@ -1 +1 @@ -Subproject commit 9cfb3fbc22f3e79ec16a037e2c3140cd9c7c634c +Subproject commit 133bb3907f478e3ccc1dc8f8fb15e924f37a0d97 diff --git a/source/sw/stm32 b/source/sw/stm32 index ab32270..e3fe7d8 160000 --- a/source/sw/stm32 +++ b/source/sw/stm32 @@ -1 +1 @@ -Subproject commit ab32270b0a9beae744597e2a3746bd3d49aaee89 +Subproject commit e3fe7d89b6094bfef42f42329e15631f684f0748 diff --git a/source/sw/tamper b/source/sw/tamper new file mode 160000 index 0000000..2b6a62a --- /dev/null +++ b/source/sw/tamper @@ -0,0 +1 @@ +Subproject commit 2b6a62adaaaf0396fd401d2aef6f45ac1a0da23c diff --git a/source/user/ft/libcli b/source/user/ft/libcli deleted file mode 160000 index 54c6b86..0000000 --- a/source/user/ft/libcli +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 54c6b8649b1a13e69a908c96e8d4d19cf8d72845 diff --git a/source/user/ln5/tamper b/source/user/ln5/tamper deleted file mode 160000 index 614f4cf..0000000 --- a/source/user/ln5/tamper +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 614f4cf63d794b4349137f58f08baea5c4cedf7d diff --git a/source/user/paul/libcli b/source/user/paul/libcli new file mode 160000 index 0000000..96e89d3 --- /dev/null +++ b/source/user/paul/libcli @@ -0,0 +1 @@ +Subproject commit 96e89d34eb2acfd71de6ed38d7029d7f662b9ad5 -- cgit v1.2.3