- (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff

2 files changed, 4 insertions, 2 deletions

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}