From 81b5286618b780d3c971ef151114ceaedd895773 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 28 Oct 2018 18:09:43 +0000
Subject: [PATCH] symm/*-def.h: Fix layout bogosities.

---
 symm/cbc-def.h | 12 ++++++------
 symm/cfb-def.h | 12 ++++++------
 symm/ecb-def.h |  8 ++++----
 symm/ofb-def.h |  6 +++---
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/symm/cbc-def.h b/symm/cbc-def.h
index 3eab8036..3a5c9a2b 100644
--- a/symm/cbc-def.h
+++ b/symm/cbc-def.h
@@ -131,8 +131,8 @@ void pre##_cbcsetkey(pre##_cbcctx *ctx, const pre##_ctx *k)		\
  */									\
 									\
 void pre##_cbcinit(pre##_cbcctx *ctx,					\
-		     const void *key, size_t sz,			\
-		     const void *iv)					\
+		   const void *key, size_t sz,				\
+		   const void *iv)					\
 {									\
   static const octet zero[PRE##_BLKSZ] = { 0 };				\
   pre##_init(&ctx->ctx, key, sz);					\
@@ -155,8 +155,8 @@ void pre##_cbcinit(pre##_cbcctx *ctx,					\
  */									\
 									\
 void pre##_cbcencrypt(pre##_cbcctx *ctx,				\
-			const void *src, void *dest,			\
-			size_t sz)					\
+		      const void *src, void *dest,			\
+		      size_t sz)					\
 {									\
   const octet *s = src;							\
   octet *d = dest;							\
@@ -274,8 +274,8 @@ void pre##_cbcencrypt(pre##_cbcctx *ctx,				\
  */									\
 									\
 void pre##_cbcdecrypt(pre##_cbcctx *ctx,				\
-			const void *src, void *dest,			\
-			size_t sz)					\
+		      const void *src, void *dest,			\
+		      size_t sz)					\
 {									\
   const octet *s = src;							\
   octet *d = dest;							\
diff --git a/symm/cfb-def.h b/symm/cfb-def.h
index a76332d2..5432467c 100644
--- a/symm/cfb-def.h
+++ b/symm/cfb-def.h
@@ -163,8 +163,8 @@ void pre##_cfbsetkey(pre##_cfbctx *ctx, const pre##_ctx *k)		\
  */									\
 									\
 void pre##_cfbinit(pre##_cfbctx *ctx,					\
-		     const void *key, size_t sz,			\
-		     const void *iv)					\
+		   const void *key, size_t sz,				\
+		   const void *iv)					\
 {									\
   static const octet zero[PRE##_BLKSZ] = { 0 };				\
   pre##_init(&ctx->ctx, key, sz);					\
@@ -186,8 +186,8 @@ void pre##_cfbinit(pre##_cfbctx *ctx,					\
  */									\
 									\
 void pre##_cfbencrypt(pre##_cfbctx *ctx,				\
-			const void *src, void *dest,			\
-			size_t sz)					\
+		      const void *src, void *dest,			\
+		      size_t sz)					\
 {									\
   const octet *s = src;							\
   octet *d = dest;							\
@@ -271,8 +271,8 @@ void pre##_cfbencrypt(pre##_cfbctx *ctx,				\
  */									\
 									\
 void pre##_cfbdecrypt(pre##_cfbctx *ctx,				\
-			const void *src, void *dest,			\
-			size_t sz)					\
+		      const void *src, void *dest,			\
+		      size_t sz)					\
 {									\
   const octet *s = src;							\
   octet *d = dest;							\
diff --git a/symm/ecb-def.h b/symm/ecb-def.h
index 026343cc..62ce5236 100644
--- a/symm/ecb-def.h
+++ b/symm/ecb-def.h
@@ -98,8 +98,8 @@ void pre##_ecbsetkey(pre##_ecbctx *ctx, const pre##_ctx *k)		\
  */									\
 									\
 void pre##_ecbinit(pre##_ecbctx *ctx,					\
-		     const void *key, size_t sz,			\
-		     const void *iv)					\
+		   const void *key, size_t sz,				\
+		   const void *iv)					\
 {									\
   pre##_init(&ctx->ctx, key, sz);					\
 }									\
@@ -120,8 +120,8 @@ void pre##_ecbinit(pre##_ecbctx *ctx,					\
  */									\
 									\
 void pre##_ecbencrypt(pre##_ecbctx *ctx,				\
-			const void *src, void *dest,			\
-			size_t sz)					\
+		      const void *src, void *dest,			\
+		      size_t sz)					\
 {									\
   const octet *s = src;							\
   octet *d = dest;							\
diff --git a/symm/ofb-def.h b/symm/ofb-def.h
index 87e750ce..2aafacbe 100644
--- a/symm/ofb-def.h
+++ b/symm/ofb-def.h
@@ -184,8 +184,8 @@ void pre##_ofbinit(pre##_ofbctx *ctx,					\
  */									\
 									\
 void pre##_ofbencrypt(pre##_ofbctx *ctx,				\
-			const void *src, void *dest,			\
-			size_t sz)					\
+		      const void *src, void *dest,			\
+		      size_t sz)					\
 {									\
   const octet *s = src;							\
   octet *d = dest;							\
@@ -451,7 +451,7 @@ OFB_TESTX(PRE, pre, name, name)
  * Use:		Standard test rig for OFB functions.
  */
 
-#define OFB_TESTX(PRE, pre, name, fname)					\
+#define OFB_TESTX(PRE, pre, name, fname)				\
 									\
 static pre##_ctx key;							\
 static pre##_ofbctx ctx;						\
-- 
2.11.0