Import OpenSSH-7.6p1
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 13 Oct 2017 01:33:48 +0000 (18:33 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 13 Oct 2017 01:34:06 +0000 (18:34 -0700)
* Adjust build to match import

lib/libssh/Makefile
usr.bin/ssh/Makefile
usr.sbin/sshd/Makefile

index a729cb8..b052c67 100644 (file)
@@ -13,10 +13,10 @@ SRCS=       ssh_api.c \
        bitmap.c
 SRCS+= authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c \
        canohost.c channels.c cipher.c \
-       cipher-bf1.c cipher-3des1.c cleanup.c \
-       compat.c crc32.c deattack.c fatal.c hostfile.c \
+       cleanup.c \
+       compat.c crc32.c fatal.c hostfile.c \
        log.c match.c moduli.c nchan.c packet.c opacket.c \
-       readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \
+       readpass.c ttymodes.c xmalloc.c addrmatch.c \
        atomicio.c key.c dispatch.c mac.c uidswap.c uuencode.c misc.c utf8.c \
        monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \
        msg.c progressmeter.c dns.c entropy.c umac.c umac128.c \
@@ -27,11 +27,12 @@ SRCS+=      authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c \
        kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c \
        kexdhc.c kexgexc.c kexecdhc.c kexc25519c.c \
        kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c \
-       platform-pledge.c platform-tracing.c
+       platform-pledge.c platform-tracing.c platform-misc.c
 # Portability layer
 SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c \
        getrrsetbyname.c glob.c openssl-compat.c \
-       port-tun.c reallocarray.c realpath.c timingsafe_bcmp.c vis.c
+       port-tun.c reallocarray.c realpath.c timingsafe_bcmp.c vis.c \
+       recallocarray.c
 
 # only when USE_BUILTIN_RIJNDAEL
 #SRCS+=        cipher-aes.c
index e321712..f86d0c7 100644 (file)
@@ -7,7 +7,7 @@ MLINKS= ssh.1 slogin.1
 WARNS?=        2
 
 SRCS=  ssh.c readconf.c clientloop.c sshtty.c \
-       sshconnect.c sshconnect1.c sshconnect2.c mux.c
+       sshconnect.c sshconnect2.c mux.c
 SRCS+= fmt_scaled.c
 
 .include "../../Makefile.ssh.common"
index 009e171..3172656 100644 (file)
@@ -1,14 +1,14 @@
 # $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.5.2.9 2003/02/03 17:31:12 des Exp $
 
 PROG=  sshd
-SRCS=  sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
+SRCS=  sshd.c auth-rhosts.c auth-passwd.c \
        audit.c audit-bsm.c platform.c \
        sshpty.c sshlogin.c servconf.c serverloop.c \
-       auth.c auth1.c auth2.c auth-options.c session.c \
-       auth-chall.c auth2-chall.c groupaccess.c \
+       auth.c auth2.c auth-options.c session.c \
+       auth2-chall.c groupaccess.c \
        auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
        auth2-none.c auth2-passwd.c auth2-pubkey.c \
-       monitor_mm.c monitor.c monitor_wrap.c auth-krb5.c \
+       monitor.c monitor_wrap.c auth-krb5.c \
        auth2-gss.c gss-serv.c gss-serv-krb5.c \
        loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
        sftp-server.c sftp-common.c \
@@ -17,7 +17,7 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 WARNS?=        3
 
 # Portability layer
-SRCS+= fmt_scaled.c xmmap.c
+SRCS+= fmt_scaled.c
 MAN=   sshd.8 sshd_config.5
 
 # Passwd routine