Merge pull request #1865 from private-octopus/Align-picotls-2025-04-07

Manage latest release of Picotls

Author: huitema

CMakeLists.txt

@@ -8,7 +8,7 @@ else()
 endif()
 
 project(picoquic
-        VERSION 1.1.33.0
+        VERSION 1.1.33.1
         DESCRIPTION "picoquic library"
         LANGUAGES C CXX)
 

ci/build_picotls.ps1

@@ -1,5 +1,5 @@
 # Build at a known-good commit
-$COMMIT_ID= "5a4461d8a3948d9d26bf861e7d90cb80d8093515"
+$COMMIT_ID= "bbcdbe6dc31ec5d4b72a7beece4daf58098bad42"
 
 # Match expectations of picotlsvs project.
 mkdir $dir\include\

ci/build_picotls.sh

@@ -2,7 +2,7 @@
 #build last picotls master (for Travis)
 
 # Build at a known-good commit
-COMMIT_ID= 5a4461d8a3948d9d26bf861e7d90cb80d8093515
+COMMIT_ID= bbcdbe6dc31ec5d4b72a7beece4daf58098bad42
 
 cd ..
 # git clone --branch master --single-branch --shallow-submodules --recurse-submodules --no-tags https://github.com/h2o/picotls

picohttp/demoserver.c

@@ -22,6 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include <picotls.h>
 #include "picoquic_internal.h"
 #include "tls_api.h"

picohttp/h3zero_common.c

@@ -26,6 +26,11 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include <picotls.h>
 #include "picosplay.h"
 #include "picoquic.h"

picohttp/h3zero_server.c

@@ -22,6 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include <picotls.h>
 #include "picosplay.h"
 #include "picoquic_internal.h"

picoquic/logger.c

@@ -26,6 +26,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include <picotls.h>
 #include "picoquic_internal.h"
 #include "bytestream.h"

picoquic/picoquic.h

@@ -40,7 +40,7 @@
 extern "C" {
 #endif
 
-#define PICOQUIC_VERSION "1.1.33.0"
+#define PICOQUIC_VERSION "1.1.33.1"
 #define PICOQUIC_ERROR_CLASS 0x400
 #define PICOQUIC_ERROR_DUPLICATE (PICOQUIC_ERROR_CLASS + 1)
 #define PICOQUIC_ERROR_AEAD_CHECK (PICOQUIC_ERROR_CLASS + 3)

picoquic/picoquic_mbedtls.c

@@ -23,6 +23,12 @@
 * required variables and function pointers so they can be used by picoquic.
 */
 
+
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include "picotls.h"
 #ifndef PICOQUIC_WITH_MBEDTLS
 void picoquic_mbedtls_load(int unload)

picoquic/picoquic_ptls_fusion.c

@@ -23,7 +23,12 @@
  * required variables and function pointers so they can be used by picoquic.
  */
 
-#include "picotls.h"
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
+#include <picotls.h>
 #include "picoquic_crypto_provider_api.h"
 
 #ifdef _WINDOWS_TRY_AGAIN