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

2 files changed, 2 insertions, 0 deletions

diff --git a/readconf.c b/readconf.c
index 4d699e5f1..29f3bd98d 100644
--- a/readconf.c
+++ b/readconf.c
@@ -192,6 +192,7 @@ static struct {
         { "fallbacktorsh", oDeprecated },
         { "globalknownhostsfile2", oDeprecated },
         { "rhostsauthentication", oDeprecated },
+        { "useblacklistedkeys", oDeprecated },
         { "userknownhostsfile2", oDeprecated },
         { "useroaming", oDeprecated },
         { "usersh", oDeprecated },
diff --git a/servconf.c b/servconf.c
index ffdad31e7..c01e0690e 100644
--- a/servconf.c
+++ b/servconf.c
@@ -621,6 +621,7 @@ static struct {
         { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL },
         { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
         { "strictmodes", sStrictModes, SSHCFG_GLOBAL },
+        { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL },
         { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },
         { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },
         { "uselogin", sDeprecated, SSHCFG_GLOBAL },