1 files changed, 32 insertions, 17 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index c3d5e5a75..9123cfe6b 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.155 2007/03/19 12:16:42 dtucker Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.159 2008/06/28 14:05:15 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -51,6 +51,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
+#include "openbsd-compat/openssl-compat.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -311,6 +312,7 @@ process_sign_request2(SocketEntry *e)
         u_char *blob, *data, *signature = NULL;
         u_int blen, dlen, slen = 0;
         extern int datafellows;
+        int odatafellows;
         int ok = -1, flags;
         Buffer msg;
         Key *key;
@@ -321,6 +323,7 @@ process_sign_request2(SocketEntry *e)
         data = buffer_get_string(&e->request, &dlen);
 
         flags = buffer_get_int(&e->request);
+        odatafellows = datafellows;
         if (flags & SSH_AGENT_OLD_SIGNATURE)
                 datafellows = SSH_BUG_SIGBLOB;
 
@@ -346,6 +349,7 @@ process_sign_request2(SocketEntry *e)
         xfree(blob);
         if (signature != NULL)
                 xfree(signature);
+        datafellows = odatafellows;
 }
 
 /* shared */
@@ -457,6 +461,7 @@ static void
 process_add_identity(SocketEntry *e, int version)
 {
         Idtab *tab = idtab_lookup(version);
+        Identity *id;
         int type, success = 0, death = 0, confirm = 0;
         char *type_name, *comment;
         Key *k = NULL;
@@ -524,9 +529,8 @@ process_add_identity(SocketEntry *e, int version)
                 xfree(comment);
                 goto send;
         }
-        success = 1;
         while (buffer_len(&e->request)) {
-                switch (buffer_get_char(&e->request)) {
+                switch ((type = buffer_get_char(&e->request))) {
                 case SSH_AGENT_CONSTRAIN_LIFETIME:
                         death = time(NULL) + buffer_get_int(&e->request);
                         break;
@@ -534,24 +538,29 @@ process_add_identity(SocketEntry *e, int version)
                         confirm = 1;
                         break;
                 default:
-                        break;
+                        error("process_add_identity: "
+                            "Unknown constraint type %d", type);
+                        xfree(comment);
+                        key_free(k);
+                        goto send;
                 }
         }
+        success = 1;
         if (lifetime && !death)
                 death = time(NULL) + lifetime;
-        if (lookup_identity(k, version) == NULL) {
-                Identity *id = xmalloc(sizeof(Identity));
+        if ((id = lookup_identity(k, version)) == NULL) {
+                id = xmalloc(sizeof(Identity));
                 id->key = k;
-                id->comment = comment;
-                id->death = death;
-                id->confirm = confirm;
                 TAILQ_INSERT_TAIL(&tab->idlist, id, next);
                 /* Increment the number of identities. */
                 tab->nentries++;
         } else {
                 key_free(k);
-                xfree(comment);
+                xfree(id->comment);
         }
+        id->comment = comment;
+        id->death = death;
+        id->confirm = confirm;
 send:
         buffer_put_int(&e->output, 1);
         buffer_put_char(&e->output,
@@ -602,10 +611,10 @@ no_identities(SocketEntry *e, u_int type)
 
 #ifdef SMARTCARD
 static void
-process_add_smartcard_key (SocketEntry *e)
+process_add_smartcard_key(SocketEntry *e)
 {
         char *sc_reader_id = NULL, *pin;
-        int i, version, success = 0, death = 0, confirm = 0;
+        int i, type, version, success = 0, death = 0, confirm = 0;
         Key **keys, *k;
         Identity *id;
         Idtab *tab;
@@ -614,7 +623,7 @@ process_add_smartcard_key (SocketEntry *e)
         pin = buffer_get_string(&e->request, NULL);
 
         while (buffer_len(&e->request)) {
-                switch (buffer_get_char(&e->request)) {
+                switch ((type = buffer_get_char(&e->request))) {
                 case SSH_AGENT_CONSTRAIN_LIFETIME:
                         death = time(NULL) + buffer_get_int(&e->request);
                         break;
@@ -622,7 +631,11 @@ process_add_smartcard_key (SocketEntry *e)
                         confirm = 1;
                         break;
                 default:
-                        break;
+                        error("process_add_smartcard_key: "
+                            "Unknown constraint type %d", type);
+                        xfree(sc_reader_id);
+                        xfree(pin);
+                        goto send;
                 }
         }
         if (lifetime && !death)
@@ -948,7 +961,8 @@ after_select(fd_set *readset, fd_set *writeset)
                                             buffer_ptr(&sockets[i].output),
                                             buffer_len(&sockets[i].output));
                                         if (len == -1 && (errno == EAGAIN ||
-                                            errno == EINTR))
+                                            errno == EINTR ||
+                                            errno == EWOULDBLOCK))
                                                 continue;
                                         break;
                                 } while (1);
@@ -962,7 +976,8 @@ after_select(fd_set *readset, fd_set *writeset)
                                 do {
                                         len = read(sockets[i].fd, buf, sizeof(buf));
                                         if (len == -1 && (errno == EAGAIN ||
-                                            errno == EINTR))
+                                            errno == EINTR ||
+                                            errno == EWOULDBLOCK))
                                                 continue;
                                         break;
                                 } while (1);
@@ -1016,7 +1031,7 @@ check_parent_exists(void)
 static void
 usage(void)
 {
-        fprintf(stderr, "Usage: %s [options] [command [args ...]]\n",
+        fprintf(stderr, "usage: %s [options] [command [arg ...]]\n",
             __progname);
         fprintf(stderr, "Options:\n");
         fprintf(stderr, "  -c          Generate C-shell commands on stdout.\n");