From e7d2538a32ce55c290dcd47d03936ee394db5b9d Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Tue, 6 Dec 2016 07:48:01 +0000
Subject: 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@
---
 usr.bin/ssh/ssh.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'usr.bin/ssh/ssh.c')

diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index d6395d412f2..025db6b39fc 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -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
@@ -2078,8 +2078,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++;
 	}
 
-- 
cgit v1.2.3-59-g8ed1b