summaryrefslogtreecommitdiff
path: root/authfile.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-01-08 10:14:08 +0000
committerDamien Miller <djm@mindrot.org>2015-01-09 00:17:12 +1100
commit1195f4cb07ef4b0405c839293c38600b3e9bdb46 (patch)
treebee2cbc3442638bf18a2905608787a0c62b8994b /authfile.h
parentfebbe09e4e9aff579b0c5cc1623f756862e4757d (diff)
upstream commit
deprecate key_load_private_pem() and sshkey_load_private_pem() interfaces. Refactor the generic key loading API to not require pathnames to be specified (they weren't really used). Fixes a few other things en passant: Makes ed25519 keys work for hostbased authentication (ssh-keysign previously used the PEM-only routines). Fixes key comment regression bz#2306: key pathnames were being lost as comment fields. ok markus@
Diffstat (limited to 'authfile.h')
-rw-r--r--authfile.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/authfile.h b/authfile.h
index 645404e61..624d269f1 100644
--- a/authfile.h
+++ b/authfile.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfile.h,v 1.20 2014/12/04 02:24:32 djm Exp $ */ 1/* $OpenBSD: authfile.h,v 1.21 2015/01/08 10:14:08 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved.
@@ -30,9 +30,12 @@
30struct sshbuf; 30struct sshbuf;
31struct sshkey; 31struct sshkey;
32 32
33/* XXX document these */
34/* XXX some of these could probably be merged/retired */
35
33int sshkey_save_private(struct sshkey *, const char *, 36int sshkey_save_private(struct sshkey *, const char *,
34 const char *, const char *, int, const char *, int); 37 const char *, const char *, int, const char *, int);
35int sshkey_load_file(int, const char *, struct sshbuf *); 38int sshkey_load_file(int, struct sshbuf *);
36int sshkey_load_cert(const char *, struct sshkey **); 39int sshkey_load_cert(const char *, struct sshkey **);
37int sshkey_load_public(const char *, struct sshkey **, char **); 40int sshkey_load_public(const char *, struct sshkey **, char **);
38int sshkey_load_private(const char *, const char *, struct sshkey **, char **); 41int sshkey_load_private(const char *, const char *, struct sshkey **, char **);
@@ -40,7 +43,8 @@ int sshkey_load_private_cert(int, const char *, const char *,
40 struct sshkey **, int *); 43 struct sshkey **, int *);
41int sshkey_load_private_type(int, const char *, const char *, 44int sshkey_load_private_type(int, const char *, const char *,
42 struct sshkey **, char **, int *); 45 struct sshkey **, char **, int *);
43int sshkey_load_private_pem(int, int, const char *, struct sshkey **, char **); 46int sshkey_load_private_type_fd(int fd, int type, const char *passphrase,
47 struct sshkey **keyp, char **commentp);
44int sshkey_perm_ok(int, const char *); 48int sshkey_perm_ok(int, const char *);
45int sshkey_in_file(struct sshkey *, const char *, int, int); 49int sshkey_in_file(struct sshkey *, const char *, int, int);
46int sshkey_check_revoked(struct sshkey *key, const char *revoked_keys_file); 50int sshkey_check_revoked(struct sshkey *key, const char *revoked_keys_file);