X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/53a941d3f97a50964587c6e9533b1e43e74a57a8..7f81b1b4496591f4e23da1051c0c15229e8cb1db:/server/chal.c

diff --git a/server/chal.c b/server/chal.c
index 3824bb63..12b64e21 100644
--- a/server/chal.c
+++ b/server/chal.c
@@ -47,16 +47,16 @@ static seqwin iseq;
 
 static void c_genkey(void)
 {
-  if (mac && GM_CLASS(mac) == algs.m && oseq < 0x07ffffff) return;
+  if (mac && GM_CLASS(mac) == master->algs.m && oseq < 0x07ffffff) return;
   if (mac) GM_DESTROY(mac);
-  assert(algs.mksz < sizeof(buf_t));
-  rand_get(RAND_GLOBAL, buf_t, algs.mksz);
-  mac = GM_KEY(algs.m, buf_t, algs.mksz);
+  assert(master->algs.mksz < sizeof(buf_t));
+  rand_get(RAND_GLOBAL, buf_t, master->algs.mksz);
+  mac = GM_KEY(master->algs.m, buf_t, master->algs.mksz);
   oseq = 0;
   seq_reset(&iseq);
   IF_TRACING(T_CHAL, {
     trace(T_CHAL, "chal: generated new challenge key");
-    trace_block(T_CRYPTO, "chal: new key", buf_t, algs.mksz);
+    trace_block(T_CRYPTO, "chal: new key", buf_t, master->algs.mksz);
   })
 }
 
@@ -79,7 +79,7 @@ int c_new(buf *b)
   if (buf_putu32(b, oseq++)) return (-1);
   h = GM_INIT(mac);
   GH_HASH(h, p, BCUR(b) - p);
-  buf_put(b, GH_DONE(h, 0), algs.tagsz);
+  buf_put(b, GH_DONE(h, 0), master->algs.tagsz);
   GH_DESTROY(h);
   if (BBAD(b)) return (-1);
   IF_TRACING(T_CHAL, {
@@ -101,7 +101,7 @@ int c_new(buf *b)
 int c_check(buf *b)
 {
   const octet *p;
-  size_t sz = 4 + algs.tagsz;
+  size_t sz = 4 + master->algs.tagsz;
   uint32 seq;
   ghash *h;
   int ok;
@@ -117,7 +117,7 @@ int c_check(buf *b)
   }
   h = GM_INIT(mac);
   GH_HASH(h, p, 4);
-  ok = (memcmp(GH_DONE(h, 0), p + 4, algs.tagsz) == 0);
+  ok = (memcmp(GH_DONE(h, 0), p + 4, master->algs.tagsz) == 0);
   GH_DESTROY(h);
   if (!ok) {
     a_warn("CHAL", "incorrect-tag", A_END);