From 07682854f37e4953e2f8bf0ba093ce95ffd4695a Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 21 Dec 2015 02:30:50 -0500 Subject: Catch up on last few months' changes. --- .gitmodules | 3 --- core/cipher/aes | 2 +- core/comm/eim | 2 +- core/hash/sha1 | 2 +- core/hash/sha256 | 2 +- core/hash/sha512 | 2 +- core/math/modexp | 2 +- core/math/modexps6 | 2 +- core/platform/common | 2 +- core/platform/novena | 2 +- core/rng/avalanche_entropy | 2 +- core/rng/rosc_entropy | 2 +- core/rng/trng | 2 +- sw/libhal | 2 +- sw/pkcs11 | 2 +- sw/thirdparty/libtfm | 2 +- 16 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.gitmodules b/.gitmodules index d311f5b..0bfded7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,11 +28,9 @@ [submodule "core/platform/common"] path = core/platform/common url = git@git.cryptech.is:core/platform/common.git - branch = modexps6 [submodule "core/platform/novena"] path = core/platform/novena url = git@git.cryptech.is:core/platform/novena.git - branch = modexps6 [submodule "core/rng/avalanche_entropy"] path = core/rng/avalanche_entropy url = git@git.cryptech.is:core/rng/avalanche_entropy.git @@ -51,4 +49,3 @@ [submodule "core/math/modexps6"] path = core/math/modexps6 url = git@git.cryptech.is:core/math/modexps6.git - branch = modexps6 diff --git a/core/cipher/aes b/core/cipher/aes index c8271a6..9157592 160000 --- a/core/cipher/aes +++ b/core/cipher/aes @@ -1 +1 @@ -Subproject commit c8271a639a6b59de1e7414e453e173f9e4458ef5 +Subproject commit 915759285c179cf99be3c17ad401c79e4b8be054 diff --git a/core/comm/eim b/core/comm/eim index 9ed8ee7..7d2c69e 160000 --- a/core/comm/eim +++ b/core/comm/eim @@ -1 +1 @@ -Subproject commit 9ed8ee7596023a6f4e43d8468bbdd0473c6570ed +Subproject commit 7d2c69e9e5c157ec02f563331371e54fb7430a5b diff --git a/core/hash/sha1 b/core/hash/sha1 index febb275..ae915a1 160000 --- a/core/hash/sha1 +++ b/core/hash/sha1 @@ -1 +1 @@ -Subproject commit febb27562431216a080cb980fdcda09454e72c38 +Subproject commit ae915a1ed47a807ec880c2f18053e4f8eda6bd93 diff --git a/core/hash/sha256 b/core/hash/sha256 index 0165294..c967484 160000 --- a/core/hash/sha256 +++ b/core/hash/sha256 @@ -1 +1 @@ -Subproject commit 0165294513694ed208c44231992bf5e7f1676246 +Subproject commit c96748481784c451b80e2ba84a504d04e509f26d diff --git a/core/hash/sha512 b/core/hash/sha512 index 9ddb714..88e0d83 160000 --- a/core/hash/sha512 +++ b/core/hash/sha512 @@ -1 +1 @@ -Subproject commit 9ddb7141ff98d550a652ae678a861fb2e0331486 +Subproject commit 88e0d83768004b6bab2d83edf7eae2841678b51c diff --git a/core/math/modexp b/core/math/modexp index e61c650..e9576be 160000 --- a/core/math/modexp +++ b/core/math/modexp @@ -1 +1 @@ -Subproject commit e61c65059054df407206e58b88a1b203f5ad3c3e +Subproject commit e9576be4bd403a8ab10fa28e58dd378c54e9f890 diff --git a/core/math/modexps6 b/core/math/modexps6 index 514bb28..eb3702e 160000 --- a/core/math/modexps6 +++ b/core/math/modexps6 @@ -1 +1 @@ -Subproject commit 514bb28200a0d71a7a99cbfb017d1ca3d2250fe9 +Subproject commit eb3702ee1f2be0316ebac1883b479cff699470e4 diff --git a/core/platform/common b/core/platform/common index a8e0651..8b8b5d3 160000 --- a/core/platform/common +++ b/core/platform/common @@ -1 +1 @@ -Subproject commit a8e0651bd3ae3a8e579547753cbb51dc0b87525c +Subproject commit 8b8b5d3fbe90e9164d9e692e4368e50ce77c2fbb diff --git a/core/platform/novena b/core/platform/novena index 5f1de63..40c4839 160000 --- a/core/platform/novena +++ b/core/platform/novena @@ -1 +1 @@ -Subproject commit 5f1de63e3bc6043ee10683a2c9fd8a7c03a3983a +Subproject commit 40c4839728c65618465cfb66cbd489ac86c97727 diff --git a/core/rng/avalanche_entropy b/core/rng/avalanche_entropy index 4a0c596..5742813 160000 --- a/core/rng/avalanche_entropy +++ b/core/rng/avalanche_entropy @@ -1 +1 @@ -Subproject commit 4a0c59617c582ef3f0e558067f913309db772f75 +Subproject commit 5742813ab43fec9fa90d970f086f1e266875b8f3 diff --git a/core/rng/rosc_entropy b/core/rng/rosc_entropy index 4c3b76c..48e3c11 160000 --- a/core/rng/rosc_entropy +++ b/core/rng/rosc_entropy @@ -1 +1 @@ -Subproject commit 4c3b76c5b8d2809b236d2396ed6a8b36be4587e8 +Subproject commit 48e3c117ae6944775010031b1691446220944b62 diff --git a/core/rng/trng b/core/rng/trng index 8dcb4d0..953909d 160000 --- a/core/rng/trng +++ b/core/rng/trng @@ -1 +1 @@ -Subproject commit 8dcb4d016e3f6fe18da0e00ddb21f3bf5859cd5b +Subproject commit 953909d18796c1caea35263eb902b1dd7021d92d diff --git a/sw/libhal b/sw/libhal index a16bdf7..c82c39c 160000 --- a/sw/libhal +++ b/sw/libhal @@ -1 +1 @@ -Subproject commit a16bdf7bd57e2a3c68e7f14acad32ce3740600a8 +Subproject commit c82c39cfc41843f07109657891bee7e410def879 diff --git a/sw/pkcs11 b/sw/pkcs11 index 9335f7d..3108919 160000 --- a/sw/pkcs11 +++ b/sw/pkcs11 @@ -1 +1 @@ -Subproject commit 9335f7d04180bb1faf9c50796d453ad884b3837b +Subproject commit 3108919d01d01ec408069fe05d0a1b10d8baa05e diff --git a/sw/thirdparty/libtfm b/sw/thirdparty/libtfm index e2eab10..e103c58 160000 --- a/sw/thirdparty/libtfm +++ b/sw/thirdparty/libtfm @@ -1 +1 @@ -Subproject commit e2eab1093a134e5a655d1ccad23a31b2b8252c66 +Subproject commit e103c584b95f79f09d7df9c7b689fca841e448a5 -- cgit v1.2.3