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: Ignore whitespace when checking explict fingerprint. 

When confirming a host key using the fingerprint itself, ignore leading and
trailing whitespace. ok deraadt@ djm@

OpenBSD-Commit-ID: cafd7f803bbdcd40c3a8f8f1a77747e6b6d8c011
This commit is contained in:
dtucker@openbsd.org 2020-01-22 07:38:30 +00:00 committed by Damien Miller
parent 8d3af6ebdf
commit 65cf8730de
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.325 2020/01/11 16:23:10 naddy Exp $ */ /* $OpenBSD: sshconnect.c,v 1.326 2020/01/22 07:38:30 dtucker 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
@ -580,22 +580,23 @@ confirm(const char *prompt, const char *fingerprint)
{ {
const char *msg, *again = "Please type 'yes' or 'no': "; const char *msg, *again = "Please type 'yes' or 'no': ";
const char *again_fp = "Please type 'yes', 'no' or the fingerprint: "; const char *again_fp = "Please type 'yes', 'no' or the fingerprint: ";
char *p; char *p, *cp;
int ret = -1; int ret = -1;
if (options.batch_mode) if (options.batch_mode)
return 0; return 0;
for (msg = prompt;;msg = fingerprint ? again_fp : again) { for (msg = prompt;;msg = fingerprint ? again_fp : again) {
p = read_passphrase(msg, RP_ECHO); cp = p = read_passphrase(msg, RP_ECHO);
if (p == NULL) if (p == NULL)
return 0; return 0;
p[strcspn(p, "\n")] = '\0'; p += strspn(p, " \t"); /* skip leading whitespace */
p[strcspn(p, " \t\n")] = '\0'; /* remove trailing whitespace */
if (p[0] == '\0' || strcasecmp(p, "no") == 0) if (p[0] == '\0' || strcasecmp(p, "no") == 0)
ret = 0; ret = 0;
else if (strcasecmp(p, "yes") == 0 || (fingerprint != NULL && else if (strcasecmp(p, "yes") == 0 || (fingerprint != NULL &&
strcasecmp(p, fingerprint) == 0)) strcasecmp(p, fingerprint) == 0))
ret = 1; ret = 1;
free(p); free(cp);
if (ret != -1) if (ret != -1)
return ret; return ret;
} }