From 1a5bfc56bafd56ffa9e1129fe1cb3b8523884876 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 20 Feb 2025 15:17:43 +0100 Subject: [PATCH 1/3] Update copyright year --- erts/emulator/beam/erl_process.c | 2 +- erts/emulator/beam/erl_process.h | 2 +- lib/public_key/src/pubkey_cert.erl | 2 +- lib/ssh/src/ssh_sftpd.erl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index a6e7e5901792..03dbbe0a5e94 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -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/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 6e01e9ff4e2e..c89ae3530412 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -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 341fe843ceab..74bfc6dc105d 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/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl index 6bcad0d056e7..f3d8053db02b 100644 --- a/lib/ssh/src/ssh_sftpd.erl +++ b/lib/ssh/src/ssh_sftpd.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2021. All Rights Reserved. +%% Copyright Ericsson AB 2005-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 61be4997cf940461246e4c85ee358a721981dcba Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 20 Feb 2025 15:17:44 +0100 Subject: [PATCH 2/3] Prepare release --- erts/doc/src/notes.xml | 16 ++++++++++++++++ erts/vsn.mk | 2 +- lib/public_key/doc/src/notes.xml | 16 ++++++++++++++++ lib/public_key/vsn.mk | 2 +- lib/ssh/doc/src/notes.xml | 15 +++++++++++++++ lib/ssh/vsn.mk | 2 +- make/otp_version_tickets | 9 +++------ 7 files changed, 53 insertions(+), 9 deletions(-) diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index ab161664bd71..8ce41555d538 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,22 @@

This document describes the changes made to the ERTS application.

+
Erts 13.2.2.14 + +
Fixed Bugs and Malfunctions + + +

Fixed BEAM crash when a custom thread sends a large + map (>128 keys) externally encoded with for example + erl_drv_send_term().

+

+ Own Id: OTP-19495 Aux Id: GH-8208, PR-8209

+ + +
+ +
+
Erts 13.2.2.13
Fixed Bugs and Malfunctions diff --git a/erts/vsn.mk b/erts/vsn.mk index dfaeb14238e1..0b8079882030 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 13.2.2.13 +VSN = 13.2.2.14 # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml index f44ec2bf6be1..591d94d31f22 100644 --- a/lib/public_key/doc/src/notes.xml +++ b/lib/public_key/doc/src/notes.xml @@ -35,6 +35,22 @@ notes.xml +
Public_Key 1.13.3.6 + +
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

+ + +
+ +
+
Public_Key 1.13.3.5
Fixed Bugs and Malfunctions diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk index 03eef646f43d..97dc48519103 100644 --- a/lib/public_key/vsn.mk +++ b/lib/public_key/vsn.mk @@ -1 +1 @@ -PUBLIC_KEY_VSN = 1.13.3.5 +PUBLIC_KEY_VSN = 1.13.3.6 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index c44e76bab662..60d21a69dffb 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,21 @@ notes.xml +
Ssh 4.15.3.10 + +
Fixed Bugs and Malfunctions + + +

SFTP packets exceeding max packet size are not + processed and dropped.

+

+ Own Id: OTP-19466 Aux Id: ERIERL-1173, CVE-2025-26618

+ + +
+ +
+
Ssh 4.15.3.9
Fixed Bugs and Malfunctions diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 513836c559da..9762e04d66b2 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.9 +SSH_VSN = 4.15.3.10 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 6e4c211d820c..c9deb45894b5 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,6 +1,3 @@ -OTP-19381 -OTP-19385 -OTP-19388 -OTP-19392 -OTP-19435 -OTP-19462 +OTP-19240 +OTP-19466 +OTP-19495 From 2a848b575d6fc7797fe88e226d1e5d26c894251d Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 20 Feb 2025 15:17:45 +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 f2111c5fce20..c91dc74fb078 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -25.3.2.17 +25.3.2.18 diff --git a/otp_versions.table b/otp_versions.table index 0c4d807ad037..150bff4b5489 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-25.3.2.18 : erts-13.2.2.14 public_key-1.13.3.6 ssh-4.15.3.10 # asn1-5.0.21.1 common_test-1.24.0.6 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 inets-8.3.1.5 jinterface-1.13.2 kernel-8.5.4.4 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.7 stdlib-4.3.1.6 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.17 : common_test-1.24.0.6 erts-13.2.2.13 kernel-8.5.4.4 ssh-4.15.3.9 # 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 inets-8.3.1.5 jinterface-1.13.2 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.5 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.7 stdlib-4.3.1.6 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.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 :