src/usr.bin/ssh/ssh-agent.c - diff

Return to ssh-agent.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-agent.c between version 1.129 and 1.129.2.1

version 1.129, 2006/02/20 17:02:44

version 1.129.2.1, 2006/09/30 04:06:51

Line 1

/* $OpenBSD$ */

* Author: Tatu Ylonen <ylo@cs.hut.fi>

Line 33

Line 34

* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include "includes.h"

#include <sys/types.h>

RCSID("$OpenBSD$");

#include <sys/queue.h>

#include <sys/resource.h>

#include <sys/types.h>

#include <sys/socket.h>

#include <sys/un.h>

#include <sys/time.h>

#include <sys/param.h>

#include <paths.h>

#include <signal.h>

#include <openssl/evp.h>

#include <openssl/md5.h>

#include <errno.h>

#include <fcntl.h>

#include <paths.h>

#include <signal.h>

#include <stdlib.h>

#include <stdio.h>

#include <string.h>

#include <time.h>

#include <unistd.h>

#include "xmalloc.h"

#include "ssh.h"

#include "rsa.h"

#include "buffer.h"

#include "bufaux.h"

#include "xmalloc.h"

#include "getput.h"

#include "key.h"

#include "authfd.h"

#include "compat.h"

Line 102

Line 109

pid_t parent_pid = -1;

/* pathname and directory for AUTH_SOCKET */

char socket_name[1024];

char socket_name[MAXPATHLEN];

char socket_dir[1024];

char socket_dir[MAXPATHLEN];

/* locking */

int locked = 0;

Line 308

Line 315

Identity *id = lookup_identity(key, 2);

if (id != NULL && (!id->confirm || confirm_key(id) == 0))

ok = key_sign(id->key, &signature, &slen, data, dlen);

key_free(key);

}

key_free(key);

buffer_init(&msg);

if (ok == 0) {

buffer_put_char(&msg, SSH2_AGENT_SIGN_RESPONSE);

Line 684

Line 691

if (buffer_len(&e->input) < 5)

return; /* Incomplete message. */

cp = buffer_ptr(&e->input);

msg_len = GET_32BIT(cp);

msg_len = get_u32(cp);

if (msg_len > 256 * 1024) {

close_socket(e);

return;

Line 796

Line 803

}

old_alloc = sockets_alloc;

new_alloc = sockets_alloc + 10;

if (sockets)

sockets = xrealloc(sockets, new_alloc, sizeof(sockets[0]));

sockets = xrealloc(sockets, new_alloc * sizeof(sockets[0]));

else

sockets = xmalloc(new_alloc * sizeof(sockets[0]));

for (i = old_alloc; i < new_alloc; i++)

sockets[i].type = AUTH_UNUSED;

sockets_alloc = new_alloc;

Line 880

Line 884

if (FD_ISSET(sockets[i].fd, readset)) {

slen = sizeof(sunaddr);

sock = accept(sockets[i].fd,

(struct sockaddr *) &sunaddr, &slen);

(struct sockaddr *)&sunaddr, &slen);

if (sock < 0) {

error("accept from AUTH_SOCKET: %s",

strerror(errno));

Line 957

Line 961

_exit(i);

}

/*ARGSUSED*/

static void

cleanup_handler(int sig)

{

Line 964

Line 969

_exit(2);

}

/*ARGSUSED*/

static void

check_parent_exists(int sig)

{

Line 997

Line 1003

main(int ac, char **av)

{

int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0;

int sock, fd, ch;

u_int nalloc;

char *shell, *format, *pidstr, *agentsocket = NULL;

fd_set *readsetp = NULL, *writesetp = NULL;

Line 1058

Line 1064

if (ac == 0 && !c_flag && !s_flag) {

shell = getenv("SHELL");

if (shell != NULL && strncmp(shell + strlen(shell) - 3, "csh", 3) == 0)

if (shell != NULL &&

strncmp(shell + strlen(shell) - 3, "csh", 3) == 0)

c_flag = 1;

}

if (k_flag) {

const char *errstr = NULL;

pidstr = getenv(SSH_AGENTPID_ENV_NAME);

if (pidstr == NULL) {

fprintf(stderr, "%s not set, cannot kill agent\n",

SSH_AGENTPID_ENV_NAME);

exit(1);

}

pid = atoi(pidstr);

pid = (int)strtonum(pidstr, 2, INT_MAX, &errstr);

if (pid < 1) {

if (errstr) {

fprintf(stderr, "%s=\"%s\", which is not a good PID\n",

fprintf(stderr,

SSH_AGENTPID_ENV_NAME, pidstr);

"%s=\"%s\", which is not a good PID: %s\n",

SSH_AGENTPID_ENV_NAME, pidstr, errstr);

exit(1);

}

if (kill(pid, SIGTERM) == -1) {

Line 1114

Line 1124

memset(&sunaddr, 0, sizeof(sunaddr));

sunaddr.sun_family = AF_UNIX;

strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path));

if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) {

if (bind(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) < 0) {

perror("bind");

*socket_name = '\0'; /* Don't unlink any existing file */

cleanup_exit(1);