diff options
author | Damien Miller <djm@mindrot.org> | 2013-11-07 12:00:23 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-11-07 12:00:23 +1100 |
commit | c98319750b0bbdd0d1794420ec97d65dd9244613 (patch) | |
tree | ccd3dc10e5b285bc77cdf2e35ee04dc699335594 /regress | |
parent | 61c5c2319e84a58210810d39b062c8b8e3321160 (diff) |
- (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff
Diffstat (limited to 'regress')
-rwxr-xr-x | regress/modpipe.c | 4 | ||||
-rw-r--r-- | regress/rekey.sh | 2 |
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) | |||
68 | #define MAX_MODIFICATIONS 256 | 68 | #define MAX_MODIFICATIONS 256 |
69 | struct modification { | 69 | struct 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) { |
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 @@ | |||
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 | ||
4 | set -x | ||
5 | |||
4 | tid="rekey" | 6 | tid="rekey" |
5 | 7 | ||
6 | LOG=${TEST_SSH_LOGFILE} | 8 | LOG=${TEST_SSH_LOGFILE} |