diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-09 23:45:24 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-09 23:47:26 +0000 |
commit | d62fa90d496ae9532d8c1426b177e12d3c5ac03b (patch) | |
tree | 3179fea9631a318c8a0782dedc7cd690f201af69 /readconf.c | |
parent | d26565af8589d88f824b26f31da493f1056efcf4 (diff) | |
parent | b65a0ded7a8cfe7d351e28266d7851216d679e05 (diff) |
Drop ssh-vulnkey
Drop ssh-vulnkey and the associated ssh/ssh-add/sshd integration
code, leaving only basic configuration file compatibility, since it
has been nearly six years since the original vulnerability and this
code is not likely to be of much value any more. See
https://lists.debian.org/debian-devel/2013/09/msg00240.html for my
full reasoning.
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/readconf.c b/readconf.c index 2778176c6..e1e82c5ad 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -130,7 +130,6 @@ typedef enum { | |||
130 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, | 130 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, |
131 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, | 131 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, |
132 | oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, | 132 | oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, |
133 | oUseBlacklistedKeys, | ||
134 | oHostKeyAlgorithms, oBindAddress, oPKCS11Provider, | 133 | oHostKeyAlgorithms, oBindAddress, oPKCS11Provider, |
135 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, | 134 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, |
136 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, | 135 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, |
@@ -165,7 +164,7 @@ static struct { | |||
165 | { "passwordauthentication", oPasswordAuthentication }, | 164 | { "passwordauthentication", oPasswordAuthentication }, |
166 | { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, | 165 | { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, |
167 | { "kbdinteractivedevices", oKbdInteractiveDevices }, | 166 | { "kbdinteractivedevices", oKbdInteractiveDevices }, |
168 | { "useblacklistedkeys", oUseBlacklistedKeys }, | 167 | { "useblacklistedkeys", oDeprecated }, |
169 | { "rsaauthentication", oRSAAuthentication }, | 168 | { "rsaauthentication", oRSAAuthentication }, |
170 | { "pubkeyauthentication", oPubkeyAuthentication }, | 169 | { "pubkeyauthentication", oPubkeyAuthentication }, |
171 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ | 170 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ |
@@ -530,10 +529,6 @@ parse_flag: | |||
530 | intptr = &options->challenge_response_authentication; | 529 | intptr = &options->challenge_response_authentication; |
531 | goto parse_flag; | 530 | goto parse_flag; |
532 | 531 | ||
533 | case oUseBlacklistedKeys: | ||
534 | intptr = &options->use_blacklisted_keys; | ||
535 | goto parse_flag; | ||
536 | |||
537 | case oGssAuthentication: | 532 | case oGssAuthentication: |
538 | intptr = &options->gss_authentication; | 533 | intptr = &options->gss_authentication; |
539 | goto parse_flag; | 534 | goto parse_flag; |
@@ -1222,7 +1217,6 @@ initialize_options(Options * options) | |||
1222 | options->kbd_interactive_devices = NULL; | 1217 | options->kbd_interactive_devices = NULL; |
1223 | options->rhosts_rsa_authentication = -1; | 1218 | options->rhosts_rsa_authentication = -1; |
1224 | options->hostbased_authentication = -1; | 1219 | options->hostbased_authentication = -1; |
1225 | options->use_blacklisted_keys = -1; | ||
1226 | options->batch_mode = -1; | 1220 | options->batch_mode = -1; |
1227 | options->check_host_ip = -1; | 1221 | options->check_host_ip = -1; |
1228 | options->strict_host_key_checking = -1; | 1222 | options->strict_host_key_checking = -1; |
@@ -1333,8 +1327,6 @@ fill_default_options(Options * options) | |||
1333 | options->rhosts_rsa_authentication = 0; | 1327 | options->rhosts_rsa_authentication = 0; |
1334 | if (options->hostbased_authentication == -1) | 1328 | if (options->hostbased_authentication == -1) |
1335 | options->hostbased_authentication = 0; | 1329 | options->hostbased_authentication = 0; |
1336 | if (options->use_blacklisted_keys == -1) | ||
1337 | options->use_blacklisted_keys = 0; | ||
1338 | if (options->batch_mode == -1) | 1330 | if (options->batch_mode == -1) |
1339 | options->batch_mode = 0; | 1331 | options->batch_mode = 0; |
1340 | if (options->check_host_ip == -1) | 1332 | if (options->check_host_ip == -1) |