Start the process of splitting sshd into separate binaries. This step

splits sshd into a listener and a session binary. More splits are
planned.

After this changes, the listener binary will validate the configuration,
load the hostkeys, listen on port 22 and manage MaxStartups only. All
session handling will be performed by a new sshd-session binary that the
listener fork+execs.

This reduces the listener process to the minimum necessary and sets us
up for future work on the sshd-session binary.

feedback/ok markus@ deraadt@

NB. if you're updating via source, please restart sshd after installing,
otherwise you run the risk of locking yourself out.

1 files changed, 9 insertions, 6 deletions

diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
index 84487e7c942..ae7814a282c 100644
--- a/usr.bin/ssh/Makefile.inc
+++ b/usr.bin/ssh/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.89 2024/01/11 01:45:36 djm Exp $
+#	$OpenBSD: Makefile.inc,v 1.90 2024/05/17 00:30:23 djm Exp $
 
 .include <bsd.own.mk>
 
@@ -25,7 +25,7 @@ CDIAGFLAGS+=	-Wstrict-aliasing=2
 CDIAGFLAGS+=	-Wold-style-definition
 .endif
 
-#CDIAGFLAGS+=	-Werror
+CDIAGFLAGS+=	-Werror
 #CDIAGFLAGS+=	-fno-common
 #DEBUG=-g
 #INSTALL_STRIP=
@@ -111,14 +111,17 @@ SRCS_KEYP+=	atomicio.c
 SRCS_KRL+=	bitmap.c
 SRCS_KRL+=	krl.c
 
+SRCS_MAC+=	mac.c
+SRCS_MAC+=	hmac.c
+SRCS_MAC+=	umac.c
+SRCS_MAC+=	umac128.c
+
 SRCS_PKT+=	canohost.c
 SRCS_PKT+=	dispatch.c
-SRCS_PKT+=	hmac.c
 SRCS_PKT+=	kex.c
-SRCS_PKT+=	mac.c
+SRCS_PKT+=	kex-names.c
 SRCS_PKT+=	packet.c
-SRCS_PKT+=	umac.c
-SRCS_PKT+=	umac128.c
+SRCS_PKT+=	${SRCS_MAC}
 
 SRCS_PROT+=	channels.c
 SRCS_PROT+=	monitor_fdpass.c