diff options
author | Colin Watson <cjwatson@ubuntu.com> | 2014-02-09 16:09:50 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-01-14 15:07:16 +0000 |
commit | 7f0a4ecb6694298414e6d84c0aa49c35b19cad1b (patch) | |
tree | bc4dbe006d07e7d8d2d575f76725164be7e1d804 | |
parent | 701eb985309b1c9fce617949298659843fce723d (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 56e0f4403..831072fed 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -181,6 +181,7 @@ static struct { | |||
181 | { "passwordauthentication", oPasswordAuthentication }, | 181 | { "passwordauthentication", oPasswordAuthentication }, |
182 | { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, | 182 | { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, |
183 | { "kbdinteractivedevices", oKbdInteractiveDevices }, | 183 | { "kbdinteractivedevices", oKbdInteractiveDevices }, |
184 | { "useblacklistedkeys", oDeprecated }, | ||
184 | { "rsaauthentication", oRSAAuthentication }, | 185 | { "rsaauthentication", oRSAAuthentication }, |
185 | { "pubkeyauthentication", oPubkeyAuthentication }, | 186 | { "pubkeyauthentication", oPubkeyAuthentication }, |
186 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ | 187 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ |
diff --git a/servconf.c b/servconf.c index cfe7029e6..ed3a88d4b 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -522,6 +522,7 @@ static struct { | |||
522 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, | 522 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, |
523 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, | 523 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, |
524 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, | 524 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, |
525 | { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL }, | ||
525 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, | 526 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, |
526 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, | 527 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, |
527 | { "uselogin", sUseLogin, SSHCFG_GLOBAL }, | 528 | { "uselogin", sUseLogin, SSHCFG_GLOBAL }, |