diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-14 16:23:11 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-14 16:23:11 +1100 |
commit | 874d77bb134a21a5cf625956b60173376a993ba8 (patch) | |
tree | 93dd73b2ff1fbf0ad5f3978a2c4e0d8438a0bf7c /authfd.c | |
parent | 89d9796fbedef4eed6956a2c095c7cc25330c28d (diff) |
- (djm) Big OpenBSD sync:
- markus@cvs.openbsd.org 2000/09/30 10:27:44
[log.c]
allow loglevel debug
- markus@cvs.openbsd.org 2000/10/03 11:59:57
[packet.c]
hmac->mac
- markus@cvs.openbsd.org 2000/10/03 12:03:03
[auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c]
move fake-auth from auth1.c to individual auth methods, disables s/key in
debug-msg
- markus@cvs.openbsd.org 2000/10/03 12:16:48
ssh.c
do not resolve canonname, i have no idea why this was added oin ossh
- markus@cvs.openbsd.org 2000/10/09 15:30:44
ssh-keygen.1 ssh-keygen.c
-X now reads private ssh.com DSA keys, too.
- markus@cvs.openbsd.org 2000/10/09 15:32:34
auth-options.c
clear options on every call.
- markus@cvs.openbsd.org 2000/10/09 15:51:00
authfd.c authfd.h
interop with ssh-agent2, from <res@shore.net>
- markus@cvs.openbsd.org 2000/10/10 14:20:45
compat.c
use rexexp for version string matching
- provos@cvs.openbsd.org 2000/10/10 22:02:18
[kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h]
First rough implementation of the diffie-hellman group exchange. The
client can ask the server for bigger groups to perform the diffie-hellman
in, thus increasing the attack complexity when using ciphers with longer
keys. University of Windsor provided network, T the company.
- markus@cvs.openbsd.org 2000/10/11 13:59:52
[auth-rsa.c auth2.c]
clear auth options unless auth sucessfull
- markus@cvs.openbsd.org 2000/10/11 14:00:27
[auth-options.h]
clear auth options unless auth sucessfull
- markus@cvs.openbsd.org 2000/10/11 14:03:27
[scp.1 scp.c]
support 'scp -o' with help from mouring@pconline.com
- markus@cvs.openbsd.org 2000/10/11 14:11:35
[dh.c]
Wall
- markus@cvs.openbsd.org 2000/10/11 14:14:40
[auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h]
[ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h]
add support for s/key (kbd-interactive) to ssh2, based on work by
mkiernan@avantgo.com and me
- markus@cvs.openbsd.org 2000/10/11 14:27:24
[auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h]
[myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c]
[sshconnect2.c sshd.c]
new cipher framework
- markus@cvs.openbsd.org 2000/10/11 14:45:21
[cipher.c]
remove DES
- markus@cvs.openbsd.org 2000/10/12 03:59:20
[cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c]
enable DES in SSH-1 clients only
- markus@cvs.openbsd.org 2000/10/12 08:21:13
[kex.h packet.c]
remove unused
- markus@cvs.openbsd.org 2000/10/13 12:34:46
[sshd.c]
Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se
- markus@cvs.openbsd.org 2000/10/13 12:59:15
[cipher.c cipher.h myproposal.h rijndael.c rijndael.h]
rijndael/aes support
- markus@cvs.openbsd.org 2000/10/13 13:10:54
[sshd.8]
more info about -V
- markus@cvs.openbsd.org 2000/10/13 13:12:02
[myproposal.h]
prefer no compression
Diffstat (limited to 'authfd.c')
-rw-r--r-- | authfd.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: authfd.c,v 1.28 2000/09/21 11:07:50 markus Exp $"); | 38 | RCSID("$OpenBSD: authfd.c,v 1.29 2000/10/09 21:51:00 markus Exp $"); |
39 | 39 | ||
40 | #include "ssh.h" | 40 | #include "ssh.h" |
41 | #include "rsa.h" | 41 | #include "rsa.h" |
@@ -56,6 +56,10 @@ RCSID("$OpenBSD: authfd.c,v 1.28 2000/09/21 11:07:50 markus Exp $"); | |||
56 | /* helper */ | 56 | /* helper */ |
57 | int decode_reply(int type); | 57 | int decode_reply(int type); |
58 | 58 | ||
59 | /* macro to check for "agent failure" message */ | ||
60 | #define agent_failed(x) \ | ||
61 | ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE)) | ||
62 | |||
59 | /* Returns the number of the authentication fd, or -1 if there is none. */ | 63 | /* Returns the number of the authentication fd, or -1 if there is none. */ |
60 | 64 | ||
61 | int | 65 | int |
@@ -242,7 +246,7 @@ ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int versi | |||
242 | 246 | ||
243 | /* Get message type, and verify that we got a proper answer. */ | 247 | /* Get message type, and verify that we got a proper answer. */ |
244 | type = buffer_get_char(&auth->identities); | 248 | type = buffer_get_char(&auth->identities); |
245 | if (type == SSH_AGENT_FAILURE) { | 249 | if (agent_failed(type)) { |
246 | return NULL; | 250 | return NULL; |
247 | } else if (type != code2) { | 251 | } else if (type != code2) { |
248 | fatal("Bad authentication reply message type: %d", type); | 252 | fatal("Bad authentication reply message type: %d", type); |
@@ -341,7 +345,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth, | |||
341 | } | 345 | } |
342 | type = buffer_get_char(&buffer); | 346 | type = buffer_get_char(&buffer); |
343 | 347 | ||
344 | if (type == SSH_AGENT_FAILURE) { | 348 | if (agent_failed(type)) { |
345 | log("Agent admitted failure to authenticate using the key."); | 349 | log("Agent admitted failure to authenticate using the key."); |
346 | } else if (type != SSH_AGENT_RSA_RESPONSE) { | 350 | } else if (type != SSH_AGENT_RSA_RESPONSE) { |
347 | fatal("Bad authentication response: %d", type); | 351 | fatal("Bad authentication response: %d", type); |
@@ -390,7 +394,7 @@ ssh_agent_sign(AuthenticationConnection *auth, | |||
390 | return -1; | 394 | return -1; |
391 | } | 395 | } |
392 | type = buffer_get_char(&msg); | 396 | type = buffer_get_char(&msg); |
393 | if (type == SSH_AGENT_FAILURE) { | 397 | if (agent_failed(type)) { |
394 | log("Agent admitted failure to sign using the key."); | 398 | log("Agent admitted failure to sign using the key."); |
395 | } else if (type != SSH2_AGENT_SIGN_RESPONSE) { | 399 | } else if (type != SSH2_AGENT_SIGN_RESPONSE) { |
396 | fatal("Bad authentication response: %d", type); | 400 | fatal("Bad authentication response: %d", type); |
@@ -537,6 +541,7 @@ decode_reply(int type) | |||
537 | { | 541 | { |
538 | switch (type) { | 542 | switch (type) { |
539 | case SSH_AGENT_FAILURE: | 543 | case SSH_AGENT_FAILURE: |
544 | case SSH_COM_AGENT2_FAILURE: | ||
540 | log("SSH_AGENT_FAILURE"); | 545 | log("SSH_AGENT_FAILURE"); |
541 | return 0; | 546 | return 0; |
542 | case SSH_AGENT_SUCCESS: | 547 | case SSH_AGENT_SUCCESS: |