Merge branch 'master' into feat/spi_nand_expose_lower_level_api

espressif · Nov 29, 2024 · ab1e619 · ab1e619
2 parents dedb5e8 + 772c89d
commit ab1e619
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/libsodium/CMakeLists.txt b/libsodium/CMakeLists.txt
@@ -4,6 +4,10 @@ set(SRC libsodium/src/libsodium)
 set(srcs
     "${SRC}/crypto_aead/chacha20poly1305/aead_chacha20poly1305.c"
     "${SRC}/crypto_aead/xchacha20poly1305/aead_xchacha20poly1305.c"
+    "${SRC}/crypto_aead/aegis256/aead_aegis256.c"
+    "${SRC}/crypto_aead/aegis256/aegis256_soft.c"
+    "${SRC}/crypto_aead/aegis128l/aead_aegis128l.c"
+    "${SRC}/crypto_aead/aegis128l/aegis128l_soft.c"
     "${SRC}/crypto_auth/crypto_auth.c"
     "${SRC}/crypto_auth/hmacsha256/auth_hmacsha256.c"
     "${SRC}/crypto_auth/hmacsha512/auth_hmacsha512.c"
@@ -21,6 +25,7 @@ set(srcs
     "${SRC}/crypto_core/hsalsa20/core_hsalsa20.c"
     "${SRC}/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c"
     "${SRC}/crypto_core/salsa/ref/core_salsa_ref.c"
+    "${SRC}/crypto_core/softaes/softaes.c"
     "${SRC}/crypto_generichash/blake2b/generichash_blake2.c"
     "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c"
     "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ref.c"

diff --git a/libsodium/idf_component.yml b/libsodium/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.20~1"
+version: "1.0.20~2"
 description: libsodium port to ESP
 url: https://github.com/espressif/idf-extra-components/tree/master/libsodium
 dependencies:

diff --git a/libsodium/test_apps/main/CMakeLists.txt b/libsodium/test_apps/main/CMakeLists.txt
@@ -1,6 +1,6 @@
 get_filename_component(LS_TESTDIR "${CMAKE_CURRENT_LIST_DIR}/../../libsodium/test/default" ABSOLUTE)
 
-set(TEST_CASES "chacha20;aead_chacha20poly1305;box;box2;ed25519_convert;sign;hash")
+set(TEST_CASES "aead_aegis128l;aead_aegis256;chacha20;aead_chacha20poly1305;box;box2;ed25519_convert;sign;hash")
 
 foreach(test_case ${TEST_CASES})
     file(GLOB test_case_file "${LS_TESTDIR}/${test_case}.c")

diff --git a/libsodium/test_apps/main/test_sodium.c b/libsodium/test_apps/main/test_sodium.c
@@ -29,6 +29,8 @@
     }
 
 
+LIBSODIUM_TEST(aead_aegis128l)
+LIBSODIUM_TEST(aead_aegis256)
 LIBSODIUM_TEST(aead_chacha20poly1305)
 LIBSODIUM_TEST(chacha20)
 LIBSODIUM_TEST(box)

diff --git a/libsodium/test_apps/partitions.csv b/libsodium/test_apps/partitions.csv
@@ -0,0 +1,5 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
+nvs,      data, nvs,     ,        0x6000,
+phy_init, data, phy,     ,        0x1000,
+factory,  app,  factory, ,        1500K,
diff --git a/libsodium/test_apps/sdkconfig.defaults b/libsodium/test_apps/sdkconfig.defaults
@@ -3,3 +3,4 @@
 #
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_TASK_WDT_INIT=n
+CONFIG_PARTITION_TABLE_CUSTOM=y