Add mbedtls specific tests

private-octopus · Nov 5, 2023 · ed77ca3 · ed77ca3
1 parent a6fefb9
commit ed77ca3
Show file tree

Hide file tree

Showing 8 changed files with 561 additions and 3 deletions.
diff --git a/.github/workflows/mbedtls.yml b/.github/workflows/mbedtls.yml
@@ -57,6 +57,6 @@ jobs:
             ulimit -c unlimited -S
             cd build
             make picoquic_ct
-            ./picoquic_ct -S .. many_losses && QUICRESULT=$?
+            ./picoquic_ct -S .. mbedtls_crypto mbedtls && QUICRESULT=$?
             if [[ ${QUICRESULT} == 0 ]]; then exit 0; fi;
             exit 1
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ else()
 endif()
 
 project(picoquic
-        VERSION 1.1.13.2
+        VERSION 1.1.14.0
         DESCRIPTION "picoquic library"
         LANGUAGES C CXX)
 
@@ -150,6 +150,7 @@ set(PICOQUIC_TEST_LIBRARY_FILES
     picoquictest/high_latency_test.c
     picoquictest/intformattest.c
     picoquictest/l4s_test.c
+    picoquictest/mbedtls_test.c
     picoquictest/mediatest.c
     picoquictest/minicrypto_test.c
     picoquictest/multipath_test.c

diff --git a/picoquic/picoquic.h b/picoquic/picoquic.h
@@ -40,7 +40,7 @@
 extern "C" {
 #endif
 
-#define PICOQUIC_VERSION "1.1.13.2"
+#define PICOQUIC_VERSION "1.1.14.0"
 #define PICOQUIC_ERROR_CLASS 0x400
 #define PICOQUIC_ERROR_DUPLICATE (PICOQUIC_ERROR_CLASS + 1)
 #define PICOQUIC_ERROR_AEAD_CHECK (PICOQUIC_ERROR_CLASS + 3)

diff --git a/picoquic_t/picoquic_t.c b/picoquic_t/picoquic_t.c
@@ -371,6 +371,10 @@ static const picoquic_test_def_t test_table[] = {
     { "migration_controlled", migration_controlled_test },
     { "migration_mtu_drop", migration_mtu_drop_test },
     { "minicrypto", minicrypto_test },
+#ifdef PICOQUIC_WITH_MBEDTLS
+    { "mbedtls", mbedtls_test },
+    { "mbedtls_crypto", mbedtls_crypto_test },
+#endif
     { "monopath_basic", monopath_basic_test },
     { "monopath_hole", monopath_hole_test },
     { "monopath_rotation", monopath_rotation_test },