diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2015-01-08 10:14:09 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2015-01-08 10:14:09 +0000 |
| commit | 8282f0bdc864c86fc63f7e4f3c655143dea8d8e4 (patch) | |
| tree | 4385dc9f5ff589e95088eda5e8475873478e86d8 /usr.bin/ssh/krl.c | |
| parent | 42ad99c9e2a165f8e611a1cbca4e3d6d0fcce4d8 (diff) | |
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 'usr.bin/ssh/krl.c')
| -rw-r--r-- | usr.bin/ssh/krl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/krl.c b/usr.bin/ssh/krl.c index dae6aed546b..977535f5012 100644 --- a/usr.bin/ssh/krl.c +++ b/usr.bin/ssh/krl.c @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: krl.c,v 1.21 2014/12/21 22:27:56 djm Exp $ */ +/* $OpenBSD: krl.c,v 1.22 2015/01/08 10:14:08 djm Exp $ */ #include <sys/types.h> #include <sys/param.h> @@ -1246,7 +1246,7 @@ ssh_krl_file_contains_key(const char *path, const struct sshkey *key) oerrno = errno; goto out; } - if ((r = sshkey_load_file(fd, path, krlbuf)) != 0) { + if ((r = sshkey_load_file(fd, krlbuf)) != 0) { oerrno = errno; goto out; } |