diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-23 03:12:10 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-23 03:12:10 +0000 |
commit | 95fb2dde7777c6afbffd80eba79a88811db55290 (patch) | |
tree | a008785c01c2bb513cc0c76bf1ac28f36cd9d9c9 /readconf.c | |
parent | b1985f727950dbb3d5c7de863ae0e2181ace53f8 (diff) |
- markus@cvs.openbsd.org 2001/01/22 23:06:39
[auth1.c auth2.c readconf.c readconf.h servconf.c servconf.h
sshconnect1.c sshconnect2.c sshd.c]
rename skey -> challenge response.
auto-enable kbd-interactive for ssh2 if challenge-reponse is enabled.
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/readconf.c b/readconf.c index a10aaff1c..5c091c60c 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.58 2001/01/21 19:05:53 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.59 2001/01/22 23:06:39 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -93,7 +93,7 @@ typedef enum { | |||
93 | oBadOption, | 93 | oBadOption, |
94 | oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication, | 94 | oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication, |
95 | oPasswordAuthentication, oRSAAuthentication, oFallBackToRsh, oUseRsh, | 95 | oPasswordAuthentication, oRSAAuthentication, oFallBackToRsh, oUseRsh, |
96 | oSkeyAuthentication, oXAuthLocation, | 96 | oChallengeResponseAuthentication, oXAuthLocation, |
97 | #ifdef KRB4 | 97 | #ifdef KRB4 |
98 | oKerberosAuthentication, | 98 | oKerberosAuthentication, |
99 | #endif /* KRB4 */ | 99 | #endif /* KRB4 */ |
@@ -104,7 +104,7 @@ typedef enum { | |||
104 | oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand, | 104 | oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand, |
105 | oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts, | 105 | oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts, |
106 | oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression, | 106 | oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression, |
107 | oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, oTISAuthentication, | 107 | oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, |
108 | oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, | 108 | oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, |
109 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, | 109 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, |
110 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias | 110 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias |
@@ -127,8 +127,10 @@ static struct { | |||
127 | { "kbdinteractivedevices", oKbdInteractiveDevices }, | 127 | { "kbdinteractivedevices", oKbdInteractiveDevices }, |
128 | { "rsaauthentication", oRSAAuthentication }, | 128 | { "rsaauthentication", oRSAAuthentication }, |
129 | { "pubkeyauthentication", oPubkeyAuthentication }, | 129 | { "pubkeyauthentication", oPubkeyAuthentication }, |
130 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ | 130 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ |
131 | { "skeyauthentication", oSkeyAuthentication }, | 131 | { "challengeresponseauthentication", oChallengeResponseAuthentication }, |
132 | { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */ | ||
133 | { "tisauthentication", oChallengeResponseAuthentication }, /* alias */ | ||
132 | #ifdef KRB4 | 134 | #ifdef KRB4 |
133 | { "kerberosauthentication", oKerberosAuthentication }, | 135 | { "kerberosauthentication", oKerberosAuthentication }, |
134 | #endif /* KRB4 */ | 136 | #endif /* KRB4 */ |
@@ -165,7 +167,6 @@ static struct { | |||
165 | { "compressionlevel", oCompressionLevel }, | 167 | { "compressionlevel", oCompressionLevel }, |
166 | { "keepalive", oKeepAlives }, | 168 | { "keepalive", oKeepAlives }, |
167 | { "numberofpasswordprompts", oNumberOfPasswordPrompts }, | 169 | { "numberofpasswordprompts", oNumberOfPasswordPrompts }, |
168 | { "tisauthentication", oTISAuthentication }, | ||
169 | { "loglevel", oLogLevel }, | 170 | { "loglevel", oLogLevel }, |
170 | { NULL, 0 } | 171 | { NULL, 0 } |
171 | }; | 172 | }; |
@@ -318,10 +319,8 @@ parse_flag: | |||
318 | intptr = &options->rhosts_rsa_authentication; | 319 | intptr = &options->rhosts_rsa_authentication; |
319 | goto parse_flag; | 320 | goto parse_flag; |
320 | 321 | ||
321 | case oTISAuthentication: | 322 | case oChallengeResponseAuthentication: |
322 | /* fallthrough, there is no difference on the client side */ | 323 | intptr = &options->challenge_reponse_authentication; |
323 | case oSkeyAuthentication: | ||
324 | intptr = &options->skey_authentication; | ||
325 | goto parse_flag; | 324 | goto parse_flag; |
326 | 325 | ||
327 | #ifdef KRB4 | 326 | #ifdef KRB4 |
@@ -669,7 +668,7 @@ initialize_options(Options * options) | |||
669 | options->rhosts_authentication = -1; | 668 | options->rhosts_authentication = -1; |
670 | options->rsa_authentication = -1; | 669 | options->rsa_authentication = -1; |
671 | options->pubkey_authentication = -1; | 670 | options->pubkey_authentication = -1; |
672 | options->skey_authentication = -1; | 671 | options->challenge_reponse_authentication = -1; |
673 | #ifdef KRB4 | 672 | #ifdef KRB4 |
674 | options->kerberos_authentication = -1; | 673 | options->kerberos_authentication = -1; |
675 | #endif | 674 | #endif |
@@ -736,8 +735,8 @@ fill_default_options(Options * options) | |||
736 | options->rsa_authentication = 1; | 735 | options->rsa_authentication = 1; |
737 | if (options->pubkey_authentication == -1) | 736 | if (options->pubkey_authentication == -1) |
738 | options->pubkey_authentication = 1; | 737 | options->pubkey_authentication = 1; |
739 | if (options->skey_authentication == -1) | 738 | if (options->challenge_reponse_authentication == -1) |
740 | options->skey_authentication = 0; | 739 | options->challenge_reponse_authentication = 0; |
741 | #ifdef KRB4 | 740 | #ifdef KRB4 |
742 | if (options->kerberos_authentication == -1) | 741 | if (options->kerberos_authentication == -1) |
743 | options->kerberos_authentication = 1; | 742 | options->kerberos_authentication = 1; |
@@ -751,7 +750,7 @@ fill_default_options(Options * options) | |||
751 | if (options->password_authentication == -1) | 750 | if (options->password_authentication == -1) |
752 | options->password_authentication = 1; | 751 | options->password_authentication = 1; |
753 | if (options->kbd_interactive_authentication == -1) | 752 | if (options->kbd_interactive_authentication == -1) |
754 | options->kbd_interactive_authentication = 0; | 753 | options->kbd_interactive_authentication = 1; |
755 | if (options->rhosts_rsa_authentication == -1) | 754 | if (options->rhosts_rsa_authentication == -1) |
756 | options->rhosts_rsa_authentication = 1; | 755 | options->rhosts_rsa_authentication = 1; |
757 | if (options->fallback_to_rsh == -1) | 756 | if (options->fallback_to_rsh == -1) |