Bugzilla – Attachment 2956 Details for
Bug 2692
Hash does not include the port
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
include port in ssh-keyscan hash
bz2692.diff (text/plain), 774 bytes, created by
Damien Miller
on 2017-03-10 13:42:31 AEDT
(
hide
)
Description:
include port in ssh-keyscan hash
Filename:
MIME Type:
Creator:
Damien Miller
Created:
2017-03-10 13:42:31 AEDT
Size:
774 bytes
patch
obsolete
>diff --git a/ssh-keyscan.c b/ssh-keyscan.c >index 9f9ec9b..36a597d 100644 >--- a/ssh-keyscan.c >+++ b/ssh-keyscan.c >@@ -301,16 +301,17 @@ keygrab_ssh2(con *c) > } > > static void >-keyprint_one(char *host, struct sshkey *key) >+keyprint_one(const char *host, struct sshkey *key) > { > char *hostport; >- >- if (hash_hosts && (host = host_hash(host, NULL, 0)) == NULL) >- fatal("host_hash failed"); >+ const char *known_host, *hashed; > > hostport = put_host_port(host, ssh_port); >+ if (hash_hosts && (hashed = host_hash(host, NULL, 0)) == NULL) >+ fatal("host_hash failed"); >+ known_host = hash_hosts ? hashed : hostport; > if (!get_cert) >- fprintf(stdout, "%s ", hostport); >+ fprintf(stdout, "%s ", known_host); > sshkey_write(key, stdout); > fputs("\n", stdout); > free(hostport);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=2956">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
dtucker
:
ok+
Actions:
View
|
Diff
Attachments on
bug 2692
: 2956