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

1 files changed, 2 insertions, 2 deletions

diff --git a/ssherr.c b/ssherr.c
index 4ca793992..680207063 100644
--- 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: