Merge branch 'maint-25' into maint

Jakub Witczak · Jakub Witczak · commit 2bd2b5fb2a52 · 2025-05-08T17:36:56.000+02:00
* maint-25:
  Updated OTP version
  Prepare release
  Update copyright year
diff --git a/erts/doc/notes.md b/erts/doc/notes.md
@@ -1777,6 +1777,17 @@ This document describes the changes made to the ERTS application.
 
   Own Id: OTP-18574
 
+## Erts 13.2.2.16
+
+### Fixed Bugs and Malfunctions
+
+* Fixed an emulator crash when setting an error_handler module that was not yet loaded.
+
+  Own Id: OTP-19577 Aux Id: ERIERL-1220, PR-9696
+* Fixed a rare bug that could cause an emulator crash after unloading a module or erasing a persistent_term.
+
+  Own Id: OTP-19599 Aux Id: PR-9724
+
 ## Erts 13.2.2.15
 
 ### Fixed Bugs and Malfunctions
diff --git a/lib/kernel/doc/notes.md b/lib/kernel/doc/notes.md
@@ -1305,6 +1305,17 @@ This document describes the changes made to the Kernel application.
 
   Own Id: OTP-18575 Aux Id: PR-7169
 
+## Kernel 8.5.4.6
+
+### Fixed Bugs and Malfunctions
+
+* With this change, disk_log will not crash when using chunk_step/3 after log size was decreased.
+
+  Own Id: OTP-19605 Aux Id: GH-9720, PR-9765
+* With this change, disk_log will not run into infinite loop when using chunk/2,3 after log size was decreased.
+
+  Own Id: OTP-19608 Aux Id: GH-9707, PR-9767
+
 ## Kernel 8.5.4.5
 
 ### Fixed Bugs and Malfunctions
diff --git a/lib/ssh/doc/notes.md b/lib/ssh/doc/notes.md
@@ -419,6 +419,14 @@ limitations under the License.
 
   Own Id: OTP-18490 Aux Id: OTP-18471, GH-6339, PR-6843
 
+## Ssh 4.15.3.13
+
+### Fixed Bugs and Malfunctions
+
+* Fix KEX strict implementation according to draft-miller-sshm-strict-kex-01 document.
+
+  Own Id: OTP-19625 Aux Id: CVE-2025-46712
+
 ## Ssh 4.15.3.12
 
 ### Fixed Bugs and Malfunctions
diff --git a/otp_versions.table b/otp_versions.table
@@ -38,6 +38,7 @@ OTP-26.1 : asn1-5.2 common_test-1.25.1 compiler-8.4 crypto-5.3 debugger-5.3.2 di
 OTP-26.0.2 : compiler-8.3.2 erts-14.0.2 kernel-9.0.2 ssh-5.0.1 ssl-11.0.2 stdlib-5.0.2 # asn1-5.1 common_test-1.25 crypto-5.2 debugger-5.3.1 dialyzer-5.1 diameter-2.3 edoc-1.2 eldap-1.2.11 erl_docgen-1.5 erl_interface-5.4 et-1.7 eunit-2.8.2 ftp-1.2 inets-9.0.1 jinterface-1.14 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 xmerl-1.3.32 :
 OTP-26.0.1 : compiler-8.3.1 erts-14.0.1 inets-9.0.1 kernel-9.0.1 ssl-11.0.1 stdlib-5.0.1 xmerl-1.3.32 # asn1-5.1 common_test-1.25 crypto-5.2 debugger-5.3.1 dialyzer-5.1 diameter-2.3 edoc-1.2 eldap-1.2.11 erl_docgen-1.5 erl_interface-5.4 et-1.7 eunit-2.8.2 ftp-1.2 jinterface-1.14 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 ssh-5.0 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 :
 OTP-26.0 : asn1-5.1 common_test-1.25 compiler-8.3 crypto-5.2 dialyzer-5.1 diameter-2.3 erl_docgen-1.5 erl_interface-5.4 erts-14.0 et-1.7 ftp-1.2 inets-9.0 jinterface-1.14 kernel-9.0 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 ssh-5.0 ssl-11.0 stdlib-5.0 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 # debugger-5.3.1 edoc-1.2 eldap-1.2.11 eunit-2.8.2 xmerl-1.3.31 :
+OTP-25.3.2.21 : erts-13.2.2.16 kernel-8.5.4.6 ssh-4.15.3.13 # asn1-5.0.21.1 common_test-1.24.0.6 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.5 jinterface-1.13.2 megaco-4.4.3 mnesia-4.21.4.4 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 public_key-1.13.3.6 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.7 stdlib-4.3.1.6 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 :
 OTP-25.3.2.20 : ssh-4.15.3.12 # asn1-5.0.21.1 common_test-1.24.0.6 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 erts-13.2.2.15 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.5 jinterface-1.13.2 kernel-8.5.4.5 megaco-4.4.3 mnesia-4.21.4.4 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 public_key-1.13.3.6 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.7 stdlib-4.3.1.6 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 :
 OTP-25.3.2.19 : erts-13.2.2.15 kernel-8.5.4.5 mnesia-4.21.4.4 ssh-4.15.3.11 # asn1-5.0.21.1 common_test-1.24.0.6 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.5 jinterface-1.13.2 megaco-4.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 public_key-1.13.3.6 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.7 stdlib-4.3.1.6 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 :
 OTP-25.3.2.18 : erts-13.2.2.14 public_key-1.13.3.6 ssh-4.15.3.10 # asn1-5.0.21.1 common_test-1.24.0.6 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.5 jinterface-1.13.2 kernel-8.5.4.4 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.7 stdlib-4.3.1.6 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 :
