From d27eb3a6904d7b6e32f71ec572791abfbffe81da Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 17 Feb 2025 12:33:04 +0100 Subject: [PATCH 1/3] Update copyright year --- lib/inets/src/http_server/httpd_instance_sup.erl | 2 +- lib/inets/src/http_server/httpd_request_handler.erl | 2 +- lib/ssl/src/tls_v1.erl | 2 +- lib/ssl/test/ssl_sni_SUITE.erl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/inets/src/http_server/httpd_instance_sup.erl b/lib/inets/src/http_server/httpd_instance_sup.erl index 99305cb60347..dededc6aed28 100644 --- a/lib/inets/src/http_server/httpd_instance_sup.erl +++ b/lib/inets/src/http_server/httpd_instance_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2024. All Rights Reserved. +%% Copyright Ericsson AB 2001-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/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index 93f5d1acd533..048e6c14c315 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2024. All Rights Reserved. +%% Copyright Ericsson AB 1997-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_v1.erl b/lib/ssl/src/tls_v1.erl index 68d7b6bede8c..ed3598feefdb 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.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/test/ssl_sni_SUITE.erl b/lib/ssl/test/ssl_sni_SUITE.erl index 99d2bfd4707b..0002e20441b7 100644 --- a/lib/ssl/test/ssl_sni_SUITE.erl +++ b/lib/ssl/test/ssl_sni_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2015-2023. All Rights Reserved. +%% Copyright Ericsson AB 2015-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 495911bc0c12ac36761efd5bbab9012915468b79 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 17 Feb 2025 12:33:08 +0100 Subject: [PATCH 2/3] Prepare release --- lib/inets/doc/notes.md | 10 ++++++++++ lib/inets/vsn.mk | 2 +- lib/ssl/doc/notes.md | 15 +++++++++++++++ lib/ssl/vsn.mk | 2 +- make/otp_version_tickets | 9 +++------ 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/lib/inets/doc/notes.md b/lib/inets/doc/notes.md index 51861278edb4..9018326d41dc 100644 --- a/lib/inets/doc/notes.md +++ b/lib/inets/doc/notes.md @@ -19,6 +19,16 @@ limitations under the License. --> # Inets Release Notes +## Inets 9.3.2 + +### Fixed Bugs and Malfunctions + +- Improved robustness of httpd startup procedure. + + Own Id: OTP-19486 Aux Id: ERIERL-1190, [PR-9408] + +[PR-9408]: https://github.com/erlang/otp/pull/9408 + ## Inets 9.3.1 ### Fixed Bugs and Malfunctions diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 599bb2b8053d..391c4478848e 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 9.3.1 +INETS_VSN = 9.3.2 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" diff --git a/lib/ssl/doc/notes.md b/lib/ssl/doc/notes.md index e53863ab6881..e21ebfff43e7 100644 --- a/lib/ssl/doc/notes.md +++ b/lib/ssl/doc/notes.md @@ -21,6 +21,21 @@ limitations under the License. This document describes the changes made to the SSL application. +## SSL 11.2.8 + +### Fixed Bugs and Malfunctions + +- Setting protocol version to a lower value then supported by default in server API function called after ssl:listen/2 could result in wrong default values being used and connections failing with insufficient security. + + Own Id: OTP-19457 Aux Id: [PR-9418] + +- Improve error handling of server name indication fun. This implies that if the `sni_fun` returns `undefined` we will attempt connection with original option values, if it returns `unrecognized` we end the connection with UNRECOGNIZED_NAME alert and if provided options fail option verification we will end the connection with a HANDSHAKE_FAILURE and an error log. + + Own Id: OTP-19467 Aux Id: [PR-9387], ERIERL-1189 + +[PR-9418]: https://github.com/erlang/otp/pull/9418 +[PR-9387]: https://github.com/erlang/otp/pull/9387 + ## SSL 11.2.7 ### Fixed Bugs and Malfunctions diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index a121b8ff919b..3e2ef07053f8 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 11.2.7 +SSL_VSN = 11.2.8 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index d307b7e4db0b..d9c19ee6f372 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,6 +1,3 @@ -OTP-19240 -OTP-19381 -OTP-19411 -OTP-19445 -OTP-19455 -OTP-19462 +OTP-19457 +OTP-19467 +OTP-19486 From b6ab3a385ec72e346a44807d53e2109a51cde613 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 17 Feb 2025 12:33:09 +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 08edfd724f5c..09bbbec93e9f 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -27.2.2 +27.2.3 diff --git a/otp_versions.table b/otp_versions.table index 1c59f0bc1cca..a3d8ccea0691 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-27.2.3 : inets-9.3.2 ssl-11.2.8 # asn1-5.3.1 common_test-1.27.6 compiler-8.5.5 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 erts-15.2.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 jinterface-1.14.1 kernel-10.2.2 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.1 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.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 :