diff options
author | Colin Watson <cjwatson@ubuntu.com> | 2014-02-09 16:09:50 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2018-10-20 22:54:09 +0100 |
commit | eccbd3637a2b8544fdcfdd5d1a00a9dfdac62aeb (patch) | |
tree | f8da5fac8b6139f5ad74dd45e9354698a3f22a6e | |
parent | cf3f6ac19812e4d32874304b3854b055831c2124 (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 36bc5e59a..5e655e924 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -190,6 +190,7 @@ static struct { | |||
190 | { "fallbacktorsh", oDeprecated }, | 190 | { "fallbacktorsh", oDeprecated }, |
191 | { "globalknownhostsfile2", oDeprecated }, | 191 | { "globalknownhostsfile2", oDeprecated }, |
192 | { "rhostsauthentication", oDeprecated }, | 192 | { "rhostsauthentication", oDeprecated }, |
193 | { "useblacklistedkeys", oDeprecated }, | ||
193 | { "userknownhostsfile2", oDeprecated }, | 194 | { "userknownhostsfile2", oDeprecated }, |
194 | { "useroaming", oDeprecated }, | 195 | { "useroaming", oDeprecated }, |
195 | { "usersh", oDeprecated }, | 196 | { "usersh", oDeprecated }, |
diff --git a/servconf.c b/servconf.c index 4668b8a45..6caf1db38 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -600,6 +600,7 @@ static struct { | |||
600 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, | 600 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, |
601 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, | 601 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, |
602 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, | 602 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, |
603 | { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL }, | ||
603 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, | 604 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, |
604 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, | 605 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, |
605 | { "uselogin", sDeprecated, SSHCFG_GLOBAL }, | 606 | { "uselogin", sDeprecated, SSHCFG_GLOBAL }, |