Respect SSH.KeygenPath option when calculating ssh key fingerprints (go-gitea#27536) (go-gitea#27551)

GiteaBot · picsel2 · web-flow · commit 63587a4aef69 · 2023-10-10T07:37:58.000Z
Backport go-gitea#27536 by @picsel2 Fixes go-gitea#27535 Co-authored-by: Sebastian Grabowski <sebastian@grabel.de>
diff --git a/models/asymkey/ssh_key_fingerprint.go b/models/asymkey/ssh_key_fingerprint.go
@@ -81,7 +81,7 @@ func CalcFingerprint(publicKeyContent string) (string, error) {
 		fnName, fp string
 		err        error
 	)
-	if setting.SSH.StartBuiltinServer {
+	if len(setting.SSH.KeygenPath) == 0 {
 		fnName = "calcFingerprintNative"
 		fp, err = calcFingerprintNative(publicKeyContent)
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func CalcFingerprint(publicKeyContent string) (string, error) {`
`81`	`81`	`fnName, fp string`
`82`	`82`	`err error`
`83`	`83`	`)`
`84`		`- if setting.SSH.StartBuiltinServer {`
	`84`	`+ if len(setting.SSH.KeygenPath) == 0 {`
`85`	`85`	`fnName = "calcFingerprintNative"`
`86`	`86`	`fp, err = calcFingerprintNative(publicKeyContent)`
`87`	`87`	`} else {`