From 01d22d18e634c6c262ae42e0220b4f65ae2e4cf4 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 27 Feb 2022 15:02:04 +0000 Subject: [PATCH] Filesystem API: Include the `ssh-ed25519` public key signature algorithm as an alternative to `ssh-rsa`. The `ssh-rsa` signature algorithm is disabled by default as of OpenSSH 8.8, which breaks SSH2 uploads in WordPress on modern systems. `ssh-ed25519` is one of the suggested alternatives, supported since OpenSSH 6.5. References: * [https://www.openssh.com/txt/release-8.2 OpenSSH 8.2 release notes] * [https://www.openssh.com/txt/release-8.7 OpenSSH 8.7 release notes] * [https://www.openssh.com/txt/release-8.8 OpenSSH 8.8 release notes] Follow-up to [8865]. Props richybkreckel, dd32. Fixes #52409. Built from https://develop.svn.wordpress.org/trunk@52807 git-svn-id: http://core.svn.wordpress.org/trunk@52396 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-filesystem-ssh2.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php index bd2f6ba951..7032ae63d9 100644 --- a/wp-admin/includes/class-wp-filesystem-ssh2.php +++ b/wp-admin/includes/class-wp-filesystem-ssh2.php @@ -88,7 +88,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { $this->options['public_key'] = $opt['public_key']; $this->options['private_key'] = $opt['private_key']; - $this->options['hostkey'] = array( 'hostkey' => 'ssh-rsa' ); + $this->options['hostkey'] = array( 'hostkey' => 'ssh-rsa,ssh-ed25519' ); $this->keys = true; } elseif ( empty( $opt['username'] ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index e922f3dae7..5949c9f395 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-alpha-52806'; +$wp_version = '6.0-alpha-52807'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.