5 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 44c47527c..0f6412fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20131107
  - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)
    that got lost in recent merge.
+ - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff
 
 20131104
  - (djm) OpenBSD CVS Sync
diff --git a/Makefile.in b/Makefile.in
index 797aa3e0c..58ea78a72 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.341 2013/11/03 21:26:53 djm Exp $
+# $Id: Makefile.in,v 1.342 2013/11/07 01:00:24 djm Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -73,7 +73,8 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.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 \
-        jpake.o schnorr.o ssh-pkcs11.o krl.o smult_curve25519_ref.o
+        jpake.o schnorr.o ssh-pkcs11.o krl.o smult_curve25519_ref.o \
+        kexc25519.o kexc25519c.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
         sshconnect.o sshconnect1.o sshconnect2.o mux.o \
@@ -87,7 +88,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
         auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
         auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \
         monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \
-        auth-krb5.o \
+        kexc25519s.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 \
diff --git a/monitor.c b/monitor.c
index 44dff98c9..328a605d9 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1855,6 +1855,7 @@ mm_get_kex(Buffer *m)
         kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
         kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
         kex->kex[KEX_ECDH_SHA2] = kexecdh_server;
+        kex->kex[KEX_C25519_SHA256] = kexc25519_server;
         kex->server = 1;
         kex->hostkey_type = buffer_get_int(m);
         kex->kex_type = buffer_get_int(m);
diff --git a/regress/modpipe.c b/regress/modpipe.c
index 85747cf7d..183a58695 100755
--- a/regress/modpipe.c
+++ b/regress/modpipe.c
@@ -68,7 +68,7 @@ usage(void)
 #define MAX_MODIFICATIONS 256
 struct modification {
         enum { MOD_XOR, MOD_AND_OR } what;
-        u_int64_t offset;
+        unsigned long long offset;
         u_int8_t m1, m2;
 };
 
@@ -79,7 +79,7 @@ parse_modification(const char *s, struct modification *m)
         int n, m1, m2;
 
         bzero(m, sizeof(*m));
-        if ((n = sscanf(s, "%16[^:]%*[:]%lli%*[:]%i%*[:]%i",
+        if ((n = sscanf(s, "%16[^:]%*[:]%llu%*[:]%i%*[:]%i",
             what, &m->offset, &m1, &m2)) < 3)
                 errx(1, "Invalid modification spec \"%s\"", s);
         if (strcasecmp(what, "xor") == 0) {
diff --git a/regress/rekey.sh b/regress/rekey.sh
index 8eb7efaf9..cf3dce99f 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,6 +1,8 @@
 #       $OpenBSD: rekey.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $
 #       Placed in the Public Domain.
 
+set -x
+
 tid="rekey"
 
 LOG=${TEST_SSH_LOGFILE}