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.173 and 1.174

version 1.173, 2013/05/17 00:13:14

version 1.174, 2013/05/31 12:28:10

Line 92

Key *key;

char *comment;

char *provider;

u_int death;

time_t death;

u_int confirm;

} Identity;

Line 120

extern char *__progname;

/* Default lifetime (0 == forever) */

/* Default lifetime in seconds (0 == forever) */

static int lifetime = 0;

static long lifetime = 0;

static void

close_socket(SocketEntry *e)

Line 414

}

/* removes expired keys and returns number of seconds until the next expiry */

static u_int

static time_t

reaper(void)

{

u_int deadline = 0, now = time(NULL);

time_t deadline = 0, now = time(NULL);

Identity *id, *nxt;

int version;

Idtab *tab;

Line 449

{

Idtab *tab = idtab_lookup(version);

Identity *id;

int type, success = 0, death = 0, confirm = 0;

int type, success = 0, confirm = 0;

char *type_name, *comment, *curve;

time_t death = 0;

Key *k = NULL;

BIGNUM *exponent;

EC_POINT *q;

Line 680

Line 681

process_add_smartcard_key(SocketEntry *e)

{

char *provider = NULL, *pin;

int i, type, version, count = 0, success = 0, death = 0, confirm = 0;

int i, type, version, count = 0, success = 0, confirm = 0;

time_t death = 0;

Key **keys = NULL, *k;

Identity *id;

Idtab *tab;

Line 907

Line 909

prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, u_int *nallocp,

struct timeval **tvpp)

{

u_int i, sz, deadline;

u_int i, sz;

int n = 0;

static struct timeval tv;

time_t deadline;

for (i = 0; i < sockets_alloc; i++) {

switch (sockets[i].type) {