diff options
author | Rémy Coutable <remy@rymai.me> | 2017-02-24 19:05:17 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-02-24 19:05:17 +0100 |
commit | 896921b8401fa3186f9a072d42dce6fc34025276 (patch) | |
tree | 0b84d0582a3389ffc1398dd47e4cdc157c3a5376 | |
parent | 2d402ef9ca7dbb10b4d1c30596ae77727136d15b (diff) | |
download | gitlab-ce-17849-allow-admin-to-restrict-min-key-length-and-techno.tar.gz |
Remove an unused method17849-allow-admin-to-restrict-min-key-length-and-techno
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | lib/gitlab/ssh_public_key.rb | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/lib/gitlab/ssh_public_key.rb b/lib/gitlab/ssh_public_key.rb index e176e34ee75..b062dbecf5a 100644 --- a/lib/gitlab/ssh_public_key.rb +++ b/lib/gitlab/ssh_public_key.rb @@ -84,22 +84,5 @@ module Gitlab nil end end - - def explicit_fingerprint_algorithm? - # OpenSSH 6.8 introduces a new default output format for fingerprints. - # Check the version and decide which command to use. - - version_output, version_status = popen(%w[ssh -V]) - return false unless version_status.zero? - - version_matches = version_output.match(/OpenSSH_(?<major>\d+)\.(?<minor>\d+)/) - return false unless version_matches - - version_info = Gitlab::VersionInfo.new(version_matches[:major].to_i, version_matches[:minor].to_i) - - required_version_info = Gitlab::VersionInfo.new(6, 8) - - version_info >= required_version_info - end end end |