diff options
author | Colin Watson <cjwatson@ubuntu.com> | 2014-02-09 16:09:50 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-10-04 13:54:48 +0100 |
commit | 19971fb92159a621b55f0b9da76dd38a56d7247c (patch) | |
tree | 0c82200df2b11017bd9b50cf1565cce59eda9c90 | |
parent | 4b276122c04aed0726803a92c8ca955e614a4d3a (diff) |
Accept obsolete ssh-vulnkey configuration options
These options were used as part of Debian's response to CVE-2008-0166.
Nearly six years later, we no longer need to continue carrying the bulk
of that patch, but we do need to avoid failing when the associated
configuration options are still present.
Last-Update: 2014-02-09
Patch-Name: ssh-vulnkey-compat.patch
-rw-r--r-- | readconf.c | 1 | ||||
-rw-r--r-- | servconf.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/readconf.c b/readconf.c index 99e03ee1f..d2b28a41b 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -189,6 +189,7 @@ static struct { | |||
189 | { "fallbacktorsh", oDeprecated }, | 189 | { "fallbacktorsh", oDeprecated }, |
190 | { "globalknownhostsfile2", oDeprecated }, | 190 | { "globalknownhostsfile2", oDeprecated }, |
191 | { "rhostsauthentication", oDeprecated }, | 191 | { "rhostsauthentication", oDeprecated }, |
192 | { "useblacklistedkeys", oDeprecated }, | ||
192 | { "userknownhostsfile2", oDeprecated }, | 193 | { "userknownhostsfile2", oDeprecated }, |
193 | { "useroaming", oDeprecated }, | 194 | { "useroaming", oDeprecated }, |
194 | { "usersh", oDeprecated }, | 195 | { "usersh", oDeprecated }, |
diff --git a/servconf.c b/servconf.c index 8ba745170..9889fb0a0 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -525,6 +525,7 @@ static struct { | |||
525 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, | 525 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, |
526 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, | 526 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, |
527 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, | 527 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, |
528 | { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL }, | ||
528 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, | 529 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, |
529 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, | 530 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, |
530 | { "uselogin", sDeprecated, SSHCFG_GLOBAL }, | 531 | { "uselogin", sDeprecated, SSHCFG_GLOBAL }, |