key/key-io.c: Add low-level `key_mergeline' and `key_extractline' functions.

[catacomb] / symm / counter.h

diff --git a/symm/counter.h b/symm/counter.h
index 7e07b3c..418f148 100644 (file)
--- a/symm/counter.h
+++ b/symm/counter.h
@@ -62,8 +62,8 @@
 typedef struct pre##_counterctx {                                      \
   pre##_ctx ctx;                       /* Underlying cipher context */ \
   unsigned off;                                /* Current offset in buffer */  \
-  octet buf[PRE##_BLKSZ];              /* Output buffer */             \
-  uint32 n[PRE##_BLKSZ / 4];           /* Counter */                   \
+  octet b[PRE##_BLKSZ];                        /* Output buffer */             \
+  uint32 c[PRE##_BLKSZ / 4];           /* Counter */                   \
 } pre##_counterctx;                                                    \
                                                                        \
 /* --- @pre_countergetiv@ --- *                                                \