From 0513b6b9cb383c4920814af8e476be41eb32cfa0 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 14 Dec 2016 15:19:30 -0500 Subject: 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. --- .gitmodules | 3 +++ source/sw/libhal | 2 +- source/sw/pkcs11 | 2 +- source/sw/stm32 | 2 +- 4 files changed, 6 insertions(+), 3 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 index 1295f7e..7dce4d6 160000 --- a/source/sw/libhal +++ b/source/sw/libhal @@ -1 +1 @@ -Subproject commit 1295f7ebbfaff3ad098fe9d4cafa32a1f3750563 +Subproject commit 7dce4d6173ff3c2ee23670167ce6dc5d1fdefbb6 diff --git a/source/sw/pkcs11 b/source/sw/pkcs11 index 1d60161..543fc94 160000 --- a/source/sw/pkcs11 +++ b/source/sw/pkcs11 @@ -1 +1 @@ -Subproject commit 1d60161a9eae18e339232bed879f0525925e10cb +Subproject commit 543fc948aaf35f31ef5100a3897bf15cf5fa0d0d diff --git a/source/sw/stm32 b/source/sw/stm32 index d172acb..c28f77d 160000 --- a/source/sw/stm32 +++ b/source/sw/stm32 @@ -1 +1 @@ -Subproject commit d172acba926b72c57c47697bd640c51c0fcb038d +Subproject commit c28f77d75105a31555c0eb45f45c76675248032f -- cgit v1.2.3