X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/0f00dc4c8eb47e67bc0f148c2dd109f73a451e0a..2618bd209e634178082d699979540eb29490ce72:/symm/ofb-def.h

diff --git a/symm/ofb-def.h b/symm/ofb-def.h
index 6b1357d0..358ee54c 100644
--- a/symm/ofb-def.h
+++ b/symm/ofb-def.h
@@ -410,7 +410,7 @@ static const grand_ops grops = {					\
   #pre "-ofb",								\
   GRAND_CRYPTO, 0,							\
   grmisc, grdestroy,							\
-  grword, grbyte, grword, grand_range, grfill				\
+  grword, grbyte, grword, grand_defaultrange, grfill			\
 };									\
 									\
 /* --- @pre_ofbrand@ --- *						\
@@ -465,12 +465,12 @@ static const octet iv[] = IV;						\
 static octet ct[sizeof(text)];						\
 static octet pt[sizeof(text)];						\
 									\
-static void hexdump(const octet *p, size_t sz)				\
+static void hexdump(const octet *p, size_t sz, size_t off)		\
 {									\
   const octet *q = p + sz;						\
   for (sz = 0; p < q; p++, sz++) {					\
     printf("%02x", *p);							\
-    if ((sz + 1) % PRE##_BLKSZ == 0)					\
+    if ((off + sz + 1) % PRE##_BLKSZ == 0)				\
       putchar(':');							\
   }									\
 }									\
@@ -511,14 +511,14 @@ int main(void)								\
     } else {								\
       printf("\nError (sz = %lu)\n", (unsigned long)sz);		\
       status = 1;							\
-      printf("\tplaintext      = "); hexdump(text, sz);			\
-	printf(", "); hexdump(text + sz, rest);				\
+      printf("\tplaintext      = "); hexdump(text, sz, 0);		\
+	printf(", "); hexdump(text + sz, rest, sz);			\
 	fputc('\n', stdout);						\
-      printf("\tciphertext     = "); hexdump(ct, sz);			\
-	printf(", "); hexdump(ct + sz, rest);				\
+      printf("\tciphertext     = "); hexdump(ct, sz, 0);		\
+	printf(", "); hexdump(ct + sz, rest, sz);			\
 	fputc('\n', stdout);						\
-      printf("\trecovered text = "); hexdump(pt, sz);			\
-	printf(", "); hexdump(pt + sz, rest);				\
+      printf("\trecovered text = "); hexdump(pt, sz, 0);		\
+	printf(", "); hexdump(pt + sz, rest, sz);			\
 	fputc('\n', stdout);						\
       fputc('\n', stdout);						\
     }									\