summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshkey.h
diff options
context:
space:
mode:
authortim <tim@cvs.openbsd.org>2015-09-13 14:39:17 +0000
committertim <tim@cvs.openbsd.org>2015-09-13 14:39:17 +0000
commit9302bbc1850f046a0f8c54b654a30388f5a71b18 (patch)
tree3e30be3636b7c9412cfcd76c433f67eb1c80db3b /usr.bin/ssh/sshkey.h
parent1be5bcdf804d236b28ea4c79faa34dd4f5a76f72 (diff)
- Fix error message: passphrase needs to be at least 5 characters, not 4.
- Remove unused function argument. - Remove two unnecessary variables. OK djm@
Diffstat (limited to 'usr.bin/ssh/sshkey.h')
-rw-r--r--usr.bin/ssh/sshkey.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshkey.h b/usr.bin/ssh/sshkey.h
index 0deee640b22..b97b1fa99e2 100644
--- a/usr.bin/ssh/sshkey.h
+++ b/usr.bin/ssh/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.
@@ -180,8 +180,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);