diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-25 00:26:21 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-25 00:26:21 +1100 |
commit | 95def09838fc61b37b6ea7cd5c234a465b4b129b (patch) | |
tree | 042744f76f40a326b873cb1c3690a6d7d966bc3e /auth-skey.c | |
parent | 4d2f15f895f4c795afc008aeff3fd2ceffbc44f4 (diff) |
- Merged very large OpenBSD source code reformat
- OpenBSD CVS updates
- [channels.c cipher.c compat.c log-client.c scp.c serverloop.c]
[ssh.h sshd.8 sshd.c]
syslog changes:
* Unified Logmessage for all auth-types, for success and for failed
* Standard connections get only ONE line in the LOG when level==LOG:
Auth-attempts are logged only, if authentication is:
a) successfull or
b) with passwd or
c) we had more than AUTH_FAIL_LOG failues
* many log() became verbose()
* old behaviour with level=VERBOSE
- [readconf.c readconf.h ssh.1 ssh.h sshconnect.c sshd.c]
tranfer s/key challenge/response data in SSH_SMSG_AUTH_TIS_CHALLENGE
messages. allows use of s/key in windows (ttssh, securecrt) and
ssh-1.2.27 clients without 'ssh -v', ok: niels@
- [sshd.8]
-V, for fallback to openssh in SSH2 compatibility mode
- [sshd.c]
fix sigchld race; cjc5@po.cwru.edu
Diffstat (limited to 'auth-skey.c')
-rw-r--r-- | auth-skey.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/auth-skey.c b/auth-skey.c index 66e09bb59..457100ccc 100644 --- a/auth-skey.c +++ b/auth-skey.c | |||
@@ -1,7 +1,8 @@ | |||
1 | #include "includes.h" | ||
2 | |||
1 | #ifdef SKEY | 3 | #ifdef SKEY |
2 | 4 | ||
3 | #include "includes.h" | 5 | RCSID("$Id: auth-skey.c,v 1.3 1999/11/23 22:25:52 markus Exp $"); |
4 | RCSID("$Id: auth-skey.c,v 1.2 1999/10/16 20:57:52 deraadt Exp $"); | ||
5 | 6 | ||
6 | #include "ssh.h" | 7 | #include "ssh.h" |
7 | #include <sha1.h> | 8 | #include <sha1.h> |
@@ -32,6 +33,7 @@ hash_collapse(s) | |||
32 | 33 | ||
33 | return i; | 34 | return i; |
34 | } | 35 | } |
36 | |||
35 | char * | 37 | char * |
36 | skey_fake_keyinfo(char *username) | 38 | skey_fake_keyinfo(char *username) |
37 | { | 39 | { |
@@ -150,4 +152,4 @@ skey_fake_keyinfo(char *username) | |||
150 | return skeyprompt; | 152 | return skeyprompt; |
151 | } | 153 | } |
152 | 154 | ||
153 | #endif SKEY | 155 | #endif /* SKEY */ |