Load latest version of picotls

private-octopus · Nov 4, 2023 · fc33d5a · fc33d5a
1 parent ecdc6c3
commit fc33d5a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -204,7 +204,7 @@ if(PICOQUIC_FETCH_PTLS)
     include(FetchContent)
     FetchContent_Declare(picotls
         GIT_REPOSITORY      https://github.com/h2o/picotls.git
-        GIT_TAG             7d294ab4f2e0ed749b4bcfaf533225a4e0c096f7)
+        GIT_TAG             af66fc4aa8853b0725fcb2c18a702e8f1c656cf1)
     FetchContent_MakeAvailable(picotls)
 endif()
 

diff --git a/README.md b/README.md
@@ -101,8 +101,8 @@ Picoquic is developed in C, and can be built under Windows or Linux. Building th
 project requires first managing the dependencies, [Picotls](https://github.com/h2o/picotls)
 and OpenSSL. Please note that you will need a recent version of Picotls --
 the Picotls API has evolved recently to support the latest version of QUIC. The
-current code is tested against the Picotls version of Sat Dec 10 01:56:28 2022 +0900,
-after commit `7d294ab4f2e0ed749b4bcfaf533225a4e0c096f7`. (Note that these last
+current code is tested against the Picotls version of Tue Oct 31 11:23:32 2023 +0900,
+after commit `af66fc4aa8853b0725fcb2c18a702e8f1c656cf1`. (Note that these last
 commits changed the Picotls API by removing code for the now obsolete
 ESNI draft; prior versions will not work with Picoquic.)
 The code can use OpenSSL version 1.1.1 or OpenSSL version 3.0.

diff --git a/ci/build_picotls.ps1 b/ci/build_picotls.ps1
@@ -1,5 +1,5 @@
 # Build at a known-good commit
-$COMMIT_ID="7d294ab4f2e0ed749b4bcfaf533225a4e0c096f7"
+$COMMIT_ID=" af66fc4aa8853b0725fcb2c18a702e8f1c656cf1"
 
 # Match expectations of picotlsvs project.
 mkdir $dir\include\

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=7d294ab4f2e0ed749b4bcfaf533225a4e0c096f7
+COMMIT_ID= af66fc4aa8853b0725fcb2c18a702e8f1c656cf1
 
 cd ..
 # git clone --branch master --single-branch --shallow-submodules --recurse-submodules --no-tags https://github.com/h2o/picotls

diff --git a/picoquic/picoquic_mbedtls.c b/picoquic/picoquic_mbedtls.c
@@ -113,7 +113,6 @@ static void ptls_mbedtls_hash_final(struct st_ptls_hash_context_t* _ctx, void* m
 static struct st_ptls_hash_context_t* ptls_mbedtls_hash_clone(struct st_ptls_hash_context_t* _src)
 {
     ptls_mbedtls_hash_ctx_t* ctx = (ptls_mbedtls_hash_ctx_t*)malloc(sizeof(ptls_mbedtls_hash_ctx_t));
-    const ptls_mbedtls_hash_ctx_t* src = (const ptls_mbedtls_hash_ctx_t*)_src;
 
     if (ctx != NULL) {
         ptls_mbedtls_hash_ctx_t* src = (ptls_mbedtls_hash_ctx_t*)_src;