upstream commit

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

Upstream-ID: c3b8b93804f376bd00d859b8bcd9fc0d86b4db17

diff --git a/hostfile.c b/hostfile.c
index 4548fbab3d8011d74a9c1a510c281d66d4f92bc8..e23faa9696af1b1998147cd6792c03b43f849062 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -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>
  * 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)
 {
        int r, success = 0;
-       char *hashed_host = NULL;
+       char *hashed_host = NULL, *lhost;
+
+       lhost = xstrdup(host);
+       lowercase(lhost);
 
        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__);
+                       free(lhost);
                        return 0;
                }
                fprintf(f, "%s ", hashed_host);
        } else if (ip != NULL)
-               fprintf(f, "%s,%s ", host, ip);
-       else
-               fprintf(f, "%s ", host);
-
+               fprintf(f, "%s,%s ", lhost, ip);
+       else {
+               fprintf(f, "%s ", lhost);
+       }
+       free(lhost);
        if ((r = sshkey_write(key, f)) == 0)
                success = 1;
        else

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 6fd1f0348308ad6a4ad784a4c5ca418c6a37801d..f17af036bbfa55341e4e6ce9041b0582094dd67e 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -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>
  * 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);
                while ((cp = strsep(&hosts, ",")) != NULL && *cp != '\0') {
+                       lowercase(cp);
                        if ((hashed = host_hash(cp, NULL, 0)) == NULL)
                                fatal("hash_host failed");
                        fprintf(ctx->out, "%s %s\n", hashed, l->rawkey);

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index e34286e47c5ae084fcb619466cd7d94889367682..1f95239a37c67c03e6315e110b564eeee4d7fe06 100644 (file)
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -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>.
  *
@@ -327,6 +327,7 @@ keyprint_one(const char *host, struct sshkey *key)
        const char *known_host, *hashed;
 
        hostport = put_host_port(host, ssh_port);
+       lowercase(hostport);
        if (hash_hosts && (hashed = host_hash(host, NULL, 0)) == NULL)
                fatal("host_hash failed");
        known_host = hash_hosts ? hashed : hostport;