diff options
| author | Beat Bolli <dev+git@drbeat.li> | 2018-02-24 19:39:13 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-02 15:13:10 -0800 |
| commit | 6a47fa0efa342daa53c6386538fda313420351a5 (patch) | |
| tree | b223c8b9ccb2b11a88b1cc49cc4a63ad5cc92af0 | |
| parent | 5ab72271e16ac23c269f5019a74a7b1d65170e47 (diff) | |
| download | git-6a47fa0efa342daa53c6386538fda313420351a5.tar.gz | |
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
https://github.com/git-for-windows/git/issues/1487 and subseqently in
https://public-inbox.org/git/F65780F29E48994380E2BCE87C6F071101146AB1@DEERLM99EX2MSX.ww931.my-it-solutions.net/
Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | lib/sshkey.tcl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sshkey.tcl b/lib/sshkey.tcl index aa6457bbb5..589ff8f78a 100644 --- a/lib/sshkey.tcl +++ b/lib/sshkey.tcl @@ -2,7 +2,10 @@ # Copyright (C) 2006, 2007 Shawn Pearce proc find_ssh_key {} { - foreach name {~/.ssh/id_dsa.pub ~/.ssh/id_rsa.pub ~/.ssh/identity.pub} { + foreach name { + ~/.ssh/id_dsa.pub ~/.ssh/id_ecdsa.pub ~/.ssh/id_ed25519.pub + ~/.ssh/id_rsa.pub ~/.ssh/identity.pub + } { if {[file exists $name]} { set fh [open $name r] set cont [read $fh] |