- (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these

diff --git a/ChangeLog b/ChangeLog
index 0f6412fb3508ebd42def07d3e4e318ba48646aa9..2864e1623a27a98d267693bf45e036b13a079ce1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
  - (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
+ - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these
 
 20131104
  - (djm) OpenBSD CVS Sync

diff --git a/regress/modpipe.c b/regress/modpipe.c
index 183a58695ca355bb3d14317ebf6d8f558beced5b..85747cf7d29e853d38eb79d7938deed03699a1c3 100755 (executable)
--- 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;
-       unsigned long long offset;
+       u_int64_t 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[^:]%*[:]%llu%*[:]%i%*[:]%i",
+       if ((n = sscanf(s, "%16[^:]%*[:]%lli%*[:]%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 cf3dce99f82e42146b5caadb8bbb5aa47ac0ee6b..8eb7efaf9e4cf2e587521acd8aa93cab9883d224 100644 (file)
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,8 +1,6 @@
 #      $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}