Merge branch 'maint-25' into maint

* maint-25: Updated OTP version Prepare release Update copyright year
erlang · Dec 5, 2024 · d6989c8 · d6989c8
2 parents 8169559 + d4469b4
commit d6989c8
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 14 deletions.
diff --git a/erts/doc/notes.md b/erts/doc/notes.md
@@ -1520,6 +1520,14 @@ This document describes the changes made to the ERTS application.
 
   Own Id: OTP-18574
 
+## Erts 13.2.2.12
+
+### Fixed Bugs and Malfunctions
+
+* Fix lock order violation if a NIF monitor `down` callback calls `enif_whereis_pid`. Would cause debug emulator to crash but could potentially lead to deadlocks in optimized emulator.
+
+  Own Id: OTP-19330 Aux Id: GH-8983, PR-9008
+
 ## Erts 13.2.2.11
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/common_test/doc/notes.md b/lib/common_test/doc/notes.md
@@ -272,6 +272,14 @@ limitations under the License.
 
   Own Id: OTP-18478 Aux Id: GH-6903
 
+## Common_Test 1.24.0.5
+
+### Fixed Bugs and Malfunctions
+
+* With this change, cth_surefire hook module handles group path reduction for a skipped group. This fixes a bug manifesting with improper group path for a group executed after a group which was skipped.
+
+  Own Id: OTP-19365 Aux Id: ERIERL-1157, PR-9080
+
 ## Common_Test 1.24.0.4
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/inets/doc/notes.md b/lib/inets/doc/notes.md
@@ -233,6 +233,14 @@ limitations under the License.
 
   Own Id: OTP-18544 Aux Id: GH-5276
 
+## Inets 8.3.1.5
+
+### Fixed Bugs and Malfunctions
+
+* Fixed a bug where calling httpc:set_options/2 when one of keys: *ipfamily* or *unix_socket*, was not present, would cause the other value to get overriden by the default value. The validation of these options was also improved.
+
+  Own Id: OTP-19379 Aux Id: PR-8878, GH-8829
+
 ## Inets 8.3.1.4
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/public_key/doc/notes.md b/lib/public_key/doc/notes.md
@@ -246,6 +246,17 @@ limitations under the License.
 
   Own Id: OTP-18447
 
+## Public_Key 1.13.3.5
+
+### Fixed Bugs and Malfunctions
+
+* If both `ext-key-usage` and `key-usage` are defined for a certificate it should be checked that these usages are consistent with each other. This will have the affect that such certificates where the `ext-key-usages` is marked as critical and the usages is consistent with the `key-use` it can be considered valid without mandatory application specific checks for the `ext-key-useage` extension.
+
+  Own Id: OTP-19240 Aux Id: PR-8840, OTP-19532
+* Handle decoding of EDDSA key properly, when decoding a PEM file that contains only the public EDDSA key.
+
+  Own Id: OTP-19350 Aux Id: GH-9009, PR-9053
+
 ## Public_Key 1.13.3.4
 
 ### Improvements and New Features

diff --git a/lib/ssh/doc/notes.md b/lib/ssh/doc/notes.md
@@ -269,6 +269,14 @@ limitations under the License.
 
   Own Id: OTP-18490 Aux Id: OTP-18471, GH-6339, PR-6843
 
+## Ssh 4.15.3.8
+
+### Fixed Bugs and Malfunctions
+
+* With this change, ssh connection does not crash upon receiving exit-signal message for an already terminated channel.
+
+  Own Id: OTP-19326 Aux Id: PR-8995, GH-8929
+
 ## Ssh 4.15.3.7
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/ssl/doc/notes.md b/lib/ssl/doc/notes.md
@@ -638,6 +638,23 @@ This document describes the changes made to the SSL application.
 
   Own Id: OTP-18572
 
+## SSL 10.9.1.7
+
+### Fixed Bugs and Malfunctions
+
+* Avoid generating an internal alert for case that should have been an orderly shutdown by the supervisor.
+
+  Own Id: OTP-19311 Aux Id: PR-8980
+* If present, extended key-usage TLS (SSL) role check (`pk-clientAuth`, `pk-serverAuth`) should always be performed for peer-cert. An intermediate CA cert may relax the requirement if `AnyExtendedKeyUsage` purpose is present.
+
+  In OTP-25.3.2.8, OTP-26.2 and OTP-27.0 these requirements became too relaxed. There where two problems, firstly the peer cert extension was only checked if it was marked critical, and secondly the CA cert check did not assert the relaxed `AnyExtendedKeyUsage` purpose.
+
+  This could result in that certificates might be misused for purposes not intended by the certificate authority.
+
+  Thanks to Bryan Paxton for reporting the issue.
+
+  Own Id: OTP-19352 Aux Id: PR-9130, CVE-2024-53846, OTP-19240
+
 ## SSL 10.9.1.6
 
 ### Fixed Bugs and Malfunctions

diff --git a/lib/stdlib/doc/notes.md b/lib/stdlib/doc/notes.md
@@ -1140,6 +1140,14 @@ This document describes the changes made to the STDLIB application.
 
   Own Id: OTP-18575 Aux Id: PR-7169
 
+## STDLIB 4.3.1.6
+
+### Fixed Bugs and Malfunctions
+
+* Fixed an error in uri_string:percent_decode spec
+
+  Own Id: OTP-19380 Aux Id: GH-8755
+
 ## STDLIB 4.3.1.5
 
 ### Fixed Bugs and Malfunctions

diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
@@ -1,14 +0,0 @@
-OTP-19240
-OTP-19293
-OTP-19311
-OTP-19325
-OTP-19326
-OTP-19328
-OTP-19332
-OTP-19340
-OTP-19350
-OTP-19352
-OTP-19357
-OTP-19365
-OTP-19366
-OTP-19374

diff --git a/otp_versions.table b/otp_versions.table
@@ -22,6 +22,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.16 : common_test-1.24.0.5 erts-13.2.2.12 inets-8.3.1.5 public_key-1.13.3.5 ssh-4.15.3.8 ssl-10.9.1.7 stdlib-4.3.1.6 # asn1-5.0.21.1 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 jinterface-1.13.2 kernel-8.5.4.3 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 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.15 : common_test-1.24.0.4 erts-13.2.2.11 inets-8.3.1.4 public_key-1.13.3.4 ssh-4.15.3.7 ssl-10.9.1.6 stdlib-4.3.1.5 # asn1-5.0.21.1 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 jinterface-1.13.2 kernel-8.5.4.3 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 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.14 : diameter-2.2.7.2 public_key-1.13.3.3 ssh-4.15.3.6 xmerl-1.3.31.2 # asn1-5.0.21.1 common_test-1.24.0.3 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 erts-13.2.2.10 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.3 jinterface-1.13.2 kernel-8.5.4.3 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.5 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 :
 OTP-25.3.2.13 : erts-13.2.2.10 ssh-4.15.3.5 ssl-10.9.1.5 # asn1-5.0.21.1 common_test-1.24.0.3 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.1 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.3 jinterface-1.13.2 kernel-8.5.4.3 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 public_key-1.13.3.2 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 :