upstream commit

add experimental api for packet layer; ok djm@

1 files changed, 9 insertions, 7 deletions

diff --git a/Makefile.in b/Makefile.in
index 13256c2af..b494ac7ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,6 +65,7 @@ MANFMT=@MANFMT@
 TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
 
 LIBOPENSSH_OBJS=\
+        ssh_api.o \
         ssherr.o \
         sshbuf.o \
         sshkey.o \
@@ -75,20 +76,22 @@ LIBOPENSSH_OBJS=\
         bitmap.o
 
 LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
-        authfd.o authfile.o bufaux.o bufbn.o buffer.o \
+        authfd.o authfile.o bufaux.o bufbn.o bufec.o buffer.o \
         canohost.o channels.o cipher.o cipher-aes.o cipher-aesctr.o \
         cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
         compat.o crc32.o deattack.o fatal.o hostfile.o \
         log.o match.o md-sha256.o moduli.o nchan.o packet.o opacket.o \
         readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
-        atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
+        atomicio.o key.o dispatch.o mac.o uidswap.o uuencode.o misc.o \
         monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
-        kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
         msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
         ssh-pkcs11.o smult_curve25519_ref.o \
-        kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \
+        poly1305.o chacha.o cipher-chachapoly.o \
         ssh-ed25519.o digest-openssl.o digest-libc.o hmac.o \
-        sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o
+        sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \
+        kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
+        kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \
+        kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
         sshconnect.o sshconnect1.o sshconnect2.o mux.o \
@@ -101,8 +104,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
         auth-chall.o auth2-chall.o groupaccess.o \
         auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
         auth2-none.o auth2-passwd.o auth2-pubkey.o \
-        monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \
-        kexc25519s.o auth-krb5.o \
+        monitor_mm.o monitor.o monitor_wrap.o auth-krb5.o \
         auth2-gss.o gss-serv.o gss-serv-krb5.o \
         loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
         sftp-server.o sftp-common.o \