From 86307345b3cc133c75dc0aecc69efd9cc56a2f92 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Wed, 4 Dec 2024 16:29:37 +0100 Subject: [PATCH 1/3] Update copyright year --- erts/emulator/test/nif_SUITE_data/nif_SUITE.c | 2 +- lib/common_test/src/cth_surefire.erl | 2 +- lib/common_test/test/ct_surefire_SUITE.erl | 2 +- lib/inets/src/http_client/httpc_manager.erl | 2 +- lib/public_key/src/pubkey_cert.erl | 2 +- lib/ssl/doc/src/ssl.xml | 2 +- lib/ssl/src/ssl.erl | 2 +- lib/ssl/src/ssl_handshake.erl | 2 +- lib/ssl/src/ssl_internal.hrl | 2 +- lib/ssl/test/tls_api_SUITE.erl | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c index e8e485a32c38..f10f01d14df5 100644 --- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c +++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2009-2021. All Rights Reserved. + * Copyright Ericsson AB 2009-2024. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl index 030bbb1a4ec4..ed02d7be2e62 100644 --- a/lib/common_test/src/cth_surefire.erl +++ b/lib/common_test/src/cth_surefire.erl @@ -1,7 +1,7 @@ %%-------------------------------------------------------------------- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2012-2022. All Rights Reserved. +%% Copyright Ericsson AB 2012-2024. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/common_test/test/ct_surefire_SUITE.erl b/lib/common_test/test/ct_surefire_SUITE.erl index 326874a88a00..75a42011d962 100644 --- a/lib/common_test/test/ct_surefire_SUITE.erl +++ b/lib/common_test/test/ct_surefire_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2012-2022. All Rights Reserved. +%% Copyright Ericsson AB 2012-2024. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl index ef58bdb8d7ea..d06690a73269 100644 --- a/lib/inets/src/http_client/httpc_manager.erl +++ b/lib/inets/src/http_client/httpc_manager.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2023. All Rights Reserved. +%% Copyright Ericsson AB 2002-2024. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl index 5832160db242..810bee84b507 100644 --- a/lib/public_key/src/pubkey_cert.erl +++ b/lib/public_key/src/pubkey_cert.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2023. All Rights Reserved. +%% Copyright Ericsson AB 2008-2024. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index f3cb3978e3d6..5c66484f695e 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -4,7 +4,7 @@
- 19992022 + 19992024 Ericsson AB. All Rights Reserved. diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 3de106145ad5..070efee36676 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2023. All Rights Reserved. +%% Copyright Ericsson AB 1999-2024. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 625b82674ad5..8d0f8327a6a9 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2023. All Rights Reserved. +%% Copyright Ericsson AB 2013-2024. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index f33de1dba409..a38df839a692 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2022. All Rights Reserved. +%% Copyright Ericsson AB 2007-2024. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/ssl/test/tls_api_SUITE.erl b/lib/ssl/test/tls_api_SUITE.erl index 93ce7c04e56d..659b83b1216b 100644 --- a/lib/ssl/test/tls_api_SUITE.erl +++ b/lib/ssl/test/tls_api_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2019-2022. All Rights Reserved. +%% Copyright Ericsson AB 2019-2024. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. From a986620aea8770251e0d6072d049a8a61d75e24e Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Wed, 4 Dec 2024 16:29:39 +0100 Subject: [PATCH 2/3] Prepare release --- erts/doc/src/notes.xml | 17 +++++++++++++++ erts/vsn.mk | 2 +- lib/common_test/doc/src/notes.xml | 17 +++++++++++++++ lib/common_test/vsn.mk | 2 +- lib/inets/doc/src/notes.xml | 20 ++++++++++++++++- lib/inets/vsn.mk | 2 +- lib/public_key/doc/src/notes.xml | 27 +++++++++++++++++++++++ lib/public_key/vsn.mk | 2 +- lib/ssh/doc/src/notes.xml | 16 ++++++++++++++ lib/ssh/vsn.mk | 2 +- lib/ssl/doc/src/notes.xml | 36 +++++++++++++++++++++++++++++++ lib/ssl/vsn.mk | 2 +- lib/stdlib/doc/src/notes.xml | 14 ++++++++++++ lib/stdlib/vsn.mk | 2 +- make/otp_version_tickets | 24 ++++++++------------- 15 files changed, 162 insertions(+), 23 deletions(-) diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 3d2dc1573903..7b24a3feaf6e 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,23 @@

This document describes the changes made to the ERTS application.

+
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/erts/vsn.mk b/erts/vsn.mk index a470420236ea..0938fe515489 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 13.2.2.11 +VSN = 13.2.2.12 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml index 8fb49e12f61c..678de096cbf1 100644 --- a/lib/common_test/doc/src/notes.xml +++ b/lib/common_test/doc/src/notes.xml @@ -33,6 +33,23 @@ notes.xml +
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/common_test/vsn.mk b/lib/common_test/vsn.mk index 7852128c1b02..7045c2565530 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1 +1 @@ -COMMON_TEST_VSN = 1.24.0.4 +COMMON_TEST_VSN = 1.24.0.5 diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index e1ca4f16b656..d93a669cfbe2 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -33,7 +33,25 @@ notes.xml -
Inets 8.3.1.4 +
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/inets/vsn.mk b/lib/inets/vsn.mk index e78180b21a88..9af42382b395 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 8.3.1.4 +INETS_VSN = 8.3.1.5 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml index 5fa7c2a498c9..f44ec2bf6be1 100644 --- a/lib/public_key/doc/src/notes.xml +++ b/lib/public_key/doc/src/notes.xml @@ -35,6 +35,33 @@ notes.xml +
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/public_key/vsn.mk b/lib/public_key/vsn.mk index 65a8281a7588..03eef646f43d 100644 --- a/lib/public_key/vsn.mk +++ b/lib/public_key/vsn.mk @@ -1 +1 @@ -PUBLIC_KEY_VSN = 1.13.3.4 +PUBLIC_KEY_VSN = 1.13.3.5 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 712c8d4fe8e8..699a8b40da68 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,22 @@ notes.xml +
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/ssh/vsn.mk b/lib/ssh/vsn.mk index 28ec35dde94e..a4fbd973e400 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,4 +1,4 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 4.15.3.7 +SSH_VSN = 4.15.3.8 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index b0ae1f88cb6f..e9a94ae34941 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,42 @@

This document describes the changes made to the SSL application.

+
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/ssl/vsn.mk b/lib/ssl/vsn.mk index 99da0af925f0..f7ea45a4067d 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 10.9.1.6 +SSL_VSN = 10.9.1.7 diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index f6ac5414f4cf..734b898927c7 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,20 @@

This document describes the changes made to the STDLIB application.

+
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/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk index 729b1b362e86..cda0ac384f11 100644 --- a/lib/stdlib/vsn.mk +++ b/lib/stdlib/vsn.mk @@ -1 +1 @@ -STDLIB_VSN = 4.3.1.5 +STDLIB_VSN = 4.3.1.6 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 170170725faa..7c837737be7d 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,15 +1,9 @@ -OTP-19124 -OTP-19158 -OTP-19221 -OTP-19236 -OTP-19238 -OTP-19246 -OTP-19247 -OTP-19252 -OTP-19256 -OTP-19257 -OTP-19265 -OTP-19266 -OTP-19269 -OTP-19274 -OTP-19284 +OTP-19240 +OTP-19311 +OTP-19326 +OTP-19330 +OTP-19350 +OTP-19352 +OTP-19365 +OTP-19379 +OTP-19380 From d4469b4f5994941712ba24e238db06fd86f87b61 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Wed, 4 Dec 2024 16:29:41 +0100 Subject: [PATCH 3/3] Updated OTP version --- OTP_VERSION | 2 +- otp_versions.table | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OTP_VERSION b/OTP_VERSION index f58b092e58e7..712c3c133514 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -25.3.2.15 +25.3.2.16 diff --git a/otp_versions.table b/otp_versions.table index ceeb9fa27602..305bda905e18 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +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 :