Merge branch 'main' into align-picoquic-2023-12-30

private-octopus · Dec 30, 2023 · 19adaa6 · 19adaa6
2 parents 8e80762 + f7da9ea
commit 19adaa6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/ci/build_picotls.sh b/ci/build_picotls.sh
@@ -2,7 +2,7 @@
 #build last picotls master (for Travis)
 
 # Build at a known-good commit
-COMMIT_ID=047c5fe20bb9ea91c1caded8977134f19681ec76
+# COMMIT_ID=047c5fe20bb9ea91c1caded8977134f19681ec76
 
 cd ..
 # git clone --branch master --single-branch --shallow-submodules --recurse-submodules --no-tags https://github.com/h2o/picotls

diff --git a/cmake/FindPTLS.cmake b/cmake/FindPTLS.cmake
@@ -3,13 +3,14 @@
 if (PICOQUIC_FETCH_PTLS)
     set(PTLS_CORE_LIBRARY picotls-core)
     set(PTLS_OPENSSL_LIBRARY picotls-openssl)
+    set(PTLS_MINICRYPTO_LIBRARY picotls-minicrypto)
     if(WITH_FUSION)
         set(PTLS_FUSION_LIBRARY picotls-fusion)
         set(PTLS_WITH_FUSION_DEFAULT ON)
-        set(PTLS_LIBRARIES ${PTLS_CORE_LIBRARY} ${PTLS_OPENSSL_LIBRARY} ${PTLS_FUSION_LIBRARY})
+        set(PTLS_LIBRARIES ${PTLS_CORE_LIBRARY} ${PTLS_OPENSSL_LIBRARY} ${PTLS_FUSION_LIBRARY} ${PTLS_MINICRYPTO_LIBRARY})
     else()
         set(PTLS_WITH_FUSION_DEFAULT OFF)
-        set(PTLS_LIBRARIES ${PTLS_CORE_LIBRARY} ${PTLS_OPENSSL_LIBRARY})
+        set(PTLS_LIBRARIES ${PTLS_CORE_LIBRARY} ${PTLS_OPENSSL_LIBRARY}  ${PTLS_MINICRYPTO_LIBRARY})
         unset(PTLS_FUSION_LIBRARY)
     endif()
     set(PTLS_INCLUDE_DIRS ${picotls_SOURCE_DIR}/include)
@@ -26,6 +27,7 @@ else(PICOQUIC_FETCH_PTLS)
     find_library(PTLS_CORE_LIBRARY picotls-core HINTS ${PTLS_HINTS})
     find_library(PTLS_OPENSSL_LIBRARY picotls-openssl HINTS ${PTLS_HINTS})
     find_library(PTLS_FUSION_LIBRARY picotls-fusion HINTS ${PTLS_HINTS})
+    find_library(PTLS_MINICRYPTO_LIBRARY picotls-minicrypto HINTS ${PTLS_HINTS})
 
     if(NOT PTLS_FUSION_LIBRARY)
         include(FindPackageHandleStandardArgs)
@@ -34,9 +36,10 @@ else(PICOQUIC_FETCH_PTLS)
         find_package_handle_standard_args(PTLS REQUIRED_VARS
             PTLS_CORE_LIBRARY
             PTLS_OPENSSL_LIBRARY
+            PTLS_MINICRYPTO_LIBRARY
             PTLS_INCLUDE_DIR)
         if(PTLS_FOUND)
-            set(PTLS_LIBRARIES ${PTLS_CORE_LIBRARY} ${PTLS_OPENSSL_LIBRARY} )
+            set(PTLS_LIBRARIES ${PTLS_CORE_LIBRARY} ${PTLS_OPENSSL_LIBRARY} ${PTLS_MINICRYPTO_LIBRARY})
             set(PTLS_INCLUDE_DIRS ${PTLS_INCLUDE_DIR})
             set(PTLS_WITH_FUSION_DEFAULT OFF)
         endif()
@@ -48,10 +51,11 @@ else(PICOQUIC_FETCH_PTLS)
             PTLS_CORE_LIBRARY
             PTLS_OPENSSL_LIBRARY
             PTLS_FUSION_LIBRARY
+            PTLS_MINICRYPTO_LIBRARY
             PTLS_INCLUDE_DIR)
 
         if(PTLS_FOUND)
-            set(PTLS_LIBRARIES ${PTLS_CORE_LIBRARY} ${PTLS_OPENSSL_LIBRARY} ${PTLS_FUSION_LIBRARY})
+            set(PTLS_LIBRARIES ${PTLS_CORE_LIBRARY} ${PTLS_OPENSSL_LIBRARY} ${PTLS_FUSION_LIBRARY} ${PTLS_MINICRYPTO_LIBRARY})
             set(PTLS_INCLUDE_DIRS ${PTLS_INCLUDE_DIR})
             set(PTLS_WITH_FUSION_DEFAULT ON)
         endif()

diff --git a/lib/context.c b/lib/context.c
@@ -204,4 +204,4 @@ void fuzzer_random_cid(fuzzer_ctx_t* ctx, picoquic_connection_id_t* icid)
 void fuzi_q_fuzzer_release(fuzzer_ctx_t* fuzz_ctx)
 {
     picosplay_empty_tree(&fuzz_ctx->icid_tree);
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     void fuzi_q_fuzzer_release(fuzzer_ctx_t* fuzz_ctx)
     {
         picosplay_empty_tree(&fuzz_ctx->icid_tree);
-    }
+    }