aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-12-14 15:19:30 -0500
committerRob Austein <sra@hactrn.net>2016-12-14 15:19:30 -0500
commit0513b6b9cb383c4920814af8e476be41eb32cfa0 (patch)
tree750e6d818c1b10fd4ca6199c2425b7f6ca31f30a
parent5318fa839106c61b18af0038b147b977e29f59f3 (diff)
New releng branch "ksng".
Package up all the "new keystore" and "no SQL" changes as packages cryptech-alpha-ksng, to make it easier for others to test them.
-rw-r--r--.gitmodules3
m---------source/sw/libhal0
m---------source/sw/pkcs110
m---------source/sw/stm320
4 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 96d9f30..60a871e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,12 +43,15 @@
[submodule "source/sw/libhal"]
path = source/sw/libhal
url = https://git.cryptech.is/sw/libhal.git
+ branch = ksng
[submodule "source/sw/pkcs11"]
path = source/sw/pkcs11
url = https://git.cryptech.is/sw/pkcs11.git
+ branch = ksng
[submodule "source/sw/stm32"]
path = source/sw/stm32
url = https://git.cryptech.is/sw/stm32.git
+ branch = ksng
[submodule "source/sw/thirdparty/libtfm"]
path = source/sw/thirdparty/libtfm
url = https://git.cryptech.is/sw/thirdparty/libtfm.git
diff --git a/source/sw/libhal b/source/sw/libhal
-Subproject 1295f7ebbfaff3ad098fe9d4cafa32a1f375056
+Subproject 7dce4d6173ff3c2ee23670167ce6dc5d1fdefbb
diff --git a/source/sw/pkcs11 b/source/sw/pkcs11
-Subproject 1d60161a9eae18e339232bed879f0525925e10c
+Subproject 543fc948aaf35f31ef5100a3897bf15cf5fa0d0
diff --git a/source/sw/stm32 b/source/sw/stm32
-Subproject d172acba926b72c57c47697bd640c51c0fcb038
+Subproject c28f77d75105a31555c0eb45f45c76675248032