diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-12-06 07:48:01 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-12-06 18:50:12 +1100 |
| commit | b4867e0712c89b93be905220c82f0a15e6865d1e (patch) | |
| tree | 7f6cccc68912487be6e43795f0678880efab2e60 | |
| parent | c9792783a98881eb7ed295680013ca97a958f8ac (diff) | |
upstream commit
make IdentityFile successfully load and use certificates that
have no corresponding bare public key. E.g. just a private id_rsa and
certificate id_rsa-cert.pub (and no id_rsa.pub).
bz#2617 ok dtucker@
Upstream-ID: c1e9699b8c0e3b63cc4189e6972e3522b6292604
| -rw-r--r-- | ssh.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.447 2016/09/30 09:19:13 markus Exp $ */ +/* $OpenBSD: ssh.c,v 1.448 2016/12/06 07:48:01 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2127,8 +2127,9 @@ load_public_identity_files(void) free(cp); continue; } + /* NB. leave filename pointing to private key */ + identity_files[n_ids] = xstrdup(filename); identity_keys[n_ids] = public; - identity_files[n_ids] = cp; n_ids++; } |