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 /sshconnect2.c | |
| parent | 0437b33e54fd72060d17908d6abf96bfabaacad2 (diff) | |
| download | openssh-git-e247cc402bc391650f014316363dbce78ad85dc7.tar.gz | |
- 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 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index a4342e2d..17325b09 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -28,7 +28,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.5 2000/05/01 18:41:06 markus Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.7 2000/05/06 17:45:37 markus Exp $"); #include <openssl/bn.h> #include <openssl/rsa.h> @@ -283,9 +283,13 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) int ssh2_try_passwd(const char *server_user, const char *host, const char *service) { + static int attempt = 0; char prompt[80]; char *password; + if (attempt++ > options.number_of_password_prompts) + return 0; + snprintf(prompt, sizeof(prompt), "%.30s@%.40s's password: ", server_user, host); password = read_passphrase(prompt, 0); @@ -428,7 +432,7 @@ ssh_userauth2(const char *server_user, char *host) packet_done(); if (partial) debug("partial success"); - if (options.rsa_authentication && + if (options.dsa_authentication && strstr(auths, "publickey") != NULL) { while (i < options.num_identity_files2) { sent = ssh2_try_pubkey( |