Merge branch 'main' into far3-dev-tests

CMakeLists.txt

@@ -219,17 +219,16 @@ endif(MSVC)
 set(OPENSSL_COMPILE_FLAGS
   -DWINSCP
   -DMK1MF_BUILD -DWIN32_LEAN_AND_MEAN -DVC_EXTRALEAN -DSECURITY_WIN32
-   # -DOPENSSL_NO_LOCKING
+  # -DOPENSSL_NO_LOCKING
   -DDSO_WIN32
   -DL_ENDIAN -D_stricmp=stricmp -D_strnicmp=strnicmp
   -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS
   -DOPENSSL_NO_MDC2
   -DOPENSSL_NO_WHIRLPOOL
   -DOPENSSL_NO_SEED
   -DOPENSSL_NO_ENGINE -DOPENSSL_NO_DYNAMIC_ENGINE
-  -DOPENSSL_NO_QUIC
-  -DOPENSSL_NO_BROTLI
-  -DOPENSSL_NO_COMP
+  -DOPENSSL_NO_QUIC -DOPENSSL_NO_BROTLI -DOPENSSL_NO_COMP -DOPENSSL_NO_COMP_ALG
+  -DOPENSSL_NO_TFO -DOPENSSL_NO_ASYNC
   -DOPENSSL_NO_ERR
   -DOPENSSL_NO_CAMELLIA
   -DOPENSSL_NO_DEPRECATED_3_0
@@ -1016,7 +1015,8 @@ set(libeay32_c_files
   libs/openssl-3/crypto/async/async.c
   libs/openssl-3/crypto/async/async_err.c
   libs/openssl-3/crypto/async/async_wait.c
-  libs/openssl-3/crypto/async/arch/async_win.c
+  # libs/openssl-3/crypto/async/arch/async_win.c
+  libs/openssl-3/crypto/async/arch/async_null.c
   libs/openssl-3/crypto/kdf/hkdf.c
   libs/openssl-3/crypto/kdf/tls1_prf.c
   libs/openssl-3/crypto/kdf/kdf_err.c

libs/expat/expat_config.h

@@ -17,6 +17,9 @@
 // WINSCP
 /* #undef HAVE_ARC4RANDOM_BUF */
 
+/* define if the compiler supports basic C++11 syntax */
+#define HAVE_CXX11 1
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
@@ -75,13 +78,13 @@
 #define PACKAGE "expat"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "[email protected]"
+#define PACKAGE_BUGREPORT "https://github.com/libexpat/libexpat/issues"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "expat"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.5.0"
+#define PACKAGE_STRING "expat 2.6.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "expat"
@@ -90,15 +93,15 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.0"
+#define PACKAGE_VERSION "2.6.1"
 
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "2.5.0"
+#define VERSION "2.6.1"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -117,7 +120,7 @@
 /* #undef XML_ATTR_INFO */
 
 /* Define to specify how much context to retain around the current parse
-   point. */
+   point, 0 to disable. */
 #define XML_CONTEXT_BYTES 1024
 
 /* Define to include code reading entropy from `/dev/urandom'. */

libs/expat/lib/expat.h

@@ -18,6 +18,7 @@
    Copyright (c) 2022      Thijs Schreijer <[email protected]>
    Copyright (c) 2023      Hanno Böck <[email protected]>
    Copyright (c) 2023      Sony Corporation / Snild Dolkow <[email protected]>
+   Copyright (c) 2024      Taichi Haradaguchi <[email protected]>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -1042,7 +1043,7 @@ typedef struct {
 XMLPARSEAPI(const XML_Feature *)
 XML_GetFeatureList(void);
 
-#if XML_GE == 1
+#if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
 /* Added in Expat 2.4.0 for XML_DTD defined and
  * added in Expat 2.6.0 for XML_GE == 1. */
 XMLPARSEAPI(XML_Bool)
@@ -1065,7 +1066,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
 */
 #define XML_MAJOR_VERSION 2
 #define XML_MINOR_VERSION 6
-#define XML_MICRO_VERSION 0
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }

libs/expat/lib/internal.h

@@ -28,10 +28,11 @@
    Copyright (c) 2002-2003 Fred L. Drake, Jr. <[email protected]>
    Copyright (c) 2002-2006 Karl Waclawek <[email protected]>
    Copyright (c) 2003      Greg Stein <[email protected]>
-   Copyright (c) 2016-2023 Sebastian Pipping <[email protected]>
+   Copyright (c) 2016-2024 Sebastian Pipping <[email protected]>
    Copyright (c) 2018      Yury Gribov <[email protected]>
    Copyright (c) 2019      David Loffredo <[email protected]>
-   Copyright (c) 2023      Sony Corporation / Snild Dolkow <[email protected]>
+   Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <[email protected]>
+   Copyright (c) 2024      Taichi Haradaguchi <[email protected]>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -155,14 +156,20 @@ extern "C" {
 void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
                                                 const char **fromLimRef);
 
-#if XML_GE == 1
+#if defined(XML_GE) && XML_GE == 1
 unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
 unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
 const char *unsignedCharToPrintable(unsigned char c);
 #endif
 
-extern XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c
-extern unsigned int g_parseAttempts;             // used for testing only
+extern
+#if ! defined(XML_TESTING)
+    const
+#endif
+    XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c
+#if defined(XML_TESTING)
+extern unsigned int g_bytesScanned; // used for testing only
+#endif
 
 #ifdef __cplusplus
 }

libs/expat/lib/winconfig.h

@@ -44,5 +44,9 @@
 
 #include <memory.h>
 #include <string.h>
+#include <float.h>
+#ifndef isnan
+#define isnan _isnan
+#endif
 
 #endif /* ndef WINCONFIG_H */