From f1bdd293ca821f34244507af467de76e5e8ea22c Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 6 Feb 2025 12:55:03 +0100 Subject: [PATCH 1/3] Update copyright year --- erts/emulator/beam/erl_bits.c | 2 +- erts/emulator/test/bs_construct_SUITE.erl | 2 +- lib/compiler/src/beam_ssa_alias.erl | 2 +- lib/kernel/src/global.erl | 2 +- lib/public_key/src/pubkey_cert.erl | 2 +- lib/ssl/src/ssl.erl | 2 +- lib/ssl/src/ssl_gen_statem.erl | 2 +- lib/ssl/src/tls_client_connection_1_3.erl | 2 +- lib/ssl/src/tls_gen_connection_1_3.erl | 2 +- lib/ssl/src/tls_server_connection.erl | 2 +- lib/ssl/src/tls_server_connection_1_3.erl | 2 +- lib/ssl/test/ssl_api_SUITE.erl | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/erts/emulator/beam/erl_bits.c b/erts/emulator/beam/erl_bits.c index 97005dc730f4..0326cd6dd396 100644 --- a/erts/emulator/beam/erl_bits.c +++ b/erts/emulator/beam/erl_bits.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1999-2024. All Rights Reserved. + * Copyright Ericsson AB 1999-2025. 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/erts/emulator/test/bs_construct_SUITE.erl b/erts/emulator/test/bs_construct_SUITE.erl index 99c12fbe8594..dfa6276fc0b4 100644 --- a/erts/emulator/test/bs_construct_SUITE.erl +++ b/erts/emulator/test/bs_construct_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2024. All Rights Reserved. +%% Copyright Ericsson AB 1999-2025. 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/compiler/src/beam_ssa_alias.erl b/lib/compiler/src/beam_ssa_alias.erl index 1ca5bc671080..28d18f4b7ef9 100644 --- a/lib/compiler/src/beam_ssa_alias.erl +++ b/lib/compiler/src/beam_ssa_alias.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2024. All Rights Reserved. +%% Copyright Ericsson AB 2024-2025. 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/kernel/src/global.erl b/lib/kernel/src/global.erl index e432de6f86ec..395955091266 100644 --- a/lib/kernel/src/global.erl +++ b/lib/kernel/src/global.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2024. All Rights Reserved. +%% Copyright Ericsson AB 1996-2025. 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 970f5704be8a..f61a8ae8bf0f 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-2024. All Rights Reserved. +%% Copyright Ericsson AB 2008-2025. 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.erl b/lib/ssl/src/ssl.erl index 12adf2d853d5..6c37664eab4e 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2024. All Rights Reserved. +%% Copyright Ericsson AB 1999-2025. 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_gen_statem.erl b/lib/ssl/src/ssl_gen_statem.erl index b6a583b27f12..b2581798276f 100644 --- a/lib/ssl/src/ssl_gen_statem.erl +++ b/lib/ssl/src/ssl_gen_statem.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2024. All Rights Reserved. +%% Copyright Ericsson AB 2007-2025. 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/tls_client_connection_1_3.erl b/lib/ssl/src/tls_client_connection_1_3.erl index dc1835e64cac..4354de92f7cd 100644 --- a/lib/ssl/src/tls_client_connection_1_3.erl +++ b/lib/ssl/src/tls_client_connection_1_3.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2022-2024. All Rights Reserved. +%% Copyright Ericsson AB 2022-2025. 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/tls_gen_connection_1_3.erl b/lib/ssl/src/tls_gen_connection_1_3.erl index 2d1665f2f3d1..3eb8443a0bcf 100644 --- a/lib/ssl/src/tls_gen_connection_1_3.erl +++ b/lib/ssl/src/tls_gen_connection_1_3.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2022-2024. All Rights Reserved. +%% Copyright Ericsson AB 2022-2025. 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/tls_server_connection.erl b/lib/ssl/src/tls_server_connection.erl index 754b6649b705..ad4f699ef6ed 100644 --- a/lib/ssl/src/tls_server_connection.erl +++ b/lib/ssl/src/tls_server_connection.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2023-2024. All Rights Reserved. +%% Copyright Ericsson AB 2023-2025. 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/tls_server_connection_1_3.erl b/lib/ssl/src/tls_server_connection_1_3.erl index 7b365ec237a5..b21be9d71215 100644 --- a/lib/ssl/src/tls_server_connection_1_3.erl +++ b/lib/ssl/src/tls_server_connection_1_3.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2022-2024. All Rights Reserved. +%% Copyright Ericsson AB 2022-2025. 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/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl index da296c32960f..d07ebbfcf173 100644 --- a/lib/ssl/test/ssl_api_SUITE.erl +++ b/lib/ssl/test/ssl_api_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2019-2024. All Rights Reserved. +%% Copyright Ericsson AB 2019-2025. 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 c5286e926d4362dc76c36fbff4e3c45b65a9b906 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 6 Feb 2025 12:55:12 +0100 Subject: [PATCH 2/3] Prepare release --- erts/doc/notes.md | 10 ++++++++++ erts/vsn.mk | 2 +- lib/compiler/doc/notes.md | 10 ++++++++++ lib/compiler/vsn.mk | 2 +- lib/kernel/doc/notes.md | 12 ++++++++++++ lib/kernel/src/kernel.appup.src | 2 ++ lib/kernel/vsn.mk | 2 +- lib/public_key/doc/notes.md | 11 +++++++++++ lib/public_key/vsn.mk | 2 +- lib/ssl/doc/notes.md | 16 ++++++++++++++++ lib/ssl/vsn.mk | 2 +- make/otp_version_tickets | 15 ++++++--------- 12 files changed, 72 insertions(+), 14 deletions(-) diff --git a/erts/doc/notes.md b/erts/doc/notes.md index 582af57f0bcc..ecd18d2bad0b 100644 --- a/erts/doc/notes.md +++ b/erts/doc/notes.md @@ -21,6 +21,16 @@ limitations under the License. This document describes the changes made to the ERTS application. +## Erts 15.2.2 + +### Fixed Bugs and Malfunctions + +- Disabled an unsafe runtime optimization in binary construction that caused silent memory corruption. + + Own Id: OTP-19462 Aux Id: ERIERL-1177, [PR-9372] + +[PR-9372]: https://github.com/erlang/otp/pull/9372 + ## Erts 15.2.1 ### Fixed Bugs and Malfunctions diff --git a/erts/vsn.mk b/erts/vsn.mk index 0f1ad74bf637..fff1f35c9e11 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 15.2.1 +VSN = 15.2.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/compiler/doc/notes.md b/lib/compiler/doc/notes.md index e9f4ecb65345..f6b6378d1636 100644 --- a/lib/compiler/doc/notes.md +++ b/lib/compiler/doc/notes.md @@ -21,6 +21,16 @@ limitations under the License. This document describes the changes made to the Compiler application. +## Compiler 8.5.5 + +### Fixed Bugs and Malfunctions + +- Eliminated a bug in the alias analysis pass that could potentially cause unsafe optimizations of binary construction or record updates. + + Own Id: OTP-19455 Aux Id: [PR-9356] + +[PR-9356]: https://github.com/erlang/otp/pull/9356 + ## Compiler 8.5.4 ### Fixed Bugs and Malfunctions diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk index 9c9e9b7ca982..12349bb1db81 100644 --- a/lib/compiler/vsn.mk +++ b/lib/compiler/vsn.mk @@ -1 +1 @@ -COMPILER_VSN = 8.5.4 +COMPILER_VSN = 8.5.5 diff --git a/lib/kernel/doc/notes.md b/lib/kernel/doc/notes.md index 3951ef027103..0550cdb104b9 100644 --- a/lib/kernel/doc/notes.md +++ b/lib/kernel/doc/notes.md @@ -21,6 +21,18 @@ limitations under the License. This document describes the changes made to the Kernel application. +## Kernel 10.2.2 + +### Fixed Bugs and Malfunctions + +- Fixed a couple of bugs that could make `global`'s internal state inconsistent when a connection was reconnected. + + Own Id: OTP-19381 Aux Id: [PR-9377], [GH-9112], [GH-9117] + +[PR-9377]: https://github.com/erlang/otp/pull/9377 +[GH-9112]: https://github.com/erlang/otp/issues/9112 +[GH-9117]: https://github.com/erlang/otp/issues/9117 + ## Kernel 10.2.1 ### Fixed Bugs and Malfunctions diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 26f954fe2843..0caaf8f3784e 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -37,6 +37,7 @@ {<<"^10\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^10\\.2$">>,[restart_new_emulator]}, {<<"^10\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^10\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^8\\.4$">>,[restart_new_emulator]}, {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, @@ -68,6 +69,7 @@ {<<"^10\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^10\\.2$">>,[restart_new_emulator]}, {<<"^10\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^10\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^8\\.4$">>,[restart_new_emulator]}, {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index ba2666e1f296..1ac73b11c7fe 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -1 +1 @@ -KERNEL_VSN = 10.2.1 +KERNEL_VSN = 10.2.2 diff --git a/lib/public_key/doc/notes.md b/lib/public_key/doc/notes.md index 39548d922ef3..550e94cba783 100644 --- a/lib/public_key/doc/notes.md +++ b/lib/public_key/doc/notes.md @@ -19,6 +19,17 @@ limitations under the License. --> # Public_Key Release Notes +## Public_Key 1.17.1 + +### Fixed Bugs and Malfunctions + +- Consider keyCertSign to compatible with extended key usage for TLS client/server auth in CAs, adhere to wide spread implementations + + Own Id: OTP-19240 Aux Id: [PR-9286], [GH-9208] + +[PR-9286]: https://github.com/erlang/otp/pull/9286 +[GH-9208]: https://github.com/erlang/otp/issues/9208 + ## Public_Key 1.17 ### Improvements and New Features diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk index 20bcc6b1c0e8..7ac617057391 100644 --- a/lib/public_key/vsn.mk +++ b/lib/public_key/vsn.mk @@ -1 +1 @@ -PUBLIC_KEY_VSN = 1.17 +PUBLIC_KEY_VSN = 1.17.1 diff --git a/lib/ssl/doc/notes.md b/lib/ssl/doc/notes.md index 7c00ff9fb8fe..e53863ab6881 100644 --- a/lib/ssl/doc/notes.md +++ b/lib/ssl/doc/notes.md @@ -21,6 +21,22 @@ limitations under the License. This document describes the changes made to the SSL application. +## SSL 11.2.7 + +### Fixed Bugs and Malfunctions + +- An initiated handshake should always be closed with an alert, some corner cases have been fixed so that this should always be the case. + + Own Id: OTP-19411 Aux Id: [PR-9273], ERIERL-1174 + +- Correct option handling to work properly for paused handshaking. Could result in unwanted alerts or or error messages. + + Own Id: OTP-19445 Aux Id: [GH-9177], [PR-9322] + +[PR-9273]: https://github.com/erlang/otp/pull/9273 +[GH-9177]: https://github.com/erlang/otp/issues/9177 +[PR-9322]: https://github.com/erlang/otp/pull/9322 + ## SSL 11.2.6 ### Improvements and New Features diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index e8586c46490f..a121b8ff919b 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 11.2.6 +SSL_VSN = 11.2.7 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index a4099658cc17..d307b7e4db0b 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,9 +1,6 @@ -OTP-19385 -OTP-19388 -OTP-19392 -OTP-19407 -OTP-19418 -OTP-19435 -OTP-19439 -OTP-19444 -OTP-19446 +OTP-19240 +OTP-19381 +OTP-19411 +OTP-19445 +OTP-19455 +OTP-19462 From 8a4e04e9c48d94ef1216b0426fa71ccfdd78f7d3 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 6 Feb 2025 12:55:14 +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 3f51e521ceaf..08edfd724f5c 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -27.2.1 +27.2.2 diff --git a/otp_versions.table b/otp_versions.table index 04a6145df8bd..1c59f0bc1cca 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-27.2.2 : compiler-8.5.5 erts-15.2.2 kernel-10.2.2 public_key-1.17.1 ssl-11.2.7 # asn1-5.3.1 common_test-1.27.6 crypto-5.5.2 debugger-5.5 dialyzer-5.3.1 diameter-2.4.1 edoc-1.3.2 eldap-1.2.14 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3.1 jinterface-1.14.1 megaco-4.7 mnesia-4.23.3 observer-2.17 odbc-2.15 os_mon-2.10.1 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.18 ssh-5.2.6 stdlib-6.2 syntax_tools-3.2.1 tftp-1.2.2 tools-4.1.1 wx-2.4.3 xmerl-2.1 : OTP-27.2.1 : common_test-1.27.6 dialyzer-5.3.1 erts-15.2.1 kernel-10.2.1 ssh-5.2.6 tftp-1.2.2 # asn1-5.3.1 compiler-8.5.4 crypto-5.5.2 debugger-5.5 diameter-2.4.1 edoc-1.3.2 eldap-1.2.14 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3.1 jinterface-1.14.1 megaco-4.7 mnesia-4.23.3 observer-2.17 odbc-2.15 os_mon-2.10.1 parsetools-2.6 public_key-1.17 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.18 ssl-11.2.6 stdlib-6.2 syntax_tools-3.2.1 tools-4.1.1 wx-2.4.3 xmerl-2.1 : OTP-27.2 : common_test-1.27.5 compiler-8.5.4 crypto-5.5.2 debugger-5.5 dialyzer-5.3 eldap-1.2.14 erts-15.2 inets-9.3.1 kernel-10.2 megaco-4.7 mnesia-4.23.3 observer-2.17 os_mon-2.10.1 public_key-1.17 snmp-5.18 ssh-5.2.5 ssl-11.2.6 stdlib-6.2 tools-4.1.1 # asn1-5.3.1 diameter-2.4.1 edoc-1.3.2 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 jinterface-1.14.1 odbc-2.15 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 syntax_tools-3.2.1 tftp-1.2.1 wx-2.4.3 xmerl-2.1 : OTP-27.1.3 : common_test-1.27.4 compiler-8.5.3 erts-15.1.3 kernel-10.1.2 public_key-1.16.4 ssh-5.2.4 ssl-11.2.5 # asn1-5.3.1 crypto-5.5.1 debugger-5.4 dialyzer-5.2.1 diameter-2.4.1 edoc-1.3.2 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.15 os_mon-2.10 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.17 stdlib-6.1.2 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 :