diff options
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | controller/fw/Makefile | 4 | ||||
| m--------- | controller/fw/libsodium | 0 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index c7c888f..d8f92a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url = https://git.jaseg.net/bigdata/pub/safety-reset-cmsis.git [submodule "controller/fw/libsodium"] path = controller/fw/libsodium - url = https://github.com/jedisct1/libsodium + url = git@git.jaseg.net:bigdata/pub/libsodium-safety-reset.git [submodule "controller/fw/tinyaes"] path = controller/fw/tinyaes url = https://github.com/kokke/tiny-AES-c diff --git a/controller/fw/Makefile b/controller/fw/Makefile index c0f01d5..3aae9fb 100644 --- a/controller/fw/Makefile +++ b/controller/fw/Makefile @@ -299,7 +299,9 @@ $(BUILDDIR)/%.o: %.c mkdir -p $(@D) $(CC) $(COMMON_CFLAGS) $(CFLAGS) $(EXT_CFLAGS) -o $@ -c $< -$(BUILDDIR)/libsodium/src/libsodium/.libs/libsodium.a: +$(BUILDDIR)/src/crypto.o: $(BUILDDIR)/libsodium/src/libsodium/include/sodium/version.h + +$(BUILDDIR)/libsodium/src/libsodium/.libs/libsodium.a $(BUILDDIR)/libsodium/src/libsodium/include/sodium/version.h &: mkdir -p $(BUILDDIR)/libsodium cd $(BUILDDIR)/libsodium && CFLAGS="$(COMMON_CFLAGS) $(CFLAGS) -DDEV_MODE=1" $(LIBSODIUM_DIR_ABS)/configure --host=arm-none-eabi && $(MAKE) -j $(shell nproc) diff --git a/controller/fw/libsodium b/controller/fw/libsodium -Subproject afae623190f025e7cf2fb0222bfe796b69a3694 +Subproject 06b56e25342a95322c226e7531a5da73c757c67 |