upstream: remove legacy key emulation layer; ok djm@

OpenBSD-Commit-ID: 2b1f9619259e222bbd4fe9a8d3a0973eafb9dd8d
author: markus@openbsd.org <markus@openbsd.org> 2018-07-11 18:53:29 +0000
committer: Damien Miller <djm@mindrot.org> 2018-07-12 13:18:25 +1000
commit: 5467fbcb09528ecdcb914f4f2452216c24796790 (patch)
tree: 8fcef797ece697250f4c67d57a5063d6316fd203 /mux.c
parent: 5dc4c59d5441a19c99e7945779f7ec9051126c25 (diff)
1 files changed, 2 insertions, 2 deletions
diff --git a/mux.c b/mux.c
index 95d74b62e..6394e3e18 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.73 2018/07/09 21:18:10 markus Exp $ */
+/* $OpenBSD: mux.c,v 1.74 2018/07/11 18:53:29 markus Exp $ */
 /*
 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
 *
@@ -76,7 +76,7 @@
 #include "packet.h"
 #include "monitor_fdpass.h"
 #include "sshpty.h"
-#include "key.h"
+#include "sshkey.h"
 #include "readconf.h"
 #include "clientloop.h"
 #include "ssherr.h"
author	markus@openbsd.org <markus@openbsd.org>	2018-07-11 18:53:29 +0000
committer	Damien Miller <djm@mindrot.org>	2018-07-12 13:18:25 +1000
commit	5467fbcb09528ecdcb914f4f2452216c24796790 (patch)
tree	8fcef797ece697250f4c67d57a5063d6316fd203 /mux.c
parent	5dc4c59d5441a19c99e7945779f7ec9051126c25 (diff)

diff --git a/mux.c b/mux.c index 95d74b62e..6394e3e18 100644 --- a/mux.c +++ b/mux.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: mux.c,v 1.73 2018/07/09 21:18:10 markus Exp $ */	1	/* $OpenBSD: mux.c,v 1.74 2018/07/11 18:53:29 markus Exp $ */
2	/*	2	/*
3	* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>	3	* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
4	*	4	*
@@ -76,7 +76,7 @@
76	#include "packet.h"	76	#include "packet.h"
77	#include "monitor_fdpass.h"	77	#include "monitor_fdpass.h"
78	#include "sshpty.h"	78	#include "sshpty.h"
79	#include "key.h"	79	#include "sshkey.h"
80	#include "readconf.h"	80	#include "readconf.h"
81	#include "clientloop.h"	81	#include "clientloop.h"
82	#include "ssherr.h"	82	#include "ssherr.h"