=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/authfd.h,v retrieving revision 1.7 retrieving revision 1.7.2.3 diff -u -r1.7 -r1.7.2.3 --- src/usr.bin/ssh/authfd.h 2000/04/14 10:30:30 1.7 +++ src/usr.bin/ssh/authfd.h 2001/03/12 15:44:08 1.7.2.3 @@ -1,19 +1,17 @@ /* - * - * authfd.h - * * Author: Tatu Ylonen - * * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved - * - * Created: Wed Mar 29 01:17:41 1995 ylo - * * Functions to interface with the SSH_AUTHENTICATION_FD socket. * + * As far as I am concerned, the code I have written for this software + * can be used freely for any purpose. Any derived versions of this + * software must be clearly marked as such, and if the derived work is + * incompatible with the protocol description in the RFC file, it must be + * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$Id: authfd.h,v 1.7 2000/04/14 10:30:30 markus Exp $"); */ +/* RCSID("$OpenBSD: authfd.h,v 1.7.2.3 2001/03/12 15:44:08 jason Exp $"); */ #ifndef AUTHFD_H #define AUTHFD_H @@ -31,14 +29,29 @@ #define SSH_AGENTC_REMOVE_RSA_IDENTITY 8 #define SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES 9 +/* private OpenSSH extensions for SSH2 */ +#define SSH2_AGENTC_REQUEST_IDENTITIES 11 +#define SSH2_AGENT_IDENTITIES_ANSWER 12 +#define SSH2_AGENTC_SIGN_REQUEST 13 +#define SSH2_AGENT_SIGN_RESPONSE 14 +#define SSH2_AGENTC_ADD_IDENTITY 17 +#define SSH2_AGENTC_REMOVE_IDENTITY 18 +#define SSH2_AGENTC_REMOVE_ALL_IDENTITIES 19 + +/* additional error code for ssh.com's ssh-agent2 */ +#define SSH_COM_AGENT2_FAILURE 102 + +#define SSH_AGENT_OLD_SIGNATURE 0x01 + + typedef struct { int fd; - Buffer packet; Buffer identities; int howmany; } AuthenticationConnection; + /* Returns the number of the authentication fd, or -1 if there is none. */ -int ssh_get_authentication_socket(); +int ssh_get_authentication_socket(void); /* * This should be called for any descriptor returned by @@ -53,42 +66,51 @@ * connection could not be opened. The connection should be closed by the * caller by calling ssh_close_authentication_connection(). */ -AuthenticationConnection *ssh_get_authentication_connection(); +AuthenticationConnection *ssh_get_authentication_connection(void); /* * Closes the connection to the authentication agent and frees any associated * memory. */ -void ssh_close_authentication_connection(AuthenticationConnection * ac); +void ssh_close_authentication_connection(AuthenticationConnection *auth); /* - * Returns the first authentication identity held by the agent. Returns true - * if an identity is available, 0 otherwise. The caller must initialize the - * integers before the call, and free the comment after a successful call - * (before calling ssh_get_next_identity). + * Returns the number authentication identity held by the agent. */ -int -ssh_get_first_identity(AuthenticationConnection * connection, - BIGNUM * e, BIGNUM * n, char **comment); +int ssh_get_num_identities(AuthenticationConnection *auth, int version); /* + * Returns the first authentication identity held by the agent or NULL if + * no identies are available. Caller must free comment and key. + * Note that you cannot mix calls with different versions. + */ +Key *ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int version); + +/* * Returns the next authentication identity for the agent. Other functions * can be called between this and ssh_get_first_identity or two calls of this - * function. This returns 0 if there are no more identities. The caller - * must free comment after a successful return. + * function. This returns NULL if there are no more identities. The caller + * must free key and comment after a successful return. */ +Key *ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version); + +/* + * Requests the agent to decrypt the given challenge. Returns true if the + * agent claims it was able to decrypt it. + */ int -ssh_get_next_identity(AuthenticationConnection * connection, - BIGNUM * e, BIGNUM * n, char **comment); +ssh_decrypt_challenge(AuthenticationConnection *auth, + Key *key, BIGNUM * challenge, + u_char session_id[16], + u_int response_type, + u_char response[16]); -/* Requests the agent to decrypt the given challenge. Returns true if - the agent claims it was able to decrypt it. */ +/* Requests the agent to sign data using key */ int -ssh_decrypt_challenge(AuthenticationConnection * auth, - BIGNUM * e, BIGNUM * n, BIGNUM * challenge, - unsigned char session_id[16], - unsigned int response_type, - unsigned char response[16]); +ssh_agent_sign(AuthenticationConnection *auth, + Key *key, + u_char **sigp, int *lenp, + u_char *data, int datalen); /* * Adds an identity to the authentication server. This call is not meant to @@ -96,7 +118,7 @@ * successfully added. */ int -ssh_add_identity(AuthenticationConnection * connection, RSA * key, +ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment); /* @@ -104,16 +126,13 @@ * meant to be used by normal applications. This returns true if the * identity was successfully added. */ -int ssh_remove_identity(AuthenticationConnection * connection, RSA * key); +int ssh_remove_identity(AuthenticationConnection *auth, Key *key); /* * Removes all identities from the authentication agent. This call is not * meant to be used by normal applications. This returns true if the * operation was successful. */ -int ssh_remove_all_identities(AuthenticationConnection * connection); - -/* Closes the connection to the authentication agent. */ -void ssh_close_authentication(AuthenticationConnection * connection); +int ssh_remove_all_identities(AuthenticationConnection *auth, int version); #endif /* AUTHFD_H */