Rename UMAC_BLOCK_SIZE to UMAC_DATA_SIZE.

diff --git a/ChangeLog b/ChangeLog
index f9165a01c8dbf2fa20f360082de7874a1215b157..aa7ba67a2b31a8a430251812e914bcf07f4f98ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
        * umac.h (UMAC32_DIGEST_SIZE, UMAC64_DIGEST_SIZE)
        (UMAC96_DIGEST_SIZE, UMAC128_DIGEST_SIZE): New constants.
+       (UMAC_DATA_SIZE): New name, for consistency with hash functions.
+       Updated all uses.
+       (UMAC_BLOCK_SIZE): ... old name.
 
 2013-04-17  Niels Möller  <nisse@lysator.liu.se>
 

diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c
index 5d38aa153f73ce4c8f9d15364639f7bc2469f3c2..6a8aa6e2a1fe4237a63b233f9e6bab8bb422ba48 100644 (file)
--- a/examples/nettle-benchmark.c
+++ b/examples/nettle-benchmark.c
@@ -370,7 +370,7 @@ time_umac(void)
   info.update = (nettle_hash_update_func *) umac32_update;
   info.data = data;
 
-  display("umac32", "update", UMAC_BLOCK_SIZE,
+  display("umac32", "update", UMAC_DATA_SIZE,
          time_function(bench_hash, &info));
 
   umac64_set_key (&ctx64, key);
@@ -378,7 +378,7 @@ time_umac(void)
   info.update = (nettle_hash_update_func *) umac64_update;
   info.data = data;
 
-  display("umac64", "update", UMAC_BLOCK_SIZE,
+  display("umac64", "update", UMAC_DATA_SIZE,
          time_function(bench_hash, &info));
 
   umac96_set_key (&ctx96, key);
@@ -386,7 +386,7 @@ time_umac(void)
   info.update = (nettle_hash_update_func *) umac96_update;
   info.data = data;
 
-  display("umac96", "update", UMAC_BLOCK_SIZE,
+  display("umac96", "update", UMAC_DATA_SIZE,
          time_function(bench_hash, &info));
 
   umac128_set_key (&ctx128, key);
@@ -394,7 +394,7 @@ time_umac(void)
   info.update = (nettle_hash_update_func *) umac128_update;
   info.data = data;
 
-  display("umac128", "update", UMAC_BLOCK_SIZE,
+  display("umac128", "update", UMAC_DATA_SIZE,
          time_function(bench_hash, &info));
 }
 

diff --git a/umac-set-key.c b/umac-set-key.c
index 1b9e5e9b13b8eaf556aed7869618adb3605bed40..03057a460f8d9e075fd6ad041e98723bb35a3571 100644 (file)
--- a/umac-set-key.c
+++ b/umac-set-key.c
@@ -78,7 +78,7 @@ _umac_set_key (uint32_t *l1_key, uint32_t *l2_key,
 
   aes_set_encrypt_key (aes, UMAC_KEY_SIZE, key);
 
-  size = UMAC_BLOCK_SIZE / 4 + 4*(n-1);
+  size = UMAC_DATA_SIZE / 4 + 4*(n-1);
   umac_kdf (aes, 1, size * sizeof(uint32_t), (uint8_t *) l1_key);
   BE_SWAP32_N (size, l1_key);
 

diff --git a/umac.h b/umac.h
index 37ac96a2b8dadb9fb77d94aa1b04a90757d5e594..4fbd8e12a7ca481ceb2df5d432cd460fa88a966f 100644 (file)
--- a/umac.h
+++ b/umac.h
@@ -66,11 +66,11 @@ extern "C" {
 #define UMAC64_DIGEST_SIZE 8
 #define UMAC96_DIGEST_SIZE 12
 #define UMAC128_DIGEST_SIZE 16
-#define UMAC_BLOCK_SIZE 1024
+#define UMAC_DATA_SIZE 1024
 
 /* Subkeys and state for UMAC with tag size 32*n bits. */
 #define _UMAC_STATE(n)                                 \
-  uint32_t l1_key[UMAC_BLOCK_SIZE/4 + 4*((n)-1)];      \
+  uint32_t l1_key[UMAC_DATA_SIZE/4 + 4*((n)-1)];       \
   /* Keys in 32-bit pieces, high first */              \
   uint32_t l2_key[6*(n)];                              \
   uint64_t l3_key1[8*(n)];                             \
@@ -91,7 +91,7 @@ extern "C" {
   unsigned index;                                      \
   /* Complete blocks processed */                      \
   uint64_t count;                                      \
-  uint8_t block[UMAC_BLOCK_SIZE]
+  uint8_t block[UMAC_DATA_SIZE]
   
 #define _UMAC_NONCE_CACHED 0x80
 

diff --git a/umac128.c b/umac128.c
index a5b5b69073a0f0437daef513cf1c0093f29477fe..95c90e5f3efe6781ce3e1a5e3f9a2e1bf6bf1fad 100644 (file)
--- a/umac128.c
+++ b/umac128.c
@@ -61,11 +61,11 @@ umac128_set_nonce (struct umac128_ctx *ctx,
 
 #define UMAC128_BLOCK(ctx, block) do {                                 \
     uint64_t __umac128_y[4];                                           \
-    _umac_nh_n (__umac128_y, 4, ctx->l1_key, UMAC_BLOCK_SIZE, block);  \
-    __umac128_y[0] += 8*UMAC_BLOCK_SIZE;                               \
-    __umac128_y[1] += 8*UMAC_BLOCK_SIZE;                               \
-    __umac128_y[2] += 8*UMAC_BLOCK_SIZE;                               \
-    __umac128_y[3] += 8*UMAC_BLOCK_SIZE;                               \
+    _umac_nh_n (__umac128_y, 4, ctx->l1_key, UMAC_DATA_SIZE, block);   \
+    __umac128_y[0] += 8*UMAC_DATA_SIZE;                                        \
+    __umac128_y[1] += 8*UMAC_DATA_SIZE;                                        \
+    __umac128_y[2] += 8*UMAC_DATA_SIZE;                                        \
+    __umac128_y[3] += 8*UMAC_DATA_SIZE;                                        \
     _umac_l2 (ctx->l2_key, ctx->l2_state, 4, ctx->count++, __umac128_y); \
   } while (0)
 

diff --git a/umac32.c b/umac32.c
index c50dfc6b7491cff35e314cda9e00d6209bf96e2a..fd8a28193f85bdab3e526542065ff06ce7383834 100644 (file)
--- a/umac32.c
+++ b/umac32.c
@@ -64,8 +64,8 @@ umac32_set_nonce (struct umac32_ctx *ctx,
 
 #define UMAC32_BLOCK(ctx, block) do {                                  \
     uint64_t __umac32_y                                                        \
-      = _umac_nh (ctx->l1_key, UMAC_BLOCK_SIZE, block)                 \
-      + 8*UMAC_BLOCK_SIZE ;                                            \
+      = _umac_nh (ctx->l1_key, UMAC_DATA_SIZE, block)                  \
+      + 8*UMAC_DATA_SIZE ;                                             \
     _umac_l2 (ctx->l2_key, ctx->l2_state, 1, ctx->count++, &__umac32_y); \
   } while (0)
 

diff --git a/umac64.c b/umac64.c
index e740e91c0b316e0ae22b5757c8f588a16fa1a33d..3e05779ac3c51026854701eaafa4885a944092f3 100644 (file)
--- a/umac64.c
+++ b/umac64.c
@@ -64,9 +64,9 @@ umac64_set_nonce (struct umac64_ctx *ctx,
 
 #define UMAC64_BLOCK(ctx, block) do {                                  \
     uint64_t __umac64_y[2];                                            \
-    _umac_nh_n (__umac64_y, 2, ctx->l1_key, UMAC_BLOCK_SIZE, block);   \
-    __umac64_y[0] += 8*UMAC_BLOCK_SIZE;                                        \
-    __umac64_y[1] += 8*UMAC_BLOCK_SIZE;                                        \
+    _umac_nh_n (__umac64_y, 2, ctx->l1_key, UMAC_DATA_SIZE, block);    \
+    __umac64_y[0] += 8*UMAC_DATA_SIZE;                                 \
+    __umac64_y[1] += 8*UMAC_DATA_SIZE;                                 \
     _umac_l2 (ctx->l2_key, ctx->l2_state, 2, ctx->count++, __umac64_y);        \
   } while (0)
 

diff --git a/umac96.c b/umac96.c
index 72c38311da9784d2b35a81616b42b53ead16888a..1c1840c98fac44741544497a9c0a77e7c0679511 100644 (file)
--- a/umac96.c
+++ b/umac96.c
@@ -61,10 +61,10 @@ umac96_set_nonce (struct umac96_ctx *ctx,
 
 #define UMAC96_BLOCK(ctx, block) do {                                  \
     uint64_t __umac96_y[3];                                            \
-    _umac_nh_n (__umac96_y, 3, ctx->l1_key, UMAC_BLOCK_SIZE, block);   \
-    __umac96_y[0] += 8*UMAC_BLOCK_SIZE;                                        \
-    __umac96_y[1] += 8*UMAC_BLOCK_SIZE;                                        \
-    __umac96_y[2] += 8*UMAC_BLOCK_SIZE;                                        \
+    _umac_nh_n (__umac96_y, 3, ctx->l1_key, UMAC_DATA_SIZE, block);    \
+    __umac96_y[0] += 8*UMAC_DATA_SIZE;                                 \
+    __umac96_y[1] += 8*UMAC_DATA_SIZE;                                 \
+    __umac96_y[2] += 8*UMAC_DATA_SIZE;                                 \
     _umac_l2 (ctx->l2_key, ctx->l2_state, 3, ctx->count++, __umac96_y);        \
   } while (0)