upstream commit

- Fix error message: passphrase needs to be at least 5
 characters, not 4. - Remove unused function argument. - Remove two
 unnecessary variables.

OK djm@

Upstream-ID: 13010c05bfa8b523da1c0dc19e81dd180662bc30

diff --git a/authfile.c b/authfile.c
index 58f589a4745d53eabaa3fa0b5327a2edbae21d05..1907cb1cc083806358253d584bf1af895c04da18 100644 (file)
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.116 2015/07/09 09:49:46 markus Exp $ */
+/* $OpenBSD: authfile.c,v 1.117 2015/09/13 14:39:16 tim Exp $ */
 /*
  * Copyright (c) 2000, 2013 Markus Friedl.  All rights reserved.
  *
@@ -272,8 +272,8 @@ sshkey_load_private(const char *filename, const char *passphrase,
                goto out;
        }
        if ((r = sshkey_load_file(fd, buffer)) != 0 ||
-           (r = sshkey_parse_private_fileblob(buffer, passphrase, filename,
-           keyp, commentp)) != 0)
+           (r = sshkey_parse_private_fileblob(buffer, passphrase, keyp,
+           commentp)) != 0)
                goto out;
        r = 0;
  out:

diff --git a/ssh-add.c b/ssh-add.c
index c2be36d9383533d3999ab6bd6af11f6aebfe2ef3..d8d6481f2fe9573a1e5e6eb00f08cac345d7afd5 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.124 2015/09/13 13:48:19 tim Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.125 2015/09/13 14:39:16 tim Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -218,17 +218,16 @@ 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;
@@ -244,7 +243,7 @@ add_file(int agent_fd, const char *filename, int key_only)
                        if (strcmp(pass, "") == 0)
                                goto fail_load;
                        if ((r = sshkey_parse_private_fileblob(keyblob, pass,
-                           filename, &private, &comment)) == 0)
+                           &private, &comment)) == 0)
                                break;
                        else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
                                fprintf(stderr,

diff --git a/ssherr.c b/ssherr.c
index 4ca7939926c9d922972ca50939e37c312c1a1648..68020706381ca1d15dc3810451e191e346f5cc2e 100644 (file)
--- a/ssherr.c
+++ b/ssherr.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssherr.c,v 1.4 2015/02/16 22:13:32 djm Exp $  */
+/*     $OpenBSD: ssherr.c,v 1.5 2015/09/13 14:39:16 tim Exp $  */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -104,7 +104,7 @@ ssh_err(int n)
        case SSH_ERR_NEED_REKEY:
                return "rekeying not supported by peer";
        case SSH_ERR_PASSPHRASE_TOO_SHORT:
-               return "passphrase is too short (minimum four characters)";
+               return "passphrase is too short (minimum five characters)";
        case SSH_ERR_FILE_CHANGED:
                return "file changed while reading";
        case SSH_ERR_KEY_UNKNOWN_CIPHER:

diff --git a/sshkey.c b/sshkey.c
index 1f714c37f8080aa887757180951ad13e2da3fc16..3dd8907b0db01cfbd3077785b00b6b41def890f2 100644 (file)
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.22 2015/09/02 07:51:12 jsg Exp $ */
+/* $OpenBSD: sshkey.c,v 1.23 2015/09/13 14:39:16 tim Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -3833,8 +3833,6 @@ int
 sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
     const char *passphrase, struct sshkey **keyp, char **commentp)
 {
-       int r;
-
        *keyp = NULL;
        if (commentp != NULL)
                *commentp = NULL;
@@ -3856,8 +3854,8 @@ sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
                return sshkey_parse_private2(blob, type, passphrase,
                    keyp, commentp);
        case KEY_UNSPEC:
-               if ((r = sshkey_parse_private2(blob, type, passphrase, keyp,
-                   commentp)) == 0)
+               if (sshkey_parse_private2(blob, type, passphrase, keyp,
+                   commentp) == 0)
                        return 0;
 #ifdef WITH_OPENSSL
                return sshkey_parse_private_pem_fileblob(blob, type,
@@ -3872,10 +3870,8 @@ sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
 
 int
 sshkey_parse_private_fileblob(struct sshbuf *buffer, const char *passphrase,
-    const char *filename, struct sshkey **keyp, char **commentp)
+    struct sshkey **keyp, char **commentp)
 {
-       int r;
-
        if (keyp != NULL)
                *keyp = NULL;
        if (commentp != NULL)
@@ -3883,13 +3879,11 @@ sshkey_parse_private_fileblob(struct sshbuf *buffer, const char *passphrase,
 
 #ifdef WITH_SSH1
        /* it's a SSH v1 key if the public key part is readable */
-       if ((r = sshkey_parse_public_rsa1_fileblob(buffer, NULL, NULL)) == 0) {
+       if (sshkey_parse_public_rsa1_fileblob(buffer, NULL, NULL) == 0) {
                return sshkey_parse_private_fileblob_type(buffer, KEY_RSA1,
                    passphrase, keyp, commentp);
        }
 #endif /* WITH_SSH1 */
-       if ((r = sshkey_parse_private_fileblob_type(buffer, KEY_UNSPEC,
-           passphrase, keyp, commentp)) == 0)
-               return 0;
-       return r;
+       return sshkey_parse_private_fileblob_type(buffer, KEY_UNSPEC,
+           passphrase, keyp, commentp);
 }

diff --git a/sshkey.h b/sshkey.h
index c8d3cddca59552100e8efdaa4af01dabe951c24b..99f1b25d53962ccdc1bf766f4c8e0714a8017a55 100644 (file)
--- a/sshkey.h
+++ b/sshkey.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.h,v 1.9 2015/08/04 05:23:06 djm Exp $ */
+/* $OpenBSD: sshkey.h,v 1.10 2015/09/13 14:39:16 tim Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -186,8 +186,7 @@ int sshkey_private_to_fileblob(struct sshkey *key, struct sshbuf *blob,
 int    sshkey_parse_public_rsa1_fileblob(struct sshbuf *blob,
     struct sshkey **keyp, char **commentp);
 int    sshkey_parse_private_fileblob(struct sshbuf *buffer,
-    const char *passphrase, const char *filename, struct sshkey **keyp,
-    char **commentp);
+    const char *passphrase, struct sshkey **keyp, char **commentp);
 int    sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
     const char *passphrase, struct sshkey **keyp, char **commentp);