sour-is/sshfwd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
xuu 2021-08-26 20:56:55 +00:00
parent 784ecf0399
commit f11887ab0e
No known key found for this signature in database
GPG Key ID: 1601E16A9C4D8A22
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main.go
View File

@ -434,11 +434,8 @@ func (m *serverMux) Serve(ctx context.Context) error {
} }
} }
<<<<<<< Updated upstream
func fingerprintHuman(pubKey ssh.PublicKey) string { func fingerprintHuman(pubKey ssh.PublicKey) string {
sha256sum := sha256.Sum256(pubKey.Marshal()) sha256sum := sha256.Sum256(pubKey.Marshal())
h, _ := humanhash.Humanize(sha256sum[:], 3) h, _ := humanhash.Humanize(sha256sum[:], 3)
return h return h
} }
=======
>>>>>>> Stashed changes