Reindent CMAC code to GNU standard, white space changes only.

3 files changed, 128 insertions, 113 deletions

diff --git a/cmac.c b/cmac.c
index 95d45de4..eb7b2cf5 100644
--- a/cmac.c
+++ b/cmac.c
@@ -47,112 +47,124 @@
 #include "macros.h"
 
 static const uint8_t const_zero[] = {
-	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00
 };
 
 /* shift one and XOR with 0x87. */
-static inline void block_mulx(union nettle_block16 *dst,
-			      const union nettle_block16 *src)
+static inline void
+block_mulx(union nettle_block16 *dst,
+	   const union nettle_block16 *src)
 {
-	uint64_t b1 = READ_UINT64(src->b);
-	uint64_t b2 = READ_UINT64(src->b+8);
+  uint64_t b1 = READ_UINT64(src->b);
+  uint64_t b2 = READ_UINT64(src->b+8);
 
-	b1 = (b1 << 1) | (b2 >> 63);
-	b2 <<= 1;
+  b1 = (b1 << 1) | (b2 >> 63);
+  b2 <<= 1;
 
-	if (src->b[0] & 0x80)
-		b2 ^= 0x87;
+  if (src->b[0] & 0x80)
+    b2 ^= 0x87;
 
-	WRITE_UINT64(dst->b, b1);
-	WRITE_UINT64(dst->b+8, b2);
+  WRITE_UINT64(dst->b, b1);
+  WRITE_UINT64(dst->b+8, b2);
 }
 
-void cmac128_set_key(struct cmac128 *ctx, void *cipher,
-		     nettle_cipher_func *encrypt)
+void
+cmac128_set_key(struct cmac128 *ctx, void *cipher,
+		nettle_cipher_func *encrypt)
 {
-	union nettle_block16 *L = &ctx->block;
-	memset(ctx, 0, sizeof(*ctx));
+  union nettle_block16 *L = &ctx->block;
+  memset(ctx, 0, sizeof(*ctx));
 
-	/* step 1 - generate subkeys k1 and k2 */
-	encrypt(cipher, 16, L->b, const_zero);
+  /* step 1 - generate subkeys k1 and k2 */
+  encrypt(cipher, 16, L->b, const_zero);
 
-	block_mulx(&ctx->K1, L);
-	block_mulx(&ctx->K2, &ctx->K1);
+  block_mulx(&ctx->K1, L);
+  block_mulx(&ctx->K2, &ctx->K1);
 }
 
 #define MIN(x,y) ((x)<(y)?(x):(y))
 
-void cmac128_update(struct cmac128 *ctx, void *cipher,
-		    nettle_cipher_func *encrypt,
-		    size_t msg_len, const uint8_t *msg)
+void
+cmac128_update(struct cmac128 *ctx, void *cipher,
+	       nettle_cipher_func *encrypt,
+	       size_t msg_len, const uint8_t *msg)
 {
-	union nettle_block16 Y;
-	/*
-	 * check if we expand the block
-	 */
-	if (ctx->index < 16) {
-		size_t len = MIN(16 - ctx->index, msg_len);
-		memcpy(&ctx->block.b[ctx->index], msg, len);
-		msg += len;
-		msg_len -= len;
-		ctx->index += len;
-	}
-
-	if (msg_len == 0) {
-		/* if it is still the last block, we are done */
-		return;
-	}
-
-	/*
-	 * now checksum everything but the last block
-	 */
-	memxor3(Y.b, ctx->X.b, ctx->block.b, 16);
-	encrypt(cipher, 16, ctx->X.b, Y.b);
-
-	while (msg_len > 16) {
-		memxor3(Y.b, ctx->X.b, msg, 16);
-		encrypt(cipher, 16, ctx->X.b, Y.b);
-		msg += 16;
-		msg_len -= 16;
-	}
-
-	/*
-	 * copy the last block, it will be processed in
-	 * cmac128_digest().
-	 */
-	memcpy(ctx->block.b, msg, msg_len);
-	ctx->index = msg_len;
+  union nettle_block16 Y;
+  /*
+   * check if we expand the block
+   */
+  if (ctx->index < 16)
+    {
+      size_t len = MIN(16 - ctx->index, msg_len);
+      memcpy(&ctx->block.b[ctx->index], msg, len);
+      msg += len;
+      msg_len -= len;
+      ctx->index += len;
+    }
+
+  if (msg_len == 0) {
+    /* if it is still the last block, we are done */
+    return;
+  }
+
+  /*
+   * now checksum everything but the last block
+   */
+  memxor3(Y.b, ctx->X.b, ctx->block.b, 16);
+  encrypt(cipher, 16, ctx->X.b, Y.b);
+
+  while (msg_len > 16)
+    {
+      memxor3(Y.b, ctx->X.b, msg, 16);
+      encrypt(cipher, 16, ctx->X.b, Y.b);
+      msg += 16;
+      msg_len -= 16;
+    }
+
+  /*
+   * copy the last block, it will be processed in
+   * cmac128_digest().
+   */
+  memcpy(ctx->block.b, msg, msg_len);
+  ctx->index = msg_len;
 }
 
-void cmac128_digest(struct cmac128 *ctx, void *cipher,
-		    nettle_cipher_func *encrypt,
-		    unsigned length,
-		    uint8_t *dst)
+void
+cmac128_digest(struct cmac128 *ctx, void *cipher,
+	       nettle_cipher_func *encrypt,
+	       unsigned length,
+	       uint8_t *dst)
 {
-	union nettle_block16 Y;
-
-	memset(ctx->block.b+ctx->index, 0, sizeof(ctx->block.b)-ctx->index);
-
-	/* re-use ctx->block for memxor output */
-	if (ctx->index < 16) {
-		ctx->block.b[ctx->index] = 0x80;
-		memxor(ctx->block.b, ctx->K2.b, 16);
-	} else {
-		memxor(ctx->block.b, ctx->K1.b, 16);
-	}
-
-	memxor3(Y.b, ctx->block.b, ctx->X.b, 16);
-
-	assert(length <= 16);
-	if (length == 16) {
-		encrypt(cipher, 16, dst, Y.b);
-	} else {
-		encrypt(cipher, 16, ctx->block.b, Y.b);
-		memcpy(dst, ctx->block.b, length);
-	}
-
-	/* reset state for re-use */
-	memset(&ctx->X, 0, sizeof(ctx->X));
-	ctx->index = 0;
+  union nettle_block16 Y;
+
+  memset(ctx->block.b+ctx->index, 0, sizeof(ctx->block.b)-ctx->index);
+
+  /* re-use ctx->block for memxor output */
+  if (ctx->index < 16)
+    {
+      ctx->block.b[ctx->index] = 0x80;
+      memxor(ctx->block.b, ctx->K2.b, 16);
+    }
+  else
+    {
+      memxor(ctx->block.b, ctx->K1.b, 16);
+    }
+
+  memxor3(Y.b, ctx->block.b, ctx->X.b, 16);
+
+  assert(length <= 16);
+  if (length == 16)
+    {
+      encrypt(cipher, 16, dst, Y.b);
+    }
+  else
+    {
+      encrypt(cipher, 16, ctx->block.b, Y.b);
+      memcpy(dst, ctx->block.b, length);
+    }
+
+  /* reset state for re-use */
+  memset(&ctx->X, 0, sizeof(ctx->X));
+  ctx->index = 0;
 }
diff --git a/cmac.h b/cmac.h
index 2d63eb73..30b8c002 100644
--- a/cmac.h
+++ b/cmac.h
@@ -55,49 +55,53 @@ extern "C" {
 #define cmac_aes256_update nettle_cmac_aes256_update
 #define cmac_aes256_digest nettle_cmac_aes256_digest
 
-struct cmac128 {
-	union nettle_block16 K1;
-	union nettle_block16 K2;
+struct cmac128
+{
+  union nettle_block16 K1;
+  union nettle_block16 K2;
 
-	union nettle_block16 X;
+  union nettle_block16 X;
 
-	union nettle_block16 block;
-	size_t index;
+  union nettle_block16 block;
+  size_t index;
 };
 
-void cmac128_set_key(struct cmac128 *ctx, void *cipher,
-		     nettle_cipher_func *encrypt);
-void cmac128_update(struct cmac128 *ctx, void *cipher,
-		 nettle_cipher_func *encrypt,
-		 size_t msg_len, const uint8_t *msg);
-void cmac128_digest(struct cmac128 *ctx, void *cipher,
-		    nettle_cipher_func *encrypt,
-		    unsigned length,
-		    uint8_t *out);
+void
+cmac128_set_key(struct cmac128 *ctx, void *cipher,
+		nettle_cipher_func *encrypt);
+void
+cmac128_update(struct cmac128 *ctx, void *cipher,
+	       nettle_cipher_func *encrypt,
+	       size_t msg_len, const uint8_t *msg);
+void
+cmac128_digest(struct cmac128 *ctx, void *cipher,
+	       nettle_cipher_func *encrypt,
+	       unsigned length,
+	       uint8_t *out);
 
 
 #define CMAC128_CTX(type) \
   { struct cmac128 data; type cipher; }
 
 /* NOTE: Avoid using NULL, as we don't include anything defining it. */
-#define CMAC128_SET_KEY(ctx, set_key, encrypt, cmac_key)		\
+#define CMAC128_SET_KEY(ctx, set_key, encrypt, cmac_key)	\
   do {								\
     (set_key)(&(ctx)->cipher, (cmac_key));			\
     if (0) (encrypt)(&(ctx)->cipher, ~(size_t) 0,		\
 		     (uint8_t *) 0, (const uint8_t *) 0);	\
-    cmac128_set_key(&(ctx)->data, &(ctx)->cipher,			\
+    cmac128_set_key(&(ctx)->data, &(ctx)->cipher,		\
 		(nettle_cipher_func *) (encrypt));		\
   } while (0)
 
-#define CMAC128_UPDATE(ctx, encrypt, length, src)			\
-  cmac128_update(&(ctx)->data, &(ctx)->cipher, \
+#define CMAC128_UPDATE(ctx, encrypt, length, src)		\
+  cmac128_update(&(ctx)->data, &(ctx)->cipher,			\
 	      (nettle_cipher_func *)encrypt, (length), (src))
 
-#define CMAC128_DIGEST(ctx, encrypt, length, digest)			\
-  (0 ? (encrypt)(&(ctx)->cipher, ~(size_t) 0,				\
-		 (uint8_t *) 0, (const uint8_t *) 0)			\
-     : cmac128_digest(&(ctx)->data, &(ctx)->cipher,			\
-		  (nettle_cipher_func *) (encrypt),			\
+#define CMAC128_DIGEST(ctx, encrypt, length, digest)		\
+  (0 ? (encrypt)(&(ctx)->cipher, ~(size_t) 0,			\
+		 (uint8_t *) 0, (const uint8_t *) 0)		\
+     : cmac128_digest(&(ctx)->data, &(ctx)->cipher,		\
+		  (nettle_cipher_func *) (encrypt),		\
 		  (length), (digest)))
 
 struct cmac_aes128_ctx CMAC128_CTX(struct aes128_ctx);
diff --git a/testsuite/cmac-test.c b/testsuite/cmac-test.c
index 58544f2a..7208e832 100644
--- a/testsuite/cmac-test.c
+++ b/testsuite/cmac-test.c
@@ -143,4 +143,3 @@ test_main(void)
 		  SHEX("e1992190549f6ed5696a2c056c315410"));
 
 }
-