summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--secure/lib/libssh/Makefile7
-rw-r--r--secure/usr.bin/ssh/Makefile3
-rw-r--r--secure/usr.sbin/sshd/Makefile10
3 files changed, 15 insertions, 5 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index f0e338c..93a4515 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -7,7 +7,8 @@ LIB= ssh
SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
cipher.c compat.c compress.c crc32.c deattack.c fingerprint.c \
hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
- rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c
+ rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \
+ key.c dispatch.c dsa.c kex.c hmac.c uuencode.c
NOPIC= yes
@@ -32,4 +33,8 @@ CFLAGS+= -DKRB4
CFLAGS+= -DKRB5
.endif # MAKE_KERBEROS5
+CFLAGS+= -DSKEY
+DPADD+= ${LIBOPIE}
+LDADD+= -lopie
+SRCS+= auth-skey.c
.include <bsd.lib.mk>
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 54409b0..2c7f18a 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -10,7 +10,8 @@ MAN1= ssh.1
LINKS= ${BINDIR}/ssh ${BINDIR}/slogin
MLINKS= ssh.1 slogin.1
-SRCS= clientloop.c key.c log-client.c readconf.c ssh.c sshconnect.c
+SRCS= ssh.c log-client.c readconf.c clientloop.c sshconnect.c \
+ sshconnect1.c sshconnect2.c
.include <bsd.own.mk>
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 3ac7555..f71c41e 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -9,9 +9,9 @@ BINOWN= root
BINMODE=555
MAN8= sshd.8
-SRCS= auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c \
- key.c log-server.c login.c login_access.c pty.c servconf.c \
- serverloop.c sshd.c \
+SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
+ pty.c log-server.c login.c servconf.c serverloop.c \
+ auth.c auth1.c auth2.c session.c login_access.c
CFLAGS+= -DLIBWRAP -DLOGIN_ACCESS -I${LOGINSRC}
@@ -37,6 +37,10 @@ LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/librok
DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD}
.endif # MAKE_KERBEROS5
+CFLAGS+= -DSKEY
+LDADD+= -lopie
+DPADD+= ${LIBOPIE}
+
.include <bsd.prog.mk>
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypt -lcrypto -lutil -lz -lwrap
OpenPOWER on IntegriCloud