Hashing macros for strings and integers.

diff --git a/catcrypt.c b/catcrypt.c
index 4e54712..967730a 100644 (file)
--- a/catcrypt.c
+++ b/catcrypt.c
@@ -276,8 +276,7 @@ static int encrypt(int argc, char *argv[])
   seq = 0;
   for (;;) {
     h = GM_INIT(m);
-    STORE32(bb, seq);
-    GH_HASH(h, bb, 4);
+    GH_HASHU32(h, seq);
     seq++;
     if (GC_CLASS(c)->blksz) {
       GC_ENCRYPT(cx, 0, bb, GC_CLASS(c)->blksz);
@@ -487,8 +486,7 @@ static int decrypt(int argc, char *argv[])
       GC_SETIV(c, d.buf);
     }
     h = GM_INIT(m);
-    STORE32(d.buf, seq);
-    GH_HASH(h, d.buf, 4);
+    GH_HASHU32(h, seq);
     seq++;
     chunk_read(e, &d, &b);
     if ((tag = buf_get(&b, GM_CLASS(m)->hashsz)) == 0) {

diff --git a/ghash.h b/ghash.h
index 3b83a19..d3a039b 100644 (file)
--- a/ghash.h
+++ b/ghash.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: ghash.h,v 1.7 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Generic hash function interface
  *
@@ -61,6 +61,57 @@ typedef struct ghash_ops {
 #define GH_DESTROY(h)          (h)->ops->destroy((h))
 #define GH_COPY(h)             (h)->ops->copy((h))
 
+#define GH_HASHU_(h, n, w)  do {                                       \
+  unsigned long n_ = (n); octet b_[SZ_##w];                            \
+  STORE##w(b_, n_); GH_HASH((h), b_, SZ_##w);                          \
+} while (0)
+#define GH_HASHU8(h, n)         GH_HASHU_((h), (n), 8)
+#define GH_HASHU16(h, n) GH_HASHU_((h), (n), 16)
+#define GH_HASHU16_B(h, n) GH_HASHU_((h), (n), 16_B)
+#define GH_HASHU16_L(h, n) GH_HASHU_((h), (n), 16_L)
+#define GH_HASHU24(h, n) GH_HASHU_((h), (n), 24)
+#define GH_HASHU24_B(h, n) GH_HASHU_((h), (n), 24_B)
+#define GH_HASHU24_L(h, n) GH_HASHU_((h), (n), 24_L)
+#define GH_HASHU32(h, n) GH_HASHU_((h), (n), 32)
+#define GH_HASHU32_B(h, n) GH_HASHU_((h), (n), 32_B)
+#define GH_HASHU32_L(h, n) GH_HASHU_((h), (n), 32_L)
+
+#define GH_HASHBUF_(h, p, sz, w) do {                                  \
+  size_t sz_ = (sz); assert(sz_ <= MASK##w);                           \
+  GH_HASHU_(h, sz_, w); GH_HASH(h, (p), sz_);                          \
+} while (0)
+#define GH_HASHBUF8(h, p, sz) GH_HASHBUF_((h), (p), (sz), 8)
+#define GH_HASHBUF16(h, p, sz) GH_HASHBUF_((h), (p), (sz), 16)
+#define GH_HASHBUF16_L(h, p, sz) GH_HASHBUF_((h), (p), (sz), 16_L)
+#define GH_HASHBUF16_B(h, p, sz) GH_HASHBUF_((h), (p), (sz), 16_B)
+#define GH_HASHBUF24(h, p, sz) GH_HASHBUF_((h), (p), (sz), 24)
+#define GH_HASHBUF24_L(h, p, sz) GH_HASHBUF_((h), (p), (sz), 24_L)
+#define GH_HASHBUF24_B(h, p, sz) GH_HASHBUF_((h), (p), (sz), 24_B)
+#define GH_HASHBUF32(h, p, sz) GH_HASHBUF_((h), (p), (sz), 32)
+#define GH_HASHBUF32_L(h, p, sz) GH_HASHBUF_((h), (p), (sz), 32_L)
+#define GH_HASHBUF32_B(h, p, sz) GH_HASHBUF_((h), (p), (sz), 32_B)
+
+#define GH_HASHSTR_(h, p, w) do {                                      \
+  const char *p_ = (p); GH_HASHBUF_((h), p_, strlen(p_), w);           \
+} while (0)
+#define GH_HASHSTR8(h, p) GH_HASHSTR_((h), (p), 8)
+#define GH_HASHSTR16(h, p) GH_HASHSTR_((h), (p), 16)
+#define GH_HASHSTR16_L(h, p) GH_HASHSTR_((h), (p), 16_L)
+#define GH_HASHSTR16_B(h, p) GH_HASHSTR_((h), (p), 16_B)
+#define GH_HASHSTR24(h, p) GH_HASHSTR_((h), (p), 24)
+#define GH_HASHSTR24_L(h, p) GH_HASHSTR_((h), (p), 24_L)
+#define GH_HASHSTR24_B(h, p) GH_HASHSTR_((h), (p), 24_B)
+#define GH_HASHSTR32(h, p) GH_HASHSTR_((h), (p), 32)
+#define GH_HASHSTR32_L(h, p) GH_HASHSTR_((h), (p), 32_L)
+#define GH_HASHSTR32_B(h, p) GH_HASHSTR_((h), (p), 32_B)
+
+#define GH_HASHSTRZ(h, p) do {                                         \
+  const char *p_ = (p); GH_HASH((h), p_, strlen(p_) + 1);              \
+} while (0)
+#define GH_HASHSTR(h, p) do {                                          \
+  const char *p_ = (p); GH_HASH((h), p_, strlen(p_));                  \
+} while (0)
+
 typedef struct gchash {
   const char *name;                    /* Name of the hash function */
   size_t hashsz;                       /* Size of output hash */