tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

ensure hostname is lower-case before hashing it;
bz#2591 reported by Griff Miller II; ok dtucker@

Upstream-ID: c3b8b93804f376bd00d859b8bcd9fc0d86b4db17
This commit is contained in:
djm@openbsd.org 2017-03-10 04:26:06 +00:00 committed by Damien Miller
parent df9936936c
commit db2597207e
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hostfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: hostfile.c,v 1.67 2016/09/17 18:00:27 tedu Exp $ */ /* $OpenBSD: hostfile.c,v 1.68 2017/03/10 04:26:06 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -419,19 +419,24 @@ write_host_entry(FILE *f, const char *host, const char *ip,
const struct sshkey *key, int store_hash) const struct sshkey *key, int store_hash)
{ {
int r, success = 0; int r, success = 0;
char *hashed_host = NULL; char *hashed_host = NULL, *lhost;
lhost = xstrdup(host);
lowercase(lhost);
if (store_hash) { if (store_hash) {
if ((hashed_host = host_hash(host, NULL, 0)) == NULL) { if ((hashed_host = host_hash(lhost, NULL, 0)) == NULL) {
error("%s: host_hash failed", __func__); error("%s: host_hash failed", __func__);
free(lhost);
return 0; return 0;
} }
fprintf(f, "%s ", hashed_host); fprintf(f, "%s ", hashed_host);
} else if (ip != NULL) } else if (ip != NULL)
fprintf(f, "%s,%s ", host, ip); fprintf(f, "%s,%s ", lhost, ip);
else else {
fprintf(f, "%s ", host); fprintf(f, "%s ", lhost);
}
free(lhost);
if ((r = sshkey_write(key, f)) == 0) if ((r = sshkey_write(key, f)) == 0)
success = 1; success = 1;
else else

3
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.298 2017/03/06 02:03:20 dtucker Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.299 2017/03/10 04:26:06 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1108,6 +1108,7 @@ known_hosts_hash(struct hostkey_foreach_line *l, void *_ctx)
*/ */
ohosts = hosts = xstrdup(l->hosts); ohosts = hosts = xstrdup(l->hosts);
while ((cp = strsep(&hosts, ",")) != NULL && *cp != '\0') { while ((cp = strsep(&hosts, ",")) != NULL && *cp != '\0') {
lowercase(cp);
if ((hashed = host_hash(cp, NULL, 0)) == NULL) if ((hashed = host_hash(cp, NULL, 0)) == NULL)
fatal("hash_host failed"); fatal("hash_host failed");
fprintf(ctx->out, "%s %s\n", hashed, l->rawkey); fprintf(ctx->out, "%s %s\n", hashed, l->rawkey);

3
ssh-keyscan.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keyscan.c,v 1.108 2017/03/10 03:18:24 djm Exp $ */ /* $OpenBSD: ssh-keyscan.c,v 1.109 2017/03/10 04:26:06 djm Exp $ */
/* /*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
* *
@ -327,6 +327,7 @@ keyprint_one(const char *host, struct sshkey *key)
const char *known_host, *hashed; const char *known_host, *hashed;
hostport = put_host_port(host, ssh_port); hostport = put_host_port(host, ssh_port);
lowercase(hostport);
if (hash_hosts && (hashed = host_hash(host, NULL, 0)) == NULL) if (hash_hosts && (hashed = host_hash(host, NULL, 0)) == NULL)
fatal("host_hash failed"); fatal("host_hash failed");
known_host = hash_hosts ? hashed : hostport; known_host = hash_hosts ? hashed : hostport;