summaryrefslogtreecommitdiffstats
path: root/authfile.h
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-08-05 11:50:33 +0000
committerDamien Miller <djm@mindrot.org>2019-08-08 16:40:09 +1000
commit6b39a7b49ebacec4e70e24bfc8ea2f11057aac22 (patch)
tree5b43a6b0e136280a269f1161fad9a07b8a2af827 /authfile.h
parentd46075b923bf25e6f25959a3f5b458852161cb3e (diff)
upstream: Remove now-redundant perm_ok arg since
sshkey_load_private_type will now return SSH_ERR_KEY_BAD_PERMISSIONS in that case. Patch from jitendra.sharma at intel.com, ok djm@ OpenBSD-Commit-ID: 07916a17ed0a252591b71e7fb4be2599cb5b0c77
Diffstat (limited to 'authfile.h')
-rw-r--r--authfile.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/authfile.h b/authfile.h
index 624d269f..54df169b 100644
--- a/authfile.h
+++ b/authfile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.h,v 1.21 2015/01/08 10:14:08 djm Exp $ */
+/* $OpenBSD: authfile.h,v 1.22 2019/08/05 11:50:33 dtucker Exp $ */
/*
* Copyright (c) 2000, 2013 Markus Friedl. All rights reserved.
@@ -40,9 +40,9 @@ int sshkey_load_cert(const char *, struct sshkey **);
int sshkey_load_public(const char *, struct sshkey **, char **);
int sshkey_load_private(const char *, const char *, struct sshkey **, char **);
int sshkey_load_private_cert(int, const char *, const char *,
- struct sshkey **, int *);
+ struct sshkey **);
int sshkey_load_private_type(int, const char *, const char *,
- struct sshkey **, char **, int *);
+ struct sshkey **, char **);
int sshkey_load_private_type_fd(int fd, int type, const char *passphrase,
struct sshkey **keyp, char **commentp);
int sshkey_perm_ok(int, const char *);