diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/readconf.c b/readconf.c index 0999f28e3..07f5775d5 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -125,6 +125,7 @@ typedef enum { | |||
125 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, | 125 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, |
126 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, | 126 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, |
127 | oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, | 127 | oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, |
128 | oUseBlacklistedKeys, | ||
128 | oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, | 129 | oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, |
129 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, | 130 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, |
130 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, | 131 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, |
@@ -155,6 +156,7 @@ static struct { | |||
155 | { "passwordauthentication", oPasswordAuthentication }, | 156 | { "passwordauthentication", oPasswordAuthentication }, |
156 | { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, | 157 | { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, |
157 | { "kbdinteractivedevices", oKbdInteractiveDevices }, | 158 | { "kbdinteractivedevices", oKbdInteractiveDevices }, |
159 | { "useblacklistedkeys", oUseBlacklistedKeys }, | ||
158 | { "rsaauthentication", oRSAAuthentication }, | 160 | { "rsaauthentication", oRSAAuthentication }, |
159 | { "pubkeyauthentication", oPubkeyAuthentication }, | 161 | { "pubkeyauthentication", oPubkeyAuthentication }, |
160 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ | 162 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ |
@@ -448,6 +450,10 @@ parse_flag: | |||
448 | intptr = &options->challenge_response_authentication; | 450 | intptr = &options->challenge_response_authentication; |
449 | goto parse_flag; | 451 | goto parse_flag; |
450 | 452 | ||
453 | case oUseBlacklistedKeys: | ||
454 | intptr = &options->use_blacklisted_keys; | ||
455 | goto parse_flag; | ||
456 | |||
451 | case oGssAuthentication: | 457 | case oGssAuthentication: |
452 | intptr = &options->gss_authentication; | 458 | intptr = &options->gss_authentication; |
453 | goto parse_flag; | 459 | goto parse_flag; |
@@ -1061,6 +1067,7 @@ initialize_options(Options * options) | |||
1061 | options->kbd_interactive_devices = NULL; | 1067 | options->kbd_interactive_devices = NULL; |
1062 | options->rhosts_rsa_authentication = -1; | 1068 | options->rhosts_rsa_authentication = -1; |
1063 | options->hostbased_authentication = -1; | 1069 | options->hostbased_authentication = -1; |
1070 | options->use_blacklisted_keys = -1; | ||
1064 | options->batch_mode = -1; | 1071 | options->batch_mode = -1; |
1065 | options->check_host_ip = -1; | 1072 | options->check_host_ip = -1; |
1066 | options->strict_host_key_checking = -1; | 1073 | options->strict_host_key_checking = -1; |
@@ -1159,6 +1166,8 @@ fill_default_options(Options * options) | |||
1159 | options->rhosts_rsa_authentication = 0; | 1166 | options->rhosts_rsa_authentication = 0; |
1160 | if (options->hostbased_authentication == -1) | 1167 | if (options->hostbased_authentication == -1) |
1161 | options->hostbased_authentication = 0; | 1168 | options->hostbased_authentication = 0; |
1169 | if (options->use_blacklisted_keys == -1) | ||
1170 | options->use_blacklisted_keys = 0; | ||
1162 | if (options->batch_mode == -1) | 1171 | if (options->batch_mode == -1) |
1163 | options->batch_mode = 0; | 1172 | options->batch_mode = 0; |
1164 | if (options->check_host_ip == -1) | 1173 | if (options->check_host_ip == -1) |