summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rwxr-xr-xregress/modpipe.c4
-rw-r--r--regress/rekey.sh2
3 files changed, 3 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f6412fb3..2864e1623 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
2 - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5) 2 - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)
3 that got lost in recent merge. 3 that got lost in recent merge.
4 - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff 4 - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff
5 - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these
5 6
620131104 720131104
7 - (djm) OpenBSD CVS Sync 8 - (djm) OpenBSD CVS Sync
diff --git a/regress/modpipe.c b/regress/modpipe.c
index 183a58695..85747cf7d 100755
--- a/regress/modpipe.c
+++ b/regress/modpipe.c
@@ -68,7 +68,7 @@ usage(void)
68#define MAX_MODIFICATIONS 256 68#define MAX_MODIFICATIONS 256
69struct modification { 69struct modification {
70 enum { MOD_XOR, MOD_AND_OR } what; 70 enum { MOD_XOR, MOD_AND_OR } what;
71 unsigned long long offset; 71 u_int64_t offset;
72 u_int8_t m1, m2; 72 u_int8_t m1, m2;
73}; 73};
74 74
@@ -79,7 +79,7 @@ parse_modification(const char *s, struct modification *m)
79 int n, m1, m2; 79 int n, m1, m2;
80 80
81 bzero(m, sizeof(*m)); 81 bzero(m, sizeof(*m));
82 if ((n = sscanf(s, "%16[^:]%*[:]%llu%*[:]%i%*[:]%i", 82 if ((n = sscanf(s, "%16[^:]%*[:]%lli%*[:]%i%*[:]%i",
83 what, &m->offset, &m1, &m2)) < 3) 83 what, &m->offset, &m1, &m2)) < 3)
84 errx(1, "Invalid modification spec \"%s\"", s); 84 errx(1, "Invalid modification spec \"%s\"", s);
85 if (strcasecmp(what, "xor") == 0) { 85 if (strcasecmp(what, "xor") == 0) {
diff --git a/regress/rekey.sh b/regress/rekey.sh
index cf3dce99f..8eb7efaf9 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,8 +1,6 @@
1# $OpenBSD: rekey.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $ 1# $OpenBSD: rekey.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4set -x
5
6tid="rekey" 4tid="rekey"
7 5
8LOG=${TEST_SSH_LOGFILE} 6LOG=${TEST_SSH_LOGFILE}