diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-15 23:04:50 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-15 23:04:50 +0000 |
commit | c9a26364205602dab08fa6740185ad2a41550ea2 (patch) | |
tree | 2a4956429b07a364cbc6bad03a3f996c3fe8c18e | |
parent | d0ff40847d8c84b2cad534080b97f81e0ec2deba (diff) |
- markus@cvs.openbsd.org 2001/08/07 10:37:46
[authfd.c authfd.h]
extended failure messages from galb@vandyke.com
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | authfd.c | 6 | ||||
-rw-r--r-- | authfd.h | 5 |
3 files changed, 13 insertions, 4 deletions
@@ -1,5 +1,9 @@ | |||
1 | 20010815 | 1 | 20010815 |
2 | - (bal) Fixed stray code in readconf.c that went in by mistake. | 2 | - (bal) Fixed stray code in readconf.c that went in by mistake. |
3 | - OpenBSD CVS Sync | ||
4 | - markus@cvs.openbsd.org 2001/08/07 10:37:46 | ||
5 | [authfd.c authfd.h] | ||
6 | extended failure messages from galb@vandyke.com | ||
3 | 7 | ||
4 | 20010814 | 8 | 20010814 |
5 | - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup | 9 | - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup |
@@ -6289,4 +6293,4 @@ | |||
6289 | - Wrote replacements for strlcpy and mkdtemp | 6293 | - Wrote replacements for strlcpy and mkdtemp |
6290 | - Released 1.0pre1 | 6294 | - Released 1.0pre1 |
6291 | 6295 | ||
6292 | $Id: ChangeLog,v 1.1475 2001/08/15 22:58:59 mouring Exp $ | 6296 | $Id: ChangeLog,v 1.1476 2001/08/15 23:04:50 mouring Exp $ |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: authfd.c,v 1.43 2001/08/01 22:03:33 markus Exp $"); | 38 | RCSID("$OpenBSD: authfd.c,v 1.44 2001/08/07 10:37:46 markus Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -58,7 +58,8 @@ int decode_reply(int type); | |||
58 | 58 | ||
59 | /* macro to check for "agent failure" message */ | 59 | /* macro to check for "agent failure" message */ |
60 | #define agent_failed(x) \ | 60 | #define agent_failed(x) \ |
61 | ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE)) | 61 | ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE) || \ |
62 | (x == SSH2_AGENT_FAILURE)) | ||
62 | 63 | ||
63 | /* Returns the number of the authentication fd, or -1 if there is none. */ | 64 | /* Returns the number of the authentication fd, or -1 if there is none. */ |
64 | 65 | ||
@@ -585,6 +586,7 @@ decode_reply(int type) | |||
585 | switch (type) { | 586 | switch (type) { |
586 | case SSH_AGENT_FAILURE: | 587 | case SSH_AGENT_FAILURE: |
587 | case SSH_COM_AGENT2_FAILURE: | 588 | case SSH_COM_AGENT2_FAILURE: |
589 | case SSH2_AGENT_FAILURE: | ||
588 | log("SSH_AGENT_FAILURE"); | 590 | log("SSH_AGENT_FAILURE"); |
589 | return 0; | 591 | return 0; |
590 | case SSH_AGENT_SUCCESS: | 592 | case SSH_AGENT_SUCCESS: |
@@ -11,7 +11,7 @@ | |||
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$OpenBSD: authfd.h,v 1.20 2001/08/01 22:03:33 markus Exp $"); */ | 14 | /* RCSID("$OpenBSD: authfd.h,v 1.21 2001/08/07 10:37:46 markus Exp $"); */ |
15 | 15 | ||
16 | #ifndef AUTHFD_H | 16 | #ifndef AUTHFD_H |
17 | #define AUTHFD_H | 17 | #define AUTHFD_H |
@@ -42,6 +42,9 @@ | |||
42 | #define SSH_AGENTC_ADD_SMARTCARD_KEY 20 | 42 | #define SSH_AGENTC_ADD_SMARTCARD_KEY 20 |
43 | #define SSH_AGENTC_REMOVE_SMARTCARD_KEY 21 | 43 | #define SSH_AGENTC_REMOVE_SMARTCARD_KEY 21 |
44 | 44 | ||
45 | /* extended failure messages */ | ||
46 | #define SSH2_AGENT_FAILURE 30 | ||
47 | |||
45 | /* additional error code for ssh.com's ssh-agent2 */ | 48 | /* additional error code for ssh.com's ssh-agent2 */ |
46 | #define SSH_COM_AGENT2_FAILURE 102 | 49 | #define SSH_COM_AGENT2_FAILURE 102 |
47 | 50 | ||