4 files changed, 12 insertions, 13 deletions

diff --git a/.github/rust-openssl.patch b/.github/rust-openssl.patch
index e9586dd..4a8dd3f 100644
--- a/.github/rust-openssl.patch
+++ b/.github/rust-openssl.patch
@@ -1,13 +1,12 @@
 diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
-index 82013b6c..2974abed 100644
+index bbee7c5c..57033b2d 100644
 --- a/openssl-sys/build/main.rs
 +++ b/openssl-sys/build/main.rs
-@@ -273,7 +273,7 @@ See rust-openssl documentation for more information:
-             (3, 7, 1) => ('3', '7', '1'),
-             (3, 7, _) => ('3', '7', 'x'),
+@@ -293,6 +293,7 @@ See rust-openssl documentation for more information:
              (3, 8, 0) => ('3', '8', '0'),
--            (3, 8, 1) => ('3', '8', '1'),
-+            (3, 8, _) => ('3', '8', 'x'),
+             (3, 8, 1) => ('3', '8', '1'),
+             (3, 8, _) => ('3', '8', 'x'),
++            (3, 9, _) => ('3', '8', 'x'),
              _ => version_error(),
          };
  
diff --git a/ChangeLog b/ChangeLog
index 2233529..2acb8ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,8 +34,12 @@ LibreSSL Portable Release Notes:
         * Internal improvements
         * Documentation improvements
         * Testing and proactive security
+        * Compatibility changes
+          - Added ChaCha20 and chacha20 aliases for ChaCha.
         * Bug fixes
-          - Fixed aliasing issues in BN_mod_exp_simple() and BN_mod_exp_recp()
+          - Fixed aliasing issues in BN_mod_exp_simple() and BN_mod_exp_recp().
+          - Fixed numerous misuses of X509_ALGOR_set0() resulting in leaks and
+            potentially incorrect encodings.
 
 3.8.2 - Stable release
 
diff --git a/crypto/compat/ui_openssl_win.c b/crypto/compat/ui_openssl_win.c
index b6a621f..a8c92f2 100644
--- a/crypto/compat/ui_openssl_win.c
+++ b/crypto/compat/ui_openssl_win.c
@@ -130,9 +130,6 @@
 #define NX509_SIG 32
 #endif
 
-/* Define globals.  They are protected by a lock */
-static void (*savsig[NX509_SIG])(int );
-
 DWORD console_mode;
 static FILE *tty_in, *tty_out;
 static int is_a_tty;
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 4beef36..240dbf8 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -50,11 +50,10 @@ target_include_directories(tls_obj
                 ../include
                 ${CMAKE_BINARY_DIR}/include)
 
-add_library(tls $<TARGET_OBJECTS:tls_obj> $<TARGET_OBJECTS:ssl_obj>
-        $<TARGET_OBJECTS:crypto_obj> empty.c)
+add_library(tls $<TARGET_OBJECTS:tls_obj> empty.c)
 
 export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym)
-target_link_libraries(tls ${PLATFORM_LIBS})
+target_link_libraries(tls ${OPENSSL_LIBS})
 if (WIN32)
         set(TLS_POSTFIX -${TLS_MAJOR_VERSION} PARENT_SCOPE)
 endif()