v2.30

Author: sganis

src/version.xml

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <!-- version -->      
-        <MyVersion>2.29</MyVersion>
+        <MyVersion>2.30</MyVersion>
 
         <!-- git version -->      
         <MyGitRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .git/HEAD))</MyGitRoot>

vendor/libssh2/include/libssh2.h

@@ -46,23 +46,13 @@
    to make the BANNER define (used by src/session.c) be a valid SSH
    banner. Release versions have no appended strings and may of course not
    have dashes either. */
-<<<<<<< HEAD
 #define LIBSSH2_VERSION                             "1.11.0"
 
 /* The numeric version number is also available "in parts" by using these
    defines: */
 #define LIBSSH2_VERSION_MAJOR                       1
 #define LIBSSH2_VERSION_MINOR                       11
 #define LIBSSH2_VERSION_PATCH                       0
-=======
-#define LIBSSH2_VERSION "1.11.0"
-
-/* The numeric version number is also available "in parts" by using these
-   defines: */
-#define LIBSSH2_VERSION_MAJOR 1
-#define LIBSSH2_VERSION_MINOR 11
-#define LIBSSH2_VERSION_PATCH 0
->>>>>>> a6286d72a2855ab54a9d2ee1adfa986abba95fd8
 
 /* This is the numeric version of the libssh2 version number, meant for easier
    parsing and comparisons by programs. The LIBSSH2_VERSION_NUM define will
@@ -79,11 +69,7 @@
    and it is always a greater number in a more recent release. It makes
    comparisons with greater than and less than work.
 */
-<<<<<<< HEAD
 #define LIBSSH2_VERSION_NUM                         0x010b00
-=======
-#define LIBSSH2_VERSION_NUM 0x010b00
->>>>>>> a6286d72a2855ab54a9d2ee1adfa986abba95fd8
 
 /*
  * This is the date and time when the full source package was created. The
@@ -94,7 +80,7 @@
  *
  * "Mon Feb 12 11:35:33 UTC 2007"
  */
-#define LIBSSH2_TIMESTAMP "Tue May 30 03:58:58 PM UTC 2023"
+#define LIBSSH2_TIMESTAMP "DEV"
 
 #ifndef RC_INVOKED
 

vendor/openssl/include/openssl/configuration.h

@@ -27,10 +27,10 @@ extern "C" {
  * OpenSSL was configured with the following options:
  */
 
-# ifndef OPENSSL_SYS_WIN32
-#  define OPENSSL_SYS_WIN32 1
+# ifndef OPENSSL_SYS_WIN64A
+#  define OPENSSL_SYS_WIN64A 1
 # endif
-# define OPENSSL_CONFIGURED_API 30300
+# define OPENSSL_CONFIGURED_API 10100
 # ifndef OPENSSL_RAND_SEED_OS
 #  define OPENSSL_RAND_SEED_OS
 # endif
@@ -43,9 +43,6 @@ extern "C" {
 # ifndef OPENSSL_NO_AFALGENG
 #  define OPENSSL_NO_AFALGENG
 # endif
-# ifndef OPENSSL_NO_APPS
-#  define OPENSSL_NO_APPS
-# endif
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
@@ -55,45 +52,24 @@ extern "C" {
 # ifndef OPENSSL_NO_BROTLI_DYNAMIC
 #  define OPENSSL_NO_BROTLI_DYNAMIC
 # endif
-<<<<<<< HEAD
-=======
-# ifndef OPENSSL_NO_CAPIENG
-#  define OPENSSL_NO_CAPIENG
-# endif
-# ifndef OPENSSL_NO_COMP
-#  define OPENSSL_NO_COMP
-# endif
->>>>>>> a6286d72a2855ab54a9d2ee1adfa986abba95fd8
 # ifndef OPENSSL_NO_CRYPTO_MDEBUG
 #  define OPENSSL_NO_CRYPTO_MDEBUG
 # endif
 # ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
 #  define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
 # endif
+# ifndef OPENSSL_NO_DEPRECATED
+#  define OPENSSL_NO_DEPRECATED
+# endif
 # ifndef OPENSSL_NO_DEVCRYPTOENG
 #  define OPENSSL_NO_DEVCRYPTOENG
 # endif
-# ifndef OPENSSL_NO_DGRAM
-#  define OPENSSL_NO_DGRAM
-# endif
-# ifndef OPENSSL_NO_DTLS
-#  define OPENSSL_NO_DTLS
-# endif
-# ifndef OPENSSL_NO_DTLS1
-#  define OPENSSL_NO_DTLS1
-# endif
-# ifndef OPENSSL_NO_DTLS1_2
-#  define OPENSSL_NO_DTLS1_2
-# endif
 # ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 #  define OPENSSL_NO_EC_NISTP_64_GCC_128
 # endif
 # ifndef OPENSSL_NO_EGD
 #  define OPENSSL_NO_EGD
 # endif
-# ifndef OPENSSL_NO_ENGINE
-#  define OPENSSL_NO_ENGINE
-# endif
 # ifndef OPENSSL_NO_EXTERNAL_TESTS
 #  define OPENSSL_NO_EXTERNAL_TESTS
 # endif
@@ -118,39 +94,18 @@ extern "C" {
 # ifndef OPENSSL_NO_MSAN
 #  define OPENSSL_NO_MSAN
 # endif
-# ifndef OPENSSL_NO_PADLOCKENG
-#  define OPENSSL_NO_PADLOCKENG
-# endif
-# ifndef OPENSSL_NO_QLOG
-#  define OPENSSL_NO_QLOG
-# endif
-# ifndef OPENSSL_NO_QUIC
-#  define OPENSSL_NO_QUIC
-# endif
 # ifndef OPENSSL_NO_RC5
 #  define OPENSSL_NO_RC5
 # endif
 # ifndef OPENSSL_NO_SCTP
 #  define OPENSSL_NO_SCTP
 # endif
-# ifndef OPENSSL_NO_SOCK
-#  define OPENSSL_NO_SOCK
-# endif
 # ifndef OPENSSL_NO_SSL3
 #  define OPENSSL_NO_SSL3
 # endif
 # ifndef OPENSSL_NO_SSL3_METHOD
 #  define OPENSSL_NO_SSL3_METHOD
 # endif
-<<<<<<< HEAD
-=======
-# ifndef OPENSSL_NO_STDIO
-#  define OPENSSL_NO_STDIO
-# endif
-# ifndef OPENSSL_NO_TESTS
-#  define OPENSSL_NO_TESTS
-# endif
->>>>>>> a6286d72a2855ab54a9d2ee1adfa986abba95fd8
 # ifndef OPENSSL_NO_TFO
 #  define OPENSSL_NO_TFO
 # endif
@@ -163,9 +118,6 @@ extern "C" {
 # ifndef OPENSSL_NO_UNIT_TEST
 #  define OPENSSL_NO_UNIT_TEST
 # endif
-# ifndef OPENSSL_NO_UNSTABLE_QLOG
-#  define OPENSSL_NO_UNSTABLE_QLOG
-# endif
 # ifndef OPENSSL_NO_UPLINK
 #  define OPENSSL_NO_UPLINK
 # endif
@@ -196,11 +148,11 @@ extern "C" {
  * The following are cipher-specific, but are part of the public API.
  */
 # if !defined(OPENSSL_SYS_UEFI)
-#  define BN_LLONG
+#  undef BN_LLONG
 /* Only one for the following should be defined */
 #  undef SIXTY_FOUR_BIT_LONG
-#  undef SIXTY_FOUR_BIT
-#  define THIRTY_TWO_BIT
+#  define SIXTY_FOUR_BIT
+#  undef THIRTY_TWO_BIT
 # endif
 
 # define RC4_INT unsigned int