diff --git a/lib/common_test/doc/notes.md b/lib/common_test/doc/notes.md index ad9301ad3483..f9dae6badac8 100644 --- a/lib/common_test/doc/notes.md +++ b/lib/common_test/doc/notes.md @@ -122,6 +122,14 @@ limitations under the License. [GH-7972]: https://github.com/erlang/otp/issues/7972 [PR-8112]: https://github.com/erlang/otp/pull/8112 +## Common_Test 1.26.2.2 + +### Improvements and New Features + +* With this change, prefix option can be specified in cth_conn_log option list. Option allows to specify how much of additional information is added in raw log output. + + Own Id: OTP-19293 Aux Id: ERIERL-1139, PR-8924, PR-8931 + ## Common_Test 1.26.2.1 ### Fixed Bugs and Malfunctions diff --git a/lib/crypto/c_src/digest.c b/lib/crypto/c_src/digest.c index 9902a20692ec..87600c587d3a 100644 --- a/lib/crypto/c_src/digest.c +++ b/lib/crypto/c_src/digest.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2010-2023. All Rights Reserved. + * Copyright Ericsson AB 2010-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/crypto/c_src/digest.h b/lib/crypto/c_src/digest.h index d78f345f908b..9a5614ec10c0 100644 --- a/lib/crypto/c_src/digest.h +++ b/lib/crypto/c_src/digest.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2010-2021. All Rights Reserved. + * Copyright Ericsson AB 2010-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/crypto/doc/notes.md b/lib/crypto/doc/notes.md index 067a5148f971..6f8970efac1a 100644 --- a/lib/crypto/doc/notes.md +++ b/lib/crypto/doc/notes.md @@ -99,6 +99,17 @@ This document describes the changes made to the Crypto application. [PR-8168]: https://github.com/erlang/otp/pull/8168 [PR-8233]: https://github.com/erlang/otp/pull/8233 +## Crypto 5.4.2.3 + +### Fixed Bugs and Malfunctions + +* Fixed bug that could cause blocking scheduler threads in `crypto:supports(curves)` if called the first time by more than one Erlang process. Bug exists only in OTP-26.2.5.4. + + Own Id: OTP-19316 Aux Id: GH-8971, PR-8979 +* Fixed `crypto:hash_final/1` for digest types `shake128` and `shake256` when using OpenSSL 3.4 or newer. + + Own Id: OTP-19329 Aux Id: GH-8997, PR-9002 + ## Crypto 5.4.2.2 ### Fixed Bugs and Malfunctions diff --git a/lib/ssh/doc/notes.md b/lib/ssh/doc/notes.md index 8fe159080ce7..fb069ed689fb 100644 --- a/lib/ssh/doc/notes.md +++ b/lib/ssh/doc/notes.md @@ -99,6 +99,14 @@ limitations under the License. [PR-7845]: https://github.com/erlang/otp/pull/7845 [PR-8026]: https://github.com/erlang/otp/pull/8026 +## Ssh 5.1.4.4 + +### 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 5.1.4.3 ### Fixed Bugs and Malfunctions diff --git a/lib/ssl/doc/notes.md b/lib/ssl/doc/notes.md index 16e6cf556fc6..3a485e122a23 100644 --- a/lib/ssl/doc/notes.md +++ b/lib/ssl/doc/notes.md @@ -207,6 +207,20 @@ This document describes the changes made to the SSL application. [PR-8250]: https://github.com/erlang/otp/pull/8250 [PR-8255]: https://github.com/erlang/otp/pull/8255 +## SSL 11.1.4.5 + +### 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 + +### Improvements and New Features + +* Back port certificate_authorities option for TLS-1.3 servers to pre TLS-1.3 servers to enable them to disable the sending of certificate authorities in their certificate request. This will have same affect as the the TLS-1.3 server option although it is handled by a different mechanism in these versions, where the functionality is described to be more of a guidance, although some pre TLS clients have proven to make it mandatory as in TLS-1.3 extension handling. + + Own Id: OTP-19325 Aux Id: PR-9001, ERIERL-1147 + ## SSL 11.1.4.4 ### Fixed Bugs and Malfunctions diff --git a/lib/ssl/test/ssl_trace_SUITE.erl b/lib/ssl/test/ssl_trace_SUITE.erl index 22155aee4020..af3b37ec2311 100644 --- a/lib/ssl/test/ssl_trace_SUITE.erl +++ b/lib/ssl/test/ssl_trace_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2022-2023. All Rights Reserved. +%% Copyright Ericsson AB 2022-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/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index da68204bb657..e69de29bb2d1 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,14 +0,0 @@ -OTP-19124 -OTP-19235 -OTP-19246 -OTP-19247 -OTP-19249 -OTP-19258 -OTP-19265 -OTP-19266 -OTP-19267 -OTP-19268 -OTP-19269 -OTP-19274 -OTP-19286 -OTP-19288 diff --git a/otp_versions.table b/otp_versions.table index 658bd5b33a04..0cbff5a9bf29 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -3,6 +3,7 @@ OTP-27.1.1 : common_test-1.27.2 erts-15.1.1 public_key-1.16.3 ssl-11.2.3 stdlib- OTP-27.1 : asn1-5.3.1 common_test-1.27.1 compiler-8.5.2 crypto-5.5.1 dialyzer-5.2.1 diameter-2.4.1 edoc-1.3.2 erts-15.1 ftp-1.2.3 inets-9.3 kernel-10.1 odbc-2.15 public_key-1.16.2 runtime_tools-2.1.1 snmp-5.17 ssh-5.2.2 ssl-11.2.2 stdlib-6.1 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 # debugger-5.4 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 os_mon-2.10 parsetools-2.6 reltool-1.0.1 sasl-4.2.2 : OTP-27.0.1 : compiler-8.5.1 edoc-1.3.1 erts-15.0.1 kernel-10.0.1 public_key-1.16.1 ssh-5.2.1 ssl-11.2.1 stdlib-6.0.1 # asn1-5.3 common_test-1.27 crypto-5.5 debugger-5.4 dialyzer-5.2 diameter-2.4 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.2 inets-9.2 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.14.3 os_mon-2.10 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1 sasl-4.2.2 snmp-5.16 syntax_tools-3.2 tftp-1.2 tools-4.0 wx-2.4.2 xmerl-2.0 : OTP-27.0 : asn1-5.3 common_test-1.27 compiler-8.5 crypto-5.5 debugger-5.4 dialyzer-5.2 diameter-2.4 edoc-1.3 eldap-1.2.13 erl_interface-5.5.2 erts-15.0 et-1.7.1 eunit-2.9.1 ftp-1.2.2 inets-9.2 jinterface-1.14.1 kernel-10.0 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.14.3 os_mon-2.10 parsetools-2.6 public_key-1.16 reltool-1.0.1 runtime_tools-2.1 sasl-4.2.2 snmp-5.16 ssh-5.2 ssl-11.2 stdlib-6.0 syntax_tools-3.2 tftp-1.2 tools-4.0 wx-2.4.2 xmerl-2.0 # : +OTP-26.2.5.5 : common_test-1.26.2.2 crypto-5.4.2.3 ssh-5.1.4.4 ssl-11.1.4.5 # asn1-5.2.2 compiler-8.4.3.2 debugger-5.3.4 dialyzer-5.1.3 diameter-2.3.2.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 erts-14.2.5.4 et-1.7 eunit-2.9 ftp-1.2.1.1 inets-9.1.0.1 jinterface-1.14 kernel-9.2.4.3 megaco-4.5 mnesia-4.23.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 public_key-1.15.1.3 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 stdlib-5.2.3.2 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34.1 : OTP-26.2.5.4 : common_test-1.26.2.1 compiler-8.4.3.2 crypto-5.4.2.2 erts-14.2.5.4 inets-9.1.0.1 kernel-9.2.4.3 public_key-1.15.1.3 ssh-5.1.4.3 ssl-11.1.4.4 stdlib-5.2.3.2 xmerl-1.3.34.1 # asn1-5.2.2 debugger-5.3.4 dialyzer-5.1.3 diameter-2.3.2.2 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1.1 jinterface-1.14 megaco-4.5 mnesia-4.23.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 : OTP-26.2.5.3 : compiler-8.4.3.1 diameter-2.3.2.2 erts-14.2.5.3 ftp-1.2.1.1 kernel-9.2.4.2 public_key-1.15.1.2 ssh-5.1.4.2 ssl-11.1.4.3 # asn1-5.2.2 common_test-1.26.2 crypto-5.4.2.1 debugger-5.3.4 dialyzer-5.1.3 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 inets-9.1 jinterface-1.14 megaco-4.5 mnesia-4.23.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 stdlib-5.2.3.1 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34 : OTP-26.2.5.2 : crypto-5.4.2.1 erts-14.2.5.2 ssl-11.1.4.2 stdlib-5.2.3.1 # asn1-5.2.2 common_test-1.26.2 compiler-8.4.3 debugger-5.3.4 dialyzer-5.1.3 diameter-2.3.2.1 edoc-1.2.1 eldap-1.2.12 erl_docgen-1.5.2 erl_interface-5.5.1 et-1.7 eunit-2.9 ftp-1.2.1 inets-9.1 jinterface-1.14 kernel-9.2.4.1 megaco-4.5 mnesia-4.23.1 observer-2.15.1 odbc-2.14.2 os_mon-2.9.1 parsetools-2.5 public_key-1.15.1.1 reltool-1.0 runtime_tools-2.0.1 sasl-4.2.1 snmp-5.15 ssh-5.1.4.1 syntax_tools-3.1 tftp-1.1.1 tools-3.6 wx-2.4.1 xmerl-1.3.34 :