- (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these
diff --git a/ChangeLog b/ChangeLog
index 0f6412f..2864e16 100644
--- 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 183a586..85747cf 100755
--- a/regress/modpipe.c
+++ b/regress/modpipe.c
@@ -68,7 +68,7 @@
#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 @@
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 cf3dce9..8eb7efa 100644
--- 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}