From e759c977f76da86e0cf1d6625ed14e8e7111126e Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 17 Jul 2015 18:29:15 +0200 Subject: Create modexps6 branch of super-repository, try to whack all relevant repositories to correct branch. --- .gitmodules | 5 +++++ core/platform/common | 2 +- core/platform/novena | 2 +- core/rng/trng | 2 +- sw/libhal | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index b22ca9b..0efacd3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "sw/libhal"] path = sw/libhal url = git@git.cryptech.is:sw/libhal.git + branch = modexps6 [submodule "sw/pkcs11"] path = sw/pkcs11 url = git@git.cryptech.is:sw/pkcs11.git @@ -28,9 +29,11 @@ [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 @@ -46,3 +49,5 @@ [submodule "sw/thirdparty/sqlite3"] path = sw/thirdparty/sqlite3 url = git@git.cryptech.is:sw/thirdparty/sqlite3.git +[submodule "core/math/modexps6"] + branch = modexps6 diff --git a/core/platform/common b/core/platform/common index f05a3c6..a8e0651 160000 --- a/core/platform/common +++ b/core/platform/common @@ -1 +1 @@ -Subproject commit f05a3c65ec65004b097cb63d5ac6d463a7a9dc2f +Subproject commit a8e0651bd3ae3a8e579547753cbb51dc0b87525c diff --git a/core/platform/novena b/core/platform/novena index 33cc55a..769f969 160000 --- a/core/platform/novena +++ b/core/platform/novena @@ -1 +1 @@ -Subproject commit 33cc55adaf9ff31473802414f9c0d6e4a553cddf +Subproject commit 769f9691eb54453c2eee00c958ba53a5c2885c71 diff --git a/core/rng/trng b/core/rng/trng index d5974ed..7578afe 160000 --- a/core/rng/trng +++ b/core/rng/trng @@ -1 +1 @@ -Subproject commit d5974ed0d389f8953b23d98bb69b1576adad27b8 +Subproject commit 7578afe1a28e932a2b6ae3493348d0c347e9b682 diff --git a/sw/libhal b/sw/libhal index 53bff0b..0915302 160000 --- a/sw/libhal +++ b/sw/libhal @@ -1 +1 @@ -Subproject commit 53bff0b94832da75e37bea3e94e051f24fdec560 +Subproject commit 0915302b7ffa0757be1859d73f14037f338c0253 -- cgit v1.2.3 From 4f455cbbabe8974868e18dee300dddec46c7255a Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 17 Jul 2015 18:39:06 +0200 Subject: More voodoo to get core/math/modexps6 on correct branch. --- .gitmodules | 2 ++ core/math/modexps6 | 1 + 2 files changed, 3 insertions(+) create mode 160000 core/math/modexps6 diff --git a/.gitmodules b/.gitmodules index 0efacd3..7c1a9e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,4 +50,6 @@ path = sw/thirdparty/sqlite3 url = git@git.cryptech.is:sw/thirdparty/sqlite3.git [submodule "core/math/modexps6"] + path = core/math/modexps6 + url = git@git.cryptech.is:core/math/modexps6.git branch = modexps6 diff --git a/core/math/modexps6 b/core/math/modexps6 new file mode 160000 index 0000000..1acddf1 --- /dev/null +++ b/core/math/modexps6 @@ -0,0 +1 @@ +Subproject commit 1acddf19bb8c39f5202d80af068b5ffd14797f4b -- cgit v1.2.3 From 3014b9cb2c60085c1f116c9a9f451e6ff67c1f1c Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 17 Jul 2015 18:54:09 +0200 Subject: Touch XiLinx-supplied .v file to work around Makefile bug. --- core/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/core/Makefile b/core/Makefile index f8c8c5b..55ce0ea 100644 --- a/core/Makefile +++ b/core/Makefile @@ -39,6 +39,7 @@ BUILD_DIR := platform/novena/eim/build all: patch -p1 --forward Date: Fri, 17 Jul 2015 20:55:54 +0200 Subject: Track core/platform/novena clkmgr_dcm cleanup. --- core/platform/novena | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/platform/novena b/core/platform/novena index 769f969..02ca34c 160000 --- a/core/platform/novena +++ b/core/platform/novena @@ -1 +1 @@ -Subproject commit 769f9691eb54453c2eee00c958ba53a5c2885c71 +Subproject commit 02ca34c86ba35a6036be316f7e31d0216e3a67e0 -- cgit v1.2.3 From dea43303574a16ffe0f0a1bbc0e6a5f0434613ac Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 17 Jul 2015 21:49:20 +0200 Subject: Track more core/platform/novena cleanup. --- core/platform/novena | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/platform/novena b/core/platform/novena index 02ca34c..f5cfe0b 160000 --- a/core/platform/novena +++ b/core/platform/novena @@ -1 +1 @@ -Subproject commit 02ca34c86ba35a6036be316f7e31d0216e3a67e0 +Subproject commit f5cfe0b5d45f627877d8829b25f9ff637749cf97 -- cgit v1.2.3 From 26525c90d4b8613993c09ac98ebfb90cbd0e85a8 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 17 Jul 2015 22:58:56 +0200 Subject: Pull yet more modexps6 changes. I love XiLinx. --- core/math/modexps6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/math/modexps6 b/core/math/modexps6 index 1acddf1..514bb28 160000 --- a/core/math/modexps6 +++ b/core/math/modexps6 @@ -1 +1 @@ -Subproject commit 1acddf19bb8c39f5202d80af068b5ffd14797f4b +Subproject commit 514bb28200a0d71a7a99cbfb017d1ca3d2250fe9 -- cgit v1.2.3 From 653d783e3567187b1d0090e047972e4171da3f68 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sat, 18 Jul 2015 08:49:48 +0200 Subject: Pull C_GetSessionInfo() into modexps6 branch too. --- sw/pkcs11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/pkcs11 b/sw/pkcs11 index 4786afd..60a46af 160000 --- a/sw/pkcs11 +++ b/sw/pkcs11 @@ -1 +1 @@ -Subproject commit 4786afd48cc19533b4232bca2519ec6ad2853e5c +Subproject commit 60a46afc01b73e763251370642cf61b15ba067d0 -- cgit v1.2.3