diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-07 12:03:14 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-07 12:03:14 +1000 |
commit | e247cc402bc391650f014316363dbce78ad85dc7 (patch) | |
tree | 65d72c3d3514c6119f47017f14b71ed153485a5d /readconf.c | |
parent | 0437b33e54fd72060d17908d6abf96bfabaacad2 (diff) |
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/readconf.c b/readconf.c index 529f8039b..c69e10dda 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$Id: readconf.c,v 1.12 2000/04/29 13:57:11 damien Exp $"); | 17 | RCSID("$Id: readconf.c,v 1.13 2000/05/07 02:03:17 damien Exp $"); |
18 | 18 | ||
19 | #include "ssh.h" | 19 | #include "ssh.h" |
20 | #include "cipher.h" | 20 | #include "cipher.h" |
@@ -105,7 +105,7 @@ typedef enum { | |||
105 | oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression, | 105 | oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression, |
106 | oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, oTISAuthentication, | 106 | oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, oTISAuthentication, |
107 | oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oIdentityFile2, | 107 | oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oIdentityFile2, |
108 | oGlobalKnownHostsFile2, oUserKnownHostsFile2 | 108 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oDSAAuthentication |
109 | } OpCodes; | 109 | } OpCodes; |
110 | 110 | ||
111 | /* Textual representations of the tokens. */ | 111 | /* Textual representations of the tokens. */ |
@@ -121,6 +121,7 @@ static struct { | |||
121 | { "rhostsauthentication", oRhostsAuthentication }, | 121 | { "rhostsauthentication", oRhostsAuthentication }, |
122 | { "passwordauthentication", oPasswordAuthentication }, | 122 | { "passwordauthentication", oPasswordAuthentication }, |
123 | { "rsaauthentication", oRSAAuthentication }, | 123 | { "rsaauthentication", oRSAAuthentication }, |
124 | { "dsaauthentication", oDSAAuthentication }, | ||
124 | { "skeyauthentication", oSkeyAuthentication }, | 125 | { "skeyauthentication", oSkeyAuthentication }, |
125 | #ifdef KRB4 | 126 | #ifdef KRB4 |
126 | { "kerberosauthentication", oKerberosAuthentication }, | 127 | { "kerberosauthentication", oKerberosAuthentication }, |
@@ -290,6 +291,10 @@ parse_flag: | |||
290 | intptr = &options->password_authentication; | 291 | intptr = &options->password_authentication; |
291 | goto parse_flag; | 292 | goto parse_flag; |
292 | 293 | ||
294 | case oDSAAuthentication: | ||
295 | intptr = &options->dsa_authentication; | ||
296 | goto parse_flag; | ||
297 | |||
293 | case oRSAAuthentication: | 298 | case oRSAAuthentication: |
294 | intptr = &options->rsa_authentication; | 299 | intptr = &options->rsa_authentication; |
295 | goto parse_flag; | 300 | goto parse_flag; |
@@ -637,6 +642,7 @@ initialize_options(Options * options) | |||
637 | options->use_privileged_port = -1; | 642 | options->use_privileged_port = -1; |
638 | options->rhosts_authentication = -1; | 643 | options->rhosts_authentication = -1; |
639 | options->rsa_authentication = -1; | 644 | options->rsa_authentication = -1; |
645 | options->dsa_authentication = -1; | ||
640 | options->skey_authentication = -1; | 646 | options->skey_authentication = -1; |
641 | #ifdef KRB4 | 647 | #ifdef KRB4 |
642 | options->kerberos_authentication = -1; | 648 | options->kerberos_authentication = -1; |
@@ -696,6 +702,8 @@ fill_default_options(Options * options) | |||
696 | options->rhosts_authentication = 1; | 702 | options->rhosts_authentication = 1; |
697 | if (options->rsa_authentication == -1) | 703 | if (options->rsa_authentication == -1) |
698 | options->rsa_authentication = 1; | 704 | options->rsa_authentication = 1; |
705 | if (options->dsa_authentication == -1) | ||
706 | options->dsa_authentication = 1; | ||
699 | if (options->skey_authentication == -1) | 707 | if (options->skey_authentication == -1) |
700 | options->skey_authentication = 0; | 708 | options->skey_authentication = 0; |
701 | #ifdef KRB4 | 709 | #ifdef KRB4 |
@@ -745,14 +753,12 @@ fill_default_options(Options * options) | |||
745 | sprintf(options->identity_files[0], "~/%.100s", SSH_CLIENT_IDENTITY); | 753 | sprintf(options->identity_files[0], "~/%.100s", SSH_CLIENT_IDENTITY); |
746 | options->num_identity_files = 1; | 754 | options->num_identity_files = 1; |
747 | } | 755 | } |
748 | #if 0 | ||
749 | if (options->num_identity_files2 == 0) { | 756 | if (options->num_identity_files2 == 0) { |
750 | options->identity_files2[0] = | 757 | options->identity_files2[0] = |
751 | xmalloc(2 + strlen(SSH2_CLIENT_IDENTITY) + 1); | 758 | xmalloc(2 + strlen(SSH_CLIENT_ID_DSA) + 1); |
752 | sprintf(options->identity_files2[0], "~/%.100s", SSH2_CLIENT_IDENTITY); | 759 | sprintf(options->identity_files2[0], "~/%.100s", SSH_CLIENT_ID_DSA); |
753 | options->num_identity_files2 = 1; | 760 | options->num_identity_files2 = 1; |
754 | } | 761 | } |
755 | #endif | ||
756 | if (options->escape_char == -1) | 762 | if (options->escape_char == -1) |
757 | options->escape_char = '~'; | 763 | options->escape_char = '~'; |
758 | if (options->system_hostfile == NULL) | 764 | if (options->system_hostfile == NULL) |