diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-01-08 10:14:08 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-09 00:17:12 +1100 |
| commit | 1195f4cb07ef4b0405c839293c38600b3e9bdb46 (patch) | |
| tree | bee2cbc3442638bf18a2905608787a0c62b8994b /auth2-hostbased.c | |
| parent | febbe09e4e9aff579b0c5cc1623f756862e4757d (diff) | |
| download | openssh-git-1195f4cb07ef4b0405c839293c38600b3e9bdb46.tar.gz | |
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 'auth2-hostbased.c')
| -rw-r--r-- | auth2-hostbased.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/auth2-hostbased.c b/auth2-hostbased.c index eb6bee50..2db3d252 100644 --- a/auth2-hostbased.c +++ b/auth2-hostbased.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-hostbased.c,v 1.20 2014/12/23 22:42:48 djm Exp $ */ +/* $OpenBSD: auth2-hostbased.c,v 1.21 2015/01/08 10:14:08 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -84,6 +84,7 @@ userauth_hostbased(Authctxt *authctxt) buffer_dump(&b); buffer_free(&b); #endif + /* XXX provide some way to allow admin to specify key types accepted */ pktype = key_type_from_name(pkalg); if (pktype == KEY_UNSPEC) { /* this is perfectly legal */ |