diff options
author | Colin Watson <cjwatson@ubuntu.com> | 2014-02-09 16:09:50 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:25:35 +0100 |
commit | 6ed578a01fd61f9c930ef46cfefc467203ddd6c0 (patch) | |
tree | 19780a70d515f1212a9cb04acf690896c0f37ae3 | |
parent | 8641a3f57e67e087b4500beb9916e06c4d0ba94c (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 fb585e248..2ccc48572 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -191,6 +191,7 @@ static struct { | |||
191 | { "fallbacktorsh", oDeprecated }, | 191 | { "fallbacktorsh", oDeprecated }, |
192 | { "globalknownhostsfile2", oDeprecated }, | 192 | { "globalknownhostsfile2", oDeprecated }, |
193 | { "rhostsauthentication", oDeprecated }, | 193 | { "rhostsauthentication", oDeprecated }, |
194 | { "useblacklistedkeys", oDeprecated }, | ||
194 | { "userknownhostsfile2", oDeprecated }, | 195 | { "userknownhostsfile2", oDeprecated }, |
195 | { "useroaming", oDeprecated }, | 196 | { "useroaming", oDeprecated }, |
196 | { "usersh", oDeprecated }, | 197 | { "usersh", oDeprecated }, |
diff --git a/servconf.c b/servconf.c index f38ba9e44..ff5b9436c 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -656,6 +656,7 @@ static struct { | |||
656 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, | 656 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, |
657 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, | 657 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, |
658 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, | 658 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, |
659 | { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL }, | ||
659 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, | 660 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, |
660 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, | 661 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, |
661 | { "uselogin", sDeprecated, SSHCFG_GLOBAL }, | 662 | { "uselogin", sDeprecated, SSHCFG_GLOBAL }, |