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 

fix ssh_config FingerprintHash evaluation order; from Petr
 Lautrbach
This commit is contained in:
djm@openbsd.org 2015-01-08 13:44:36 +00:00 committed by Damien Miller
parent ab24ab847b
commit e752c6d547
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.224 2014/12/21 22:27:56 djm Exp $ */ /* $OpenBSD: readconf.c,v 1.225 2015/01/08 13:44:36 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
@ -1464,6 +1464,7 @@ parse_int:
goto parse_string; goto parse_string;
case oFingerprintHash: case oFingerprintHash:
intptr = &options->fingerprint_hash;
arg = strdelim(&s); arg = strdelim(&s);
if (!arg || *arg == '\0') if (!arg || *arg == '\0')
fatal("%.200s line %d: Missing argument.", fatal("%.200s line %d: Missing argument.",
@ -1471,8 +1472,8 @@ parse_int:
if ((value = ssh_digest_alg_by_name(arg)) == -1) if ((value = ssh_digest_alg_by_name(arg)) == -1)
fatal("%.200s line %d: Invalid hash algorithm \"%s\".", fatal("%.200s line %d: Invalid hash algorithm \"%s\".",
filename, linenum, arg); filename, linenum, arg);
if (*activep) if (*activep && *intptr == -1)
options->fingerprint_hash = value; *intptr = value;
break; break;
case oDeprecated: case oDeprecated: