diff options
author | Colin Watson <cjwatson@ubuntu.com> | 2014-02-09 16:09:50 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-09-17 13:52:39 +0100 |
commit | 654750762053d631bd1e1176c230eaeaad9b4250 (patch) | |
tree | 3f83d35290c2351598e47c9111a33c3e54f78a5a | |
parent | a12d63c53c0eb8926f64580eec2e4ccc57ee6f5c (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 68dac7605..85eea4800 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -180,6 +180,7 @@ static struct { | |||
180 | { "passwordauthentication", oPasswordAuthentication }, | 180 | { "passwordauthentication", oPasswordAuthentication }, |
181 | { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, | 181 | { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, |
182 | { "kbdinteractivedevices", oKbdInteractiveDevices }, | 182 | { "kbdinteractivedevices", oKbdInteractiveDevices }, |
183 | { "useblacklistedkeys", oDeprecated }, | ||
183 | { "rsaauthentication", oRSAAuthentication }, | 184 | { "rsaauthentication", oRSAAuthentication }, |
184 | { "pubkeyauthentication", oPubkeyAuthentication }, | 185 | { "pubkeyauthentication", oPubkeyAuthentication }, |
185 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ | 186 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ |
diff --git a/servconf.c b/servconf.c index 2f7f41e5c..8a5bd7b3e 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -510,6 +510,7 @@ static struct { | |||
510 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, | 510 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, |
511 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, | 511 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, |
512 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, | 512 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, |
513 | { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL }, | ||
513 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, | 514 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, |
514 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, | 515 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, |
515 | { "uselogin", sUseLogin, SSHCFG_GLOBAL }, | 516 | { "uselogin", sUseLogin, SSHCFG_GLOBAL }, |