diff options
| author | tim@openbsd.org <tim@openbsd.org> | 2015-09-13 14:39:16 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-09-16 17:52:09 +1000 |
| commit | 3c019a936b43f3e2773f3edbde7c114d73caaa4c (patch) | |
| tree | 2f65012ad783bb594c668d37d5137a1f1ac56768 /authfile.c | |
| parent | 2681cdb6e0de7c1af549dac37a9531af202b4434 (diff) | |
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
Diffstat (limited to 'authfile.c')
| -rw-r--r-- | authfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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: |