1 files changed, 16 insertions, 19 deletions

diff --git a/ssh-add.c b/ssh-add.c
index d6271d78e..fb9a53e64 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.123 2015/07/03 03:43:18 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.128 2016/02/15 09:47:49 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -93,7 +93,7 @@ static int lifetime = 0;
 /* User has to confirm key use */
 static int confirm = 0;
 
-/* we keep a cache of one passphrases */
+/* we keep a cache of one passphrase */
 static char *pass = NULL;
 static void
 clear_pass(void)
@@ -150,10 +150,8 @@ delete_file(int agent_fd, const char *filename, int key_only)
                     certpath, ssh_err(r));
 
  out:
-        if (cert != NULL)
-                sshkey_free(cert);
-        if (public != NULL)
-                sshkey_free(public);
+        sshkey_free(cert);
+        sshkey_free(public);
         free(certpath);
         free(comment);
 
@@ -218,35 +216,32 @@ add_file(int agent_fd, const char *filename, int key_only)
         close(fd);
 
         /* At first, try empty passphrase */
-        if ((r = sshkey_parse_private_fileblob(keyblob, "", filename,
-            &private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
+        if ((r = sshkey_parse_private_fileblob(keyblob, "", &private,
+            &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
                 fprintf(stderr, "Error loading key \"%s\": %s\n",
                     filename, ssh_err(r));
                 goto fail_load;
         }
         /* try last */
         if (private == NULL && pass != NULL) {
-                if ((r = sshkey_parse_private_fileblob(keyblob, pass, filename,
-                    &private, &comment)) != 0 &&
-                    r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
+                if ((r = sshkey_parse_private_fileblob(keyblob, pass, &private,
+                    &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
                         fprintf(stderr, "Error loading key \"%s\": %s\n",
                             filename, ssh_err(r));
                         goto fail_load;
                 }
         }
-        if (comment == NULL)
-                comment = xstrdup(filename);
         if (private == NULL) {
                 /* clear passphrase since it did not work */
                 clear_pass();
-                snprintf(msg, sizeof msg, "Enter passphrase for %.200s%s: ",
-                    comment, confirm ? " (will confirm each use)" : "");
+                snprintf(msg, sizeof msg, "Enter passphrase for %s%s: ",
+                    filename, confirm ? " (will confirm each use)" : "");
                 for (;;) {
                         pass = read_passphrase(msg, RP_ALLOW_STDIN);
                         if (strcmp(pass, "") == 0)
                                 goto fail_load;
                         if ((r = sshkey_parse_private_fileblob(keyblob, pass,
-                            filename, &private, NULL)) == 0)
+                            &private, &comment)) == 0)
                                 break;
                         else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
                                 fprintf(stderr,
@@ -254,16 +249,17 @@ add_file(int agent_fd, const char *filename, int key_only)
                                     filename, ssh_err(r));
  fail_load:
                                 clear_pass();
-                                free(comment);
                                 sshbuf_free(keyblob);
                                 return -1;
                         }
                         clear_pass();
                         snprintf(msg, sizeof msg,
-                            "Bad passphrase, try again for %.200s%s: ", comment,
+                            "Bad passphrase, try again for %s%s: ", filename,
                             confirm ? " (will confirm each use)" : "");
                 }
         }
+        if (comment == NULL || *comment == '\0')
+                comment = xstrdup(filename);
         sshbuf_free(keyblob);
 
         if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
@@ -386,7 +382,7 @@ list_identities(int agent_fd, int do_fp)
                         if (do_fp) {
                                 fp = sshkey_fingerprint(idlist->keys[i],
                                     fingerprint_hash, SSH_FP_DEFAULT);
-                                printf("%d %s %s (%s)\n",
+                                printf("%u %s %s (%s)\n",
                                     sshkey_size(idlist->keys[i]),
                                     fp == NULL ? "(null)" : fp,
                                     idlist->comments[i],
@@ -485,6 +481,7 @@ main(int argc, char **argv)
         int r, i, ch, deleting = 0, ret = 0, key_only = 0;
         int xflag = 0, lflag = 0, Dflag = 0;
 
+        ssh_malloc_init();      /* must be called before any mallocs */
         /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
         sanitise_stdfd();