summaryrefslogtreecommitdiff
path: root/regress/modpipe.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-07 12:00:23 +1100
committerDamien Miller <djm@mindrot.org>2013-11-07 12:00:23 +1100
commitc98319750b0bbdd0d1794420ec97d65dd9244613 (patch)
treeccd3dc10e5b285bc77cdf2e35ee04dc699335594 /regress/modpipe.c
parent61c5c2319e84a58210810d39b062c8b8e3321160 (diff)
- (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff
Diffstat (limited to 'regress/modpipe.c')
-rwxr-xr-xregress/modpipe.c4
1 files changed, 2 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)
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 u_int64_t offset; 71 unsigned long long 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[^:]%*[:]%lli%*[:]%i%*[:]%i", 82 if ((n = sscanf(s, "%16[^:]%*[:]%llu%*[:]%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) {