aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-08-10 19:25:31 -0400
committerRob Austein <sra@hactrn.net>2016-08-10 19:25:31 -0400
commit39f7549c27cdfc5eb2f0456841d9427b55ea47c3 (patch)
tree93fc561333602a685e5012c458f8b5bc11f09b57
parentcd445b69b2caa7205f4e1c368aa2c6bf8c2d7692 (diff)
Updated tamper code; new port of libcli; libhal / PKCS #11 bugfixes.
-rw-r--r--.gitmodules12
-rw-r--r--Makefile2
m---------source/sw/libhal0
m---------source/sw/pkcs110
m---------source/sw/stm320
m---------source/sw/tamper0
m---------source/user/ft/libcli0
m---------source/user/ln5/tamper0
m---------source/user/paul/libcli0
9 files changed, 7 insertions, 7 deletions
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
-Subproject 9960e43c1a6b7f83b4a345acedbda56fbeaaae0
+Subproject 3822886e6e945d45b3c5b0a3d6fa4758dad0748
diff --git a/source/sw/pkcs11 b/source/sw/pkcs11
-Subproject 9cfb3fbc22f3e79ec16a037e2c3140cd9c7c634
+Subproject 133bb3907f478e3ccc1dc8f8fb15e924f37a0d9
diff --git a/source/sw/stm32 b/source/sw/stm32
-Subproject ab32270b0a9beae744597e2a3746bd3d49aaee8
+Subproject e3fe7d89b6094bfef42f42329e15631f684f074
diff --git a/source/sw/tamper b/source/sw/tamper
new file mode 160000
+Subproject 2b6a62adaaaf0396fd401d2aef6f45ac1a0da23
diff --git a/source/user/ft/libcli b/source/user/ft/libcli
deleted file mode 160000
-Subproject 54c6b8649b1a13e69a908c96e8d4d19cf8d7284
diff --git a/source/user/ln5/tamper b/source/user/ln5/tamper
deleted file mode 160000
-Subproject 614f4cf63d794b4349137f58f08baea5c4cedf7
diff --git a/source/user/paul/libcli b/source/user/paul/libcli
new file mode 160000
+Subproject 96e89d34eb2acfd71de6ed38d7029d7f662b9ad