chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce transform_apply_return_badseq
[secnet.git]
/
site.c
diff --git
a/site.c
b/site.c
index bc902ad92397c3fcf94a3bdab1e7ff0ff559a78d..acbc2b62c99b9ed43e48b43a3d473becfdd404c3 100644
(file)
--- a/
site.c
+++ b/
site.c
@@
-1093,8
+1093,8
@@
decrypt_msg0(struct site *st, struct buffer_if *msg0,
"peer has used new key","auxiliary key",LOG_SEC);
return 0;
}
"peer has used new key","auxiliary key",LOG_SEC);
return 0;
}
- if (
problem==transform_apply_seqrange
)
- goto
skew
;
+ if (
transform_apply_return_badseq(problem)
)
+ goto
badseq
;
buffer_copy(msg0, &st->scratch);
problem = call_transform_reverse(st,st->auxiliary_key.transform,
buffer_copy(msg0, &st->scratch);
problem = call_transform_reverse(st,st->auxiliary_key.transform,
@@
-1118,8
+1118,8
@@
decrypt_msg0(struct site *st, struct buffer_if *msg0,
}
return 0;
}
}
return 0;
}
- if (
problem==transform_apply_seqrange
)
- goto
skew
;
+ if (
transform_apply_return_badseq(problem)
)
+ goto
badseq
;
if (st->state==SITE_SENTMSG5) {
buffer_copy(msg0, &st->scratch);
if (st->state==SITE_SENTMSG5) {
buffer_copy(msg0, &st->scratch);
@@
-1134,8
+1134,8
@@
decrypt_msg0(struct site *st, struct buffer_if *msg0,
activate_new_key(st);
return 0; /* do process the data in this packet */
}
activate_new_key(st);
return 0; /* do process the data in this packet */
}
- if (
problem==transform_apply_seqrange
)
- goto
skew
;
+ if (
transform_apply_return_badseq(problem)
)
+ goto
badseq
;
}
slog(st,LOG_SEC,"transform: %s (aux: %s, new: %s)",
}
slog(st,LOG_SEC,"transform: %s (aux: %s, new: %s)",
@@
-1145,8
+1145,8
@@
decrypt_msg0(struct site *st, struct buffer_if *msg0,
assert(problem);
return problem;
assert(problem);
return problem;
-
skew
:
- slog(st,LOG_DROP,"transform: %s (
merely skew
)",transform_err);
+
badseq
:
+ slog(st,LOG_DROP,"transform: %s (
bad seq.
)",transform_err);
assert(problem);
return problem;
}
assert(problem);
return problem;
}