Kaynağa Gözat

Update to OpenSSL 3.3.2

Source commit: 1df3404cde407cce90e6242ffa128bfc53e88bf1
Martin Prikryl 1 yıl önce
ebeveyn
işleme
85225451a0

+ 1 - 1
libs/openssl/crypto/conf/conf_mod.c

@@ -39,7 +39,7 @@
 
 
 #define CRYPTO_RCU_LOCK CRYPTO_RWLOCK
 #define CRYPTO_RCU_LOCK CRYPTO_RWLOCK
 
 
-#define ossl_rcu_lock_new(num_writers) CRYPTO_THREAD_lock_new()
+#define ossl_rcu_lock_new(num_writers, ctx) CRYPTO_THREAD_lock_new()
 #define ossl_rcu_lock_free CRYPTO_THREAD_lock_free
 #define ossl_rcu_lock_free CRYPTO_THREAD_lock_free
 // CRYPTO_THREAD_*_lock return boolean result, while ossl_rcu_*_lock are void.
 // CRYPTO_THREAD_*_lock return boolean result, while ossl_rcu_*_lock are void.
 // But the CRYPTO_THREAD_*_lock actually always returns 1/true, so it's safe to ignore the result.
 // But the CRYPTO_THREAD_*_lock actually always returns 1/true, so it's safe to ignore the result.

+ 5 - 5
libs/openssl/include/openssl/opensslv.h

@@ -29,7 +29,7 @@ extern "C" {
  */
  */
 # define OPENSSL_VERSION_MAJOR  3
 # define OPENSSL_VERSION_MAJOR  3
 # define OPENSSL_VERSION_MINOR  3
 # define OPENSSL_VERSION_MINOR  3
-# define OPENSSL_VERSION_PATCH  1
+# define OPENSSL_VERSION_PATCH  2
 
 
 /*
 /*
  * Additional version information
  * Additional version information
@@ -74,21 +74,21 @@ extern "C" {
  * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
  * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
  * OPENSSL_VERSION_BUILD_METADATA_STR appended.
  * OPENSSL_VERSION_BUILD_METADATA_STR appended.
  */
  */
-# define OPENSSL_VERSION_STR "3.3.1"
-# define OPENSSL_FULL_VERSION_STR "3.3.1"
+# define OPENSSL_VERSION_STR "3.3.2"
+# define OPENSSL_FULL_VERSION_STR "3.3.2"
 
 
 /*
 /*
  * SECTION 3: ADDITIONAL METADATA
  * SECTION 3: ADDITIONAL METADATA
  *
  *
  * These strings are defined separately to allow them to be parsable.
  * These strings are defined separately to allow them to be parsable.
  */
  */
-# define OPENSSL_RELEASE_DATE "4 Jun 2024"
+# define OPENSSL_RELEASE_DATE "3 Sep 2024"
 
 
 /*
 /*
  * SECTION 4: BACKWARD COMPATIBILITY
  * SECTION 4: BACKWARD COMPATIBILITY
  */
  */
 
 
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.2 3 Sep 2024"
 
 
 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
 # ifdef OPENSSL_VERSION_PRE_RELEASE
 # ifdef OPENSSL_VERSION_PRE_RELEASE