Automatic merge of gitlab-org/gitlab-ce master

Gemfile

@@ -425,7 +425,7 @@ gem 'net-ntp'
 
 # SSH host key support
 gem 'net-ssh', '~> 5.0'
-gem 'sshkey', '~> 1.9.0'
+gem 'sshkey', '~> 2.0'
 
 # Required for ED25519 SSH host key support
 group :ed25519 do

Gemfile.lock

@@ -885,7 +885,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    sshkey (1.9.0)
+    sshkey (2.0.0)
     stackprof (0.2.10)
     state_machines (0.5.0)
     state_machines-activemodel (0.5.1)
@@ -1196,7 +1196,7 @@ DEPENDENCIES
   spring (~> 2.0.0)
   spring-commands-rspec (~> 1.0.4)
   sprockets (~> 3.7.0)
-  sshkey (~> 1.9.0)
+  sshkey (~> 2.0)
   stackprof (~> 0.2.10)
   state_machines-activerecord (~> 0.5.1)
   sys-filesystem (~> 1.1.6)

changelogs/unreleased/47150-update-sshkey.yml

+---
+title: Fix validation of certain ed25519 keys
+merge_request: 25115
+author: Merlijn B. W. Wajer
+type: fixed