updated dependencies and adjusted mbedtls features

alis-is · May 16, 2024 · 040d608 · 040d608
1 parent c8ace34
commit 040d608
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -40,7 +40,8 @@
         "stdiochannel.h": "c",
         "execvpe.h": "c",
         "execve_spawnp.h": "c",
-        "ostream": "c"
+        "ostream": "c",
+        "crypto.h": "c"
     },
     "C_Cpp.default.compilerPath": "/usr/bin/cpp",
     "editor.formatOnSave": true,

diff --git a/containers/build/Dockerfile b/containers/build/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir /usr/local/zig
 RUN wget -q https://raw.githubusercontent.com/alis-is/eli/main/install.sh -O /tmp/install.sh && \
 	sh /tmp/install.sh
 # setup zig
-RUN export ZIG_VERSION=0.12.0-dev.1830+779b8e259 && \
+RUN export ZIG_VERSION=0.12.0 && \
 	wget https://ziglang.org/builds/zig-linux-x86_64-$ZIG_VERSION.tar.xz && \
 	mkdir zig && tar --xz -xf zig-linux-x86_64-$ZIG_VERSION.tar.xz --directory zig && \
 	cp -rf zig/zig*/* --target-directory=/usr/local/zig

diff --git a/deps/corehttp b/deps/corehttp
diff --git a/deps/lua-simple-socket b/deps/lua-simple-socket
diff --git a/lib/init.lua b/lib/init.lua
@@ -1,5 +1,5 @@
-ELI_LIB_VERSION = '0.32.0-dev.25'
-ELI_VERSION = '0.32.0-dev.25'
+ELI_LIB_VERSION = '0.32.0'
+ELI_VERSION = '0.32.0'
 do
 	local path = require"eli.path"
 	local _eos = require"eli.os"

diff --git a/tools/templates/mbed-eli-overrides.mustache b/tools/templates/mbed-eli-overrides.mustache
@@ -20,6 +20,15 @@
 #define MBEDTLS_BASE64_C
 #undef MBEDTLS_X509_CRT_WRITE_C
 #undef MBEDTLS_AESCE_C
-// #define MBEDTLS_PSA_P256M_DRIVER_ENABLED
+#undef MBEDTLS_ERROR_STRERROR_DUMMY
+#undef MBEDTLS_VERSION_FEATURES
+#undef MBEDTLS_FS_IO 
+#undef MBEDTLS_PSA_ITS_FILE_C
+#undef MBEDTLS_PSA_CRYPTO_STORAGE_C
+#undef MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED 
+#undef MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED 
+#undef MBEDTLS_DES_C
+#undef MBEDTLS_DHM_C
+#undef MBEDTLS_RIPEMD160_C
 {{/overrides}}
 /* end eli mbedtls overrides */