Skip to content

Commit 6a47fa0

Browse files
bbolligitster
authored andcommitted
git-gui: search for all current SSH key types
OpenSSH has supported Ed25519 keys since version 6.4 (2014-01-30), and ECDSA keys since version 5.7 (2011-01-24). git-gui fails to find these key types in its Help/Show SSH Key dialog. Teach git-gui to show Ed25519 and ECDSA keys as well. This was originally reported in #1487 and subseqently in https://public-inbox.org/git/F65780F29E48994380E2BCE87C6F071101146AB1@DEERLM99EX2MSX.ww931.my-it-solutions.net/ Signed-off-by: Beat Bolli <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5ab7227 commit 6a47fa0

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

lib/sshkey.tcl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
# Copyright (C) 2006, 2007 Shawn Pearce
33

44
proc find_ssh_key {} {
5-
foreach name {~/.ssh/id_dsa.pub ~/.ssh/id_rsa.pub ~/.ssh/identity.pub} {
5+
foreach name {
6+
~/.ssh/id_dsa.pub ~/.ssh/id_ecdsa.pub ~/.ssh/id_ed25519.pub
7+
~/.ssh/id_rsa.pub ~/.ssh/identity.pub
8+
} {
69
if {[file exists $name]} {
710
set fh [open $name r]
811
set cont [read $fh]

0 commit comments

Comments
 (0)