Prepare release

Author: Erlang/OTP

erts/doc/notes.md

@@ -23,6 +23,17 @@ limitations under the License.
 
 This document describes the changes made to the ERTS application.
 
+## Erts 17.0.5
+
+### Fixed Bugs and Malfunctions
+
+- Fixed a regression in the previous patch release that prevented epmd from binding to localhost.
+
+  Own Id: OTP-20275 Aux Id: [PR-11409], [GH-11402]
+
+[PR-11409]: https://github.com/erlang/otp/pull/11409
+[GH-11402]: https://github.com/erlang/otp/issues/11402
+
 ## Erts 17.0.4
 
 ### Fixed Bugs and Malfunctions

erts/vsn.mk

@@ -20,7 +20,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 17.0.4
+VSN = 17.0.5
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3

lib/ssh/doc/notes.md

@@ -21,6 +21,16 @@ limitations under the License.
 -->
 # SSH Release Notes
 
+## Ssh 6.0.4
+
+### Fixed Bugs and Malfunctions
+
+- The SSH client and server now reject incoming packets not aligned to the cipher block size as required by RFC 4253 §6. For CBC ciphers, a timing-safe "packet discard" mechanism (CVE-2008-5161 mitigation) ensures structural errors are indistinguishable from MAC failures before disconnecting. AEAD and encrypt-then-MAC modes disconnect immediately.
+
+  Own Id: OTP-20137 Aux Id: [PR-11110]
+
+[PR-11110]: https://github.com/erlang/otp/pull/11110
+
 ## Ssh 6.0.3
 
 ### Fixed Bugs and Malfunctions

lib/ssh/vsn.mk

@@ -1,6 +1,6 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 6.0.3
+SSH_VSN = 6.0.4
 APP_VSN    = "ssh-$(SSH_VSN)"
 
 # %CopyrightBegin%

make/otp_version_tickets

@@ -1,20 +1,2 @@
-OTP-20136
-OTP-20143
-OTP-20214
-OTP-20229
-OTP-20237
-OTP-20239
-OTP-20240
-OTP-20241
-OTP-20242
-OTP-20243
-OTP-20244
-OTP-20245
-OTP-20248
-OTP-20250
-OTP-20251
-OTP-20257
-OTP-20258
-OTP-20259
-OTP-20260
-OTP-20261
+OTP-20137
+OTP-20275