From: Niels Möller Date: Thu, 18 Apr 2013 09:04:55 +0000 (+0200) Subject: Rename UMAC_BLOCK_SIZE to UMAC_DATA_SIZE. X-Git-Tag: nettle_2.7_release_20130424~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba517ac5cb5ed79fc17ab579a8e29ee1bb1f3854;p=thirdparty%2Fnettle.git Rename UMAC_BLOCK_SIZE to UMAC_DATA_SIZE. --- diff --git a/ChangeLog b/ChangeLog index f9165a01..aa7ba67a 100644 --- 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 diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c index 5d38aa15..6a8aa6e2 100644 --- 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 1b9e5e9b..03057a46 100644 --- 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 37ac96a2..4fbd8e12 100644 --- 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 a5b5b690..95c90e5f 100644 --- 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 c50dfc6b..fd8a2819 100644 --- 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 e740e91c..3e05779a 100644 --- 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 72c38311..1c1840c9 100644 --- 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)