chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Use new separate auto-version tool.
[tripe]
/
server
/
keyexch.c
diff --git
a/server/keyexch.c
b/server/keyexch.c
index e70527294b2eb0f0fad01b46ac87965869d56e96..6490dd7358adc118dc055ec62fffc7976f68cd0c 100644
(file)
--- a/
server/keyexch.c
+++ b/
server/keyexch.c
@@
-77,7
+77,7
@@
/*----- Tunable parameters ------------------------------------------------*/
/*----- Tunable parameters ------------------------------------------------*/
-#define T_VALID
MIN(2)
/* Challenge validity period */
+#define T_VALID
SEC(20)
/* Challenge validity period */
#define T_RETRY SEC(10) /* Challenge retransmit interval */
#define VALIDP(kx, now) ((now) < (kx)->t_valid)
#define T_RETRY SEC(10) /* Challenge retransmit interval */
#define VALIDP(kx, now) ((now) < (kx)->t_valid)
@@
-85,8
+85,7
@@
/*----- Static tables -----------------------------------------------------*/
static const char *const pkname[] = {
/*----- Static tables -----------------------------------------------------*/
static const char *const pkname[] = {
- "pre-challenge", "cookie", "challenge",
- "reply", "switch-rq", "switch-ok"
+ "pre-challenge", "challenge", "reply", "switch-rq", "switch-ok"
};
/*----- Various utilities -------------------------------------------------*/
};
/*----- Various utilities -------------------------------------------------*/
@@
-604,7
+603,7
@@
static kxchal *respond(keyexch *kx, unsigned msg, buf *b)
h = GH_INIT(algs.h);
HASH_STRING(h, "tripe-check-hash");
GH_HASH(h, ck, indexsz);
h = GH_INIT(algs.h);
HASH_STRING(h, "tripe-check-hash");
GH_HASH(h, ck, indexsz);
- GH_DONE(h, kxc->
hc
);
+ GH_DONE(h, kxc->
ck
);
GH_DESTROY(h);
h = GH_INIT(algs.h);
GH_DESTROY(h);
h = GH_INIT(algs.h);