From 95def09838fc61b37b6ea7cd5c234a465b4b129b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 25 Nov 1999 00:26:21 +1100 Subject: - 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 --- authfd.h | 89 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 45 insertions(+), 44 deletions(-) (limited to 'authfd.h') diff --git a/authfd.h b/authfd.h index df589b1c4..bddb8bab8 100644 --- a/authfd.h +++ b/authfd.h @@ -1,19 +1,19 @@ /* - -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. - -*/ - -/* RCSID("$Id: authfd.h,v 1.2 1999/11/16 02:37:16 damien Exp $"); */ + * + * 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. + * + */ + +/* RCSID("$Id: authfd.h,v 1.3 1999/11/24 13:26:22 damien Exp $"); */ #ifndef AUTHFD_H #define AUTHFD_H @@ -31,72 +31,73 @@ Functions to interface with the SSH_AUTHENTICATION_FD socket. #define SSH_AGENTC_REMOVE_RSA_IDENTITY 8 #define SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES 9 -typedef struct -{ - int fd; - Buffer packet; - Buffer identities; - int howmany; -} AuthenticationConnection; - +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(); -/* This should be called for any descriptor returned by +/* This should be called for any descriptor returned by ssh_get_authentication_socket(). Depending on the way the descriptor was obtained, this may close the descriptor. */ -void ssh_close_authentication_socket(int authfd); +void ssh_close_authentication_socket(int authfd); /* Opens and connects a private socket for communication with the - authentication agent. Returns NULL if an error occurred and the + authentication agent. Returns NULL if an error occurred and the connection could not be opened. The connection should be closed by the caller by calling ssh_close_authentication_connection(). */ AuthenticationConnection *ssh_get_authentication_connection(); /* 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 * ac); /* 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). */ -int ssh_get_first_identity(AuthenticationConnection *connection, - BIGNUM *e, BIGNUM *n, char **comment); +int +ssh_get_first_identity(AuthenticationConnection * connection, + BIGNUM * e, BIGNUM * n, char **comment); /* 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. */ -int ssh_get_next_identity(AuthenticationConnection *connection, - BIGNUM *e, BIGNUM *n, char **comment); +int +ssh_get_next_identity(AuthenticationConnection * connection, + BIGNUM * e, BIGNUM * n, char **comment); /* Requests the agent to decrypt the given challenge. Returns true if the agent claims it was able to decrypt it. */ -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]); +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]); /* Adds an identity to the authentication server. This call is not meant to be used by normal applications. This returns true if the identity was successfully added. */ -int ssh_add_identity(AuthenticationConnection *connection, - RSA *key, const char *comment); + int ssh_add_identity(AuthenticationConnection * connection, + RSA * key, const char *comment); /* Removes the identity from the authentication server. This call is not 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 * connection, + RSA * 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); + int ssh_remove_all_identities(AuthenticationConnection * connection); /* Closes the connection to the authentication agent. */ -void ssh_close_authentication(AuthenticationConnection *connection); + void ssh_close_authentication(AuthenticationConnection * connection); -#endif /* AUTHFD_H */ +#endif /* AUTHFD_H */ -- cgit v1.2.3