summaryrefslogtreecommitdiff
path: root/sshkey.h
diff options
context:
space:
mode:
authortim@openbsd.org <tim@openbsd.org>2015-09-13 14:39:16 +0000
committerDamien Miller <djm@mindrot.org>2015-09-16 17:52:09 +1000
commit3c019a936b43f3e2773f3edbde7c114d73caaa4c (patch)
tree2f65012ad783bb594c668d37d5137a1f1ac56768 /sshkey.h
parent2681cdb6e0de7c1af549dac37a9531af202b4434 (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 'sshkey.h')
-rw-r--r--sshkey.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sshkey.h b/sshkey.h
index c8d3cddc..99f1b25d 100644
--- 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);