From c804d1bfa9113a7bb04f8204ee1125f470230549 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 31 Oct 2024 12:46:04 +0100 Subject: [PATCH 1/3] Update copyright year --- lib/common_test/doc/src/ct_telnet.xml | 2 +- lib/common_test/src/ct_conn_log_h.erl | 2 +- lib/common_test/src/cth_conn_log.erl | 2 +- lib/crypto/c_src/digest.c | 2 +- lib/crypto/c_src/digest.h | 2 +- lib/crypto/c_src/hash.c | 2 +- lib/ssl/test/ssl_trace_SUITE.erl | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/common_test/doc/src/ct_telnet.xml b/lib/common_test/doc/src/ct_telnet.xml index f003fe086081..f9935e6a2419 100644 --- a/lib/common_test/doc/src/ct_telnet.xml +++ b/lib/common_test/doc/src/ct_telnet.xml @@ -4,7 +4,7 @@
- 20102020 + 20102024 Ericsson AB. All Rights Reserved. diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl index ffc37c857f69..308c8e27c34c 100644 --- a/lib/common_test/src/ct_conn_log_h.erl +++ b/lib/common_test/src/ct_conn_log_h.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2012-2017. 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/src/cth_conn_log.erl b/lib/common_test/src/cth_conn_log.erl index 3b10bb024baa..116fc90775ac 100644 --- a/lib/common_test/src/cth_conn_log.erl +++ b/lib/common_test/src/cth_conn_log.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2012-2023. 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/crypto/c_src/digest.c b/lib/crypto/c_src/digest.c index 40201f0f89bc..cbdd70caf1fe 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/c_src/hash.c b/lib/crypto/c_src/hash.c index 522df8d5d737..2f7284da8405 100644 --- a/lib/crypto/c_src/hash.c +++ b/lib/crypto/c_src/hash.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2010-2022. 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/ssl/test/ssl_trace_SUITE.erl b/lib/ssl/test/ssl_trace_SUITE.erl index e8294dfd9ce6..d0635905eb99 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. From 1dfc93d7bdf9f4a475a2f5fad6ab6dc28961f3dd Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 31 Oct 2024 12:46:05 +0100 Subject: [PATCH 2/3] Prepare release --- lib/common_test/doc/src/notes.xml | 17 +++++++++++++++ lib/common_test/vsn.mk | 2 +- lib/crypto/doc/src/notes.xml | 24 +++++++++++++++++++++ lib/crypto/vsn.mk | 2 +- lib/ssh/doc/src/notes.xml | 16 ++++++++++++++ lib/ssh/vsn.mk | 2 +- lib/ssl/doc/src/notes.xml | 35 +++++++++++++++++++++++++++++++ lib/ssl/vsn.mk | 2 +- make/otp_version_tickets | 31 ++++++--------------------- 9 files changed, 102 insertions(+), 29 deletions(-) diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml index 80429bc7b4d2..81d844ff4688 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.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/common_test/vsn.mk b/lib/common_test/vsn.mk index 66c11b4e2b6a..43f5ec5ed8c8 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1 +1 @@ -COMMON_TEST_VSN = 1.26.2.1 +COMMON_TEST_VSN = 1.26.2.2 diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml index a26115bb296a..ac3b33c3194c 100644 --- a/lib/crypto/doc/src/notes.xml +++ b/lib/crypto/doc/src/notes.xml @@ -31,6 +31,30 @@

This document describes the changes made to the Crypto application.

+
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/crypto/vsn.mk b/lib/crypto/vsn.mk index 8d3d861a06ac..f543ec636879 100644 --- a/lib/crypto/vsn.mk +++ b/lib/crypto/vsn.mk @@ -1 +1 @@ -CRYPTO_VSN = 5.4.2.2 +CRYPTO_VSN = 5.4.2.3 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 627e76612280..53fdbbb2df1a 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,22 @@ notes.xml +
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/ssh/vsn.mk b/lib/ssh/vsn.mk index 29598d903486..b4e87f959231 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,4 +1,4 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 5.1.4.3 +SSH_VSN = 5.1.4.4 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index df557bbe820b..492bfa1d73fd 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -27,6 +27,41 @@

This document describes the changes made to the SSL application.

+
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/vsn.mk b/lib/ssl/vsn.mk index c2a50f85ce85..84b19b002713 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 11.1.4.4 +SSL_VSN = 11.1.4.5 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 00a0f4c10aec..99549ffc0672 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,25 +1,6 @@ -OTP-19124 -OTP-19158 -OTP-19212 -OTP-19217 -OTP-19221 -OTP-19223 -OTP-19235 -OTP-19236 -OTP-19238 -OTP-19246 -OTP-19247 -OTP-19249 -OTP-19251 -OTP-19252 -OTP-19254 -OTP-19256 -OTP-19257 -OTP-19258 -OTP-19265 -OTP-19266 -OTP-19267 -OTP-19269 -OTP-19270 -OTP-19274 -OTP-19284 +OTP-19293 +OTP-19311 +OTP-19316 +OTP-19325 +OTP-19326 +OTP-19329 From 57f154f5ceb592ffa5360f7e338577fa04aa0d5f Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 31 Oct 2024 12:46:07 +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 461faa9f3758..bdca45ea69a5 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -26.2.5.4 +26.2.5.5 diff --git a/otp_versions.table b/otp_versions.table index 300f0efaab36..73ad2b2955d7 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +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 :