-/* $OpenBSD: ssh-agent.c,v 1.62 2001/07/04 23:13:10 markus Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.81 2002/02/05 15:50:12 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.62 2001/07/04 23:13:10 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.81 2002/02/05 15:50:12 stevesk Exp $");
+
+#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
+#include <sys/queue.h>
+#else
+#include "openbsd-compat/fake-queue.h"
+#endif
+
#include <openssl/evp.h>
#include <openssl/md5.h>
#include "buffer.h"
#include "bufaux.h"
#include "xmalloc.h"
-#include "packet.h"
#include "getput.h"
-#include "mpaux.h"
#include "key.h"
#include "authfd.h"
-#include "cipher.h"
-#include "kex.h"
#include "compat.h"
#include "log.h"
#include "scard.h"
#endif
+typedef enum {
+ AUTH_UNUSED,
+ AUTH_SOCKET,
+ AUTH_CONNECTION
+} sock_type;
+
typedef struct {
int fd;
- enum {
- AUTH_UNUSED, AUTH_SOCKET, AUTH_CONNECTION
- } type;
+ sock_type type;
Buffer input;
Buffer output;
} SocketEntry;
u_int sockets_alloc = 0;
SocketEntry *sockets = NULL;
-typedef struct {
+typedef struct identity {
+ TAILQ_ENTRY(identity) next;
Key *key;
char *comment;
} Identity;
typedef struct {
int nentries;
- Identity *identities;
+ TAILQ_HEAD(idqueue, identity) idlist;
} Idtab;
/* private key table, one per protocol version */
idtab_init(void)
{
int i;
- for (i = 0; i <=2; i++){
- idtable[i].identities = NULL;
+ for (i = 0; i <=2; i++) {
+ TAILQ_INIT(&idtable[i].idlist);
idtable[i].nentries = 0;
}
}
}
/* return matching private key for given public key */
-static Key *
-lookup_private_key(Key *key, int *idx, int version)
+static Identity *
+lookup_identity(Key *key, int version)
{
- int i;
+ Identity *id;
+
Idtab *tab = idtab_lookup(version);
- for (i = 0; i < tab->nentries; i++) {
- if (key_equal(key, tab->identities[i].key)) {
- if (idx != NULL)
- *idx = i;
- return tab->identities[i].key;
- }
+ TAILQ_FOREACH(id, &tab->idlist, next) {
+ if (key_equal(key, id->key))
+ return (id);
}
- return NULL;
+ return (NULL);
+}
+
+static void
+free_identity(Identity *id)
+{
+ key_free(id->key);
+ xfree(id->comment);
+ xfree(id);
}
/* send list of supported public keys to 'client' */
{
Idtab *tab = idtab_lookup(version);
Buffer msg;
- int i;
+ Identity *id;
buffer_init(&msg);
buffer_put_char(&msg, (version == 1) ?
SSH_AGENT_RSA_IDENTITIES_ANSWER : SSH2_AGENT_IDENTITIES_ANSWER);
buffer_put_int(&msg, tab->nentries);
- for (i = 0; i < tab->nentries; i++) {
- Identity *id = &tab->identities[i];
+ TAILQ_FOREACH(id, &tab->idlist, next) {
if (id->key->type == KEY_RSA1) {
buffer_put_int(&msg, BN_num_bits(id->key->rsa->n));
buffer_put_bignum(&msg, id->key->rsa->e);
static void
process_authentication_challenge1(SocketEntry *e)
{
- Key *key, *private;
+ Identity *id;
+ Key *key;
BIGNUM *challenge;
int i, len;
Buffer msg;
buffer_init(&msg);
key = key_new(KEY_RSA1);
- challenge = BN_new();
+ if ((challenge = BN_new()) == NULL)
+ fatal("process_authentication_challenge1: BN_new failed");
buffer_get_int(&e->input); /* ignored */
buffer_get_bignum(&e->input, key->rsa->e);
/* Only protocol 1.1 is supported */
if (buffer_len(&e->input) == 0)
goto failure;
- buffer_get(&e->input, (char *) session_id, 16);
+ buffer_get(&e->input, session_id, 16);
response_type = buffer_get_int(&e->input);
if (response_type != 1)
goto failure;
- private = lookup_private_key(key, NULL, 1);
- if (private != NULL) {
+ id = lookup_identity(key, 1);
+ if (id != NULL) {
+ Key *private = id->key;
/* Decrypt the challenge using the private key. */
if (rsa_private_decrypt(challenge, challenge, private->rsa) <= 0)
goto failure;
process_sign_request2(SocketEntry *e)
{
extern int datafellows;
- Key *key, *private;
+ Key *key;
u_char *blob, *data, *signature = NULL;
u_int blen, dlen, slen = 0;
int flags;
key = key_from_blob(blob, blen);
if (key != NULL) {
- private = lookup_private_key(key, NULL, 2);
- if (private != NULL)
- ok = key_sign(private, &signature, &slen, data, dlen);
+ Identity *id = lookup_identity(key, 2);
+ if (id != NULL)
+ ok = key_sign(id->key, &signature, &slen, data, dlen);
}
key_free(key);
buffer_init(&msg);
static void
process_remove_identity(SocketEntry *e, int version)
{
- Key *key = NULL, *private;
+ Key *key = NULL;
u_char *blob;
u_int blen;
u_int bits;
int success = 0;
- switch(version){
+ switch (version) {
case 1:
key = key_new(KEY_RSA1);
bits = buffer_get_int(&e->input);
break;
}
if (key != NULL) {
- int idx;
- private = lookup_private_key(key, &idx, version);
- if (private != NULL) {
+ Identity *id = lookup_identity(key, version);
+ if (id != NULL) {
/*
* We have this key. Free the old key. Since we
* don\'t want to leave empty slots in the middle of
* of the array.
*/
Idtab *tab = idtab_lookup(version);
- key_free(tab->identities[idx].key);
- xfree(tab->identities[idx].comment);
if (tab->nentries < 1)
fatal("process_remove_identity: "
"internal error: tab->nentries %d",
tab->nentries);
- if (idx != tab->nentries - 1) {
- int i;
- for (i = idx; i < tab->nentries - 1; i++)
- tab->identities[i] = tab->identities[i+1];
- }
- tab->identities[tab->nentries - 1].key = NULL;
- tab->identities[tab->nentries - 1].comment = NULL;
+ TAILQ_REMOVE(&tab->idlist, id, next);
+ free_identity(id);
tab->nentries--;
success = 1;
}
static void
process_remove_all_identities(SocketEntry *e, int version)
{
- u_int i;
Idtab *tab = idtab_lookup(version);
+ Identity *id;
/* Loop over all identities and clear the keys. */
- for (i = 0; i < tab->nentries; i++) {
- key_free(tab->identities[i].key);
- xfree(tab->identities[i].comment);
+ for (id = TAILQ_FIRST(&tab->idlist); id;
+ id = TAILQ_FIRST(&tab->idlist)) {
+ TAILQ_REMOVE(&tab->idlist, id, next);
+ free_identity(id);
}
/* Mark that there are no identities. */
type_name = buffer_get_string(&e->input, NULL);
type = key_type_from_name(type_name);
xfree(type_name);
- switch(type) {
+ switch (type) {
case KEY_DSA:
k = key_new_private(type);
buffer_get_bignum2(&e->input, k->dsa->p);
goto send;
}
success = 1;
- if (lookup_private_key(k, NULL, version) == NULL) {
- if (tab->nentries == 0)
- tab->identities = xmalloc(sizeof(Identity));
- else
- tab->identities = xrealloc(tab->identities,
- (tab->nentries + 1) * sizeof(Identity));
- tab->identities[tab->nentries].key = k;
- tab->identities[tab->nentries].comment = comment;
+ if (lookup_identity(k, version) == NULL) {
+ Identity *id = xmalloc(sizeof(Identity));
+ id->key = k;
+ id->comment = comment;
+ TAILQ_INSERT_TAIL(&tab->idlist, id, next);
/* Increment the number of identities. */
tab->nentries++;
} else {
{
Idtab *tab;
Key *n = NULL, *k = NULL;
+ char *sc_reader_id = NULL;
int success = 0;
- int sc_reader_num = 0;
-
- sc_reader_num = buffer_get_int(&e->input);
- k = sc_get_key(sc_reader_num);
+ sc_reader_id = buffer_get_string(&e->input, NULL);
+ k = sc_get_key(sc_reader_id);
+ xfree(sc_reader_id);
+
if (k == NULL) {
error("sc_get_pubkey failed");
goto send;
success = 1;
tab = idtab_lookup(1);
- if (lookup_private_key(k, NULL, 1) == NULL) {
- if (tab->nentries == 0)
- tab->identities = xmalloc(sizeof(Identity));
- else
- tab->identities = xrealloc(tab->identities,
- (tab->nentries + 1) * sizeof(Identity));
+ k->type = KEY_RSA1;
+ if (lookup_identity(k, 1) == NULL) {
+ Identity *id = xmalloc(sizeof(Identity));
n = key_new(KEY_RSA1);
BN_copy(n->rsa->n, k->rsa->n);
BN_copy(n->rsa->e, k->rsa->e);
RSA_set_method(n->rsa, sc_get_engine());
- tab->identities[tab->nentries].key = n;
- tab->identities[tab->nentries].comment =
- xstrdup("rsa1 smartcard");
+ id->key = n;
+ id->comment = xstrdup("rsa1 smartcard");
+ TAILQ_INSERT_TAIL(&tab->idlist, id, next);
tab->nentries++;
}
+ k->type = KEY_RSA;
tab = idtab_lookup(2);
- if (lookup_private_key(k, NULL, 2) == NULL) {
- if (tab->nentries == 0)
- tab->identities = xmalloc(sizeof(Identity));
- else
- tab->identities = xrealloc(tab->identities,
- (tab->nentries + 1) * sizeof(Identity));
+ if (lookup_identity(k, 2) == NULL) {
+ Identity *id = xmalloc(sizeof(Identity));
n = key_new(KEY_RSA);
BN_copy(n->rsa->n, k->rsa->n);
BN_copy(n->rsa->e, k->rsa->e);
RSA_set_method(n->rsa, sc_get_engine());
- tab->identities[tab->nentries].key = n;
- tab->identities[tab->nentries].comment =
- xstrdup("rsa smartcard");
+ id->key = n;
+ id->comment = xstrdup("rsa smartcard");
+ TAILQ_INSERT_TAIL(&tab->idlist, id, next);
tab->nentries++;
}
key_free(k);
static void
process_remove_smartcard_key(SocketEntry *e)
{
- Key *k = NULL, *private;
- int idx;
+ Key *k = NULL;
int success = 0;
- int sc_reader_num = 0;
+ char *sc_reader_id = NULL;
- sc_reader_num = buffer_get_int(&e->input);
+ sc_reader_id = buffer_get_string(&e->input, NULL);
+ k = sc_get_key(sc_reader_id);
+ xfree(sc_reader_id);
- if ((k = sc_get_key(sc_reader_num)) == NULL) {
+ if (k == NULL) {
error("sc_get_pubkey failed");
} else {
- private = lookup_private_key(k, &idx, 1);
- if (private != NULL) {
+ Identity *id;
+ k->type = KEY_RSA1;
+ id = lookup_identity(k, 1);
+ if (id != NULL) {
Idtab *tab = idtab_lookup(1);
- key_free(tab->identities[idx].key);
- xfree(tab->identities[idx].comment);
- if (idx != tab->nentries)
- tab->identities[idx] = tab->identities[tab->nentries];
+ TAILQ_REMOVE(&tab->idlist, id, next);
+ free_identity(id);
tab->nentries--;
success = 1;
}
- private = lookup_private_key(k, &idx, 2);
- if (private != NULL) {
+ k->type = KEY_RSA;
+ id = lookup_identity(k, 2);
+ if (id != NULL) {
Idtab *tab = idtab_lookup(2);
- key_free(tab->identities[idx].key);
- xfree(tab->identities[idx].comment);
- if (idx != tab->nentries)
- tab->identities[idx] = tab->identities[tab->nentries];
+ TAILQ_REMOVE(&tab->idlist, id, next);
+ free_identity(id);
tab->nentries--;
success = 1;
}
key_free(k);
- sc_close();
}
buffer_put_int(&e->output, 1);
buffer_put_char(&e->output,
success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
}
-#endif
+#endif /* SMARTCARD */
/* dispatch incoming messages */
u_char *cp;
if (buffer_len(&e->input) < 5)
return; /* Incomplete message. */
- cp = (u_char *) buffer_ptr(&e->input);
+ cp = buffer_ptr(&e->input);
msg_len = GET_32BIT(cp);
if (msg_len > 256 * 1024) {
shutdown(e->fd, SHUT_RDWR);
#ifdef SMARTCARD
case SSH_AGENTC_ADD_SMARTCARD_KEY:
process_add_smartcard_key(e);
- break;
+ break;
case SSH_AGENTC_REMOVE_SMARTCARD_KEY:
process_remove_smartcard_key(e);
- break;
-#endif
+ break;
+#endif /* SMARTCARD */
default:
/* Unknown message. Respond with failure. */
error("Unknown message %d", type);
}
static void
-new_socket(int type, int fd)
+new_socket(sock_type type, int fd)
{
u_int i, old_alloc;
if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
}
static int
-prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl)
+prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, int *nallocp)
{
u_int i, sz;
int n = 0;
}
sz = howmany(n+1, NFDBITS) * sizeof(fd_mask);
- if (*fdrp == NULL || n > *fdl) {
+ if (*fdrp == NULL || sz > *nallocp) {
if (*fdrp)
xfree(*fdrp);
if (*fdwp)
xfree(*fdwp);
*fdrp = xmalloc(sz);
*fdwp = xmalloc(sz);
- *fdl = n;
+ *nallocp = sz;
}
+ if (n < *fdl)
+ debug("XXX shrink: %d < %d", n, *fdl);
+ *fdl = n;
memset(*fdrp, 0, sz);
memset(*fdwp, 0, sz);
sock = accept(sockets[i].fd,
(struct sockaddr *) &sunaddr, &slen);
if (sock < 0) {
- perror("accept from AUTH_SOCKET");
+ error("accept from AUTH_SOCKET: %s",
+ strerror(errno));
break;
}
new_socket(AUTH_CONNECTION, sock);
}
static void
-check_parent_exists(int sig)
-{
- int save_errno = errno;
-
- if (parent_pid != -1 && kill(parent_pid, 0) < 0) {
- /* printf("Parent has died - Authentication agent exiting.\n"); */
- exit(1);
- }
- signal(SIGALRM, check_parent_exists);
- alarm(10);
- errno = save_errno;
-}
-
-static void
-cleanup_socket(void)
+cleanup_socket(void *p)
{
if (socket_name[0])
unlink(socket_name);
static void
cleanup_exit(int i)
{
- cleanup_socket();
+ cleanup_socket(NULL);
exit(i);
}
static void
cleanup_handler(int sig)
{
- cleanup_socket();
+ cleanup_socket(NULL);
_exit(2);
}
+static void
+check_parent_exists(int sig)
+{
+ int save_errno = errno;
+
+ if (parent_pid != -1 && kill(parent_pid, 0) < 0) {
+ /* printf("Parent has died - Authentication agent exiting.\n"); */
+ cleanup_handler(sig); /* safe */
+ }
+ signal(SIGALRM, check_parent_exists);
+ alarm(10);
+ errno = save_errno;
+}
+
static void
usage(void)
{
- fprintf(stderr, "ssh-agent version %s\n", SSH_VERSION);
- fprintf(stderr, "Usage: %s [-c | -s] [-k] [-d] [command {args...]]\n",
+ fprintf(stderr, "Usage: %s [options] [command [args ...]]\n",
__progname);
+ fprintf(stderr, "Options:\n");
+ fprintf(stderr, " -c Generate C-shell commands on stdout.\n");
+ fprintf(stderr, " -s Generate Bourne shell commands on stdout.\n");
+ fprintf(stderr, " -k Kill the current agent.\n");
+ fprintf(stderr, " -d Debug mode.\n");
exit(1);
}
int
main(int ac, char **av)
{
- int sock, c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0, ch;
+ int sock, c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0, ch, nalloc;
struct sockaddr_un sunaddr;
#ifdef HAVE_SETRLIMIT
struct rlimit rlim;
pid = fork();
if (pid == -1) {
perror("fork");
- exit(1);
+ cleanup_exit(1);
}
if (pid != 0) { /* Parent - execute the given command. */
close(sock);
perror(av[0]);
exit(1);
}
+ /* child */
+ log_init(__progname, SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_AUTH, 0);
+
+ if (setsid() == -1) {
+ error("setsid: %s", strerror(errno));
+ cleanup_exit(1);
+ }
+
+ (void)chdir("/");
close(0);
close(1);
close(2);
/* deny core dumps, since memory contains unencrypted private keys */
rlim.rlim_cur = rlim.rlim_max = 0;
if (setrlimit(RLIMIT_CORE, &rlim) < 0) {
- perror("setrlimit rlimit_core failed");
+ error("setrlimit RLIMIT_CORE: %s", strerror(errno));
cleanup_exit(1);
}
#endif
- if (setsid() == -1) {
- perror("setsid");
- cleanup_exit(1);
- }
skip:
- if (atexit(cleanup_socket) < 0) {
- perror("atexit");
- cleanup_exit(1);
- }
+ fatal_add_cleanup(cleanup_socket, NULL);
new_socket(AUTH_SOCKET, sock);
if (ac > 0) {
signal(SIGALRM, check_parent_exists);
signal(SIGPIPE, SIG_IGN);
signal(SIGHUP, cleanup_handler);
signal(SIGTERM, cleanup_handler);
+ nalloc = 0;
+
while (1) {
- prepare_select(&readsetp, &writesetp, &max_fd);
+ prepare_select(&readsetp, &writesetp, &max_fd, &nalloc);
if (select(max_fd + 1, readsetp, writesetp, NULL, NULL) < 0) {
if (errno == EINTR)
continue;
- exit(1);
+ fatal("select: %s", strerror(errno));
}
after_select(readsetp, writesetp);
}
andersk / openssh.git / blobdiff