This makes space for other bulk-crypto objects in this file. Also,
sneakily, rename the code section with the idea that there might be
another one later.
/*----- Static variables --------------------------------------------------*/
/*----- Static variables --------------------------------------------------*/
static uint32 oseq;
static seqwin iseq;
static uint32 oseq;
static seqwin iseq;
-/*----- Main code ---------------------------------------------------------*/
+/*----- Challenges --------------------------------------------------------*/
/* --- @c_genkey@ --- *
*
/* --- @c_genkey@ --- *
*
static void c_genkey(void)
{
static void c_genkey(void)
{
- if (bulk && bulk->ops == master->algs.bulk->ops && oseq < 0x07ffffff)
+ if (bchal && bchal->ops == master->algs.bulk->ops && oseq < 0x07ffffff)
- if (bulk) bulk->ops->freechal(bulk);
- bulk = master->algs.bulk->ops->genchal(master->algs.bulk);
- bulk->ops = master->algs.bulk->ops;
+ if (bchal) bchal->ops->freechal(bchal);
+ bchal = master->algs.bulk->ops->genchal(master->algs.bulk);
+ bchal->ops = master->algs.bulk->ops;
oseq = 0;
seq_reset(&iseq);
}
oseq = 0;
seq_reset(&iseq);
}
- if (buf_putu32(b, oseq++) || !buf_get(b, bulk->tagsz)) return (-1);
- if (bulk->ops->chaltag(bulk, p, 4, p + 4)) return (-1);
+ if (buf_putu32(b, oseq++) || !buf_get(b, bchal->tagsz)) return (-1);
+ if (bchal->ops->chaltag(bchal, p, 4, p + 4)) return (-1);
IF_TRACING(T_CHAL, {
trace(T_CHAL, "chal: issuing challenge %lu", (unsigned long)(oseq - 1));
trace_block(T_CRYPTO, "chal: challenge block", p, BCUR(b) - p);
IF_TRACING(T_CHAL, {
trace(T_CHAL, "chal: issuing challenge %lu", (unsigned long)(oseq - 1));
trace_block(T_CRYPTO, "chal: challenge block", p, BCUR(b) - p);
a_warn("CHAL", "impossible-challenge", A_END);
goto fail;
}
a_warn("CHAL", "impossible-challenge", A_END);
goto fail;
}
if ((p = buf_get(b, sz)) == 0) {
a_warn("CHAL", "invalid-challenge", A_END);
goto fail;
}
IF_TRACING(T_CHAL, trace_block(T_CRYPTO, "chal: check challenge", p, sz); )
if ((p = buf_get(b, sz)) == 0) {
a_warn("CHAL", "invalid-challenge", A_END);
goto fail;
}
IF_TRACING(T_CHAL, trace_block(T_CRYPTO, "chal: check challenge", p, sz); )
- if (bulk->ops->chalvrf(bulk, p, 4, p + 4)) {
+ if (bchal->ops->chalvrf(bchal, p, 4, p + 4)) {
a_warn("CHAL", "incorrect-tag", A_END);
goto fail;
}
a_warn("CHAL", "incorrect-tag", A_END);
goto fail;
}