Allow ssh-keygen on Windows to detect ssh key type (#14413)

tokarchuk/v1.17
Chester Liu 4 years ago committed by GitHub
parent c05c0a1512
commit 072d550dda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      models/ssh_key.go

@ -223,11 +223,6 @@ func writeTmpKeyFile(content string) (string, error) {
// SSHKeyGenParsePublicKey extracts key type and length using ssh-keygen.
func SSHKeyGenParsePublicKey(key string) (string, int, error) {
// The ssh-keygen in Windows does not print key type, so no need go further.
if setting.IsWindows {
return "", 0, nil
}
tmpName, err := writeTmpKeyFile(key)
if err != nil {
return "", 0, fmt.Errorf("writeTmpKeyFile: %v", err)

Loading…
Cancel
Save