diff options
Diffstat (limited to 'drivers/staging/skein/skeinApi.c')
-rw-r--r-- | drivers/staging/skein/skeinApi.c | 102 |
1 files changed, 52 insertions, 50 deletions
diff --git a/drivers/staging/skein/skeinApi.c b/drivers/staging/skein/skeinApi.c index c4f5333e1cce..3426392888e2 100644 --- a/drivers/staging/skein/skeinApi.c +++ b/drivers/staging/skein/skeinApi.c @@ -32,17 +32,17 @@ int skein_ctx_prepare(struct skein_ctx *ctx, enum skein_size size) Skein_Assert(ctx && size, SKEIN_FAIL); memset(ctx , 0, sizeof(struct skein_ctx)); - ctx->skeinSize = size; + ctx->skein_size = size; return SKEIN_SUCCESS; } -int skein_init(struct skein_ctx *ctx, size_t hashBitLen) +int skein_init(struct skein_ctx *ctx, size_t hash_bit_len) { int ret = SKEIN_FAIL; - size_t Xlen = 0; + size_t X_len = 0; u64 *X = NULL; - u64 treeInfo = SKEIN_CFG_TREE_INFO_SEQUENTIAL; + u64 tree_info = SKEIN_CFG_TREE_INFO_SEQUENTIAL; Skein_Assert(ctx, SKEIN_FAIL); /* @@ -51,83 +51,83 @@ int skein_init(struct skein_ctx *ctx, size_t hashBitLen) * memory available. The beauty of C :-) . */ X = ctx->m.s256.X; - Xlen = ctx->skeinSize/8; + X_len = ctx->skein_size/8; /* * If size is the same and hash bit length is zero then reuse * the save chaining variables. */ - switch (ctx->skeinSize) { + switch (ctx->skein_size) { case Skein256: - ret = skein_256_init_ext(&ctx->m.s256, hashBitLen, - treeInfo, NULL, 0); + ret = skein_256_init_ext(&ctx->m.s256, hash_bit_len, + tree_info, NULL, 0); break; case Skein512: - ret = skein_512_init_ext(&ctx->m.s512, hashBitLen, - treeInfo, NULL, 0); + ret = skein_512_init_ext(&ctx->m.s512, hash_bit_len, + tree_info, NULL, 0); break; case Skein1024: - ret = skein_1024_init_ext(&ctx->m.s1024, hashBitLen, - treeInfo, NULL, 0); + ret = skein_1024_init_ext(&ctx->m.s1024, hash_bit_len, + tree_info, NULL, 0); break; } if (ret == SKEIN_SUCCESS) { /* * Save chaining variables for this combination of size and - * hashBitLen + * hash_bit_len */ - memcpy(ctx->XSave, X, Xlen); + memcpy(ctx->X_save, X, X_len); } return ret; } -int skein_mac_init(struct skein_ctx *ctx, const u8 *key, size_t keyLen, - size_t hashBitLen) +int skein_mac_init(struct skein_ctx *ctx, const u8 *key, size_t key_len, + size_t hash_bit_len) { int ret = SKEIN_FAIL; u64 *X = NULL; - size_t Xlen = 0; - u64 treeInfo = SKEIN_CFG_TREE_INFO_SEQUENTIAL; + size_t X_len = 0; + u64 tree_info = SKEIN_CFG_TREE_INFO_SEQUENTIAL; Skein_Assert(ctx, SKEIN_FAIL); X = ctx->m.s256.X; - Xlen = ctx->skeinSize/8; + X_len = ctx->skein_size/8; - Skein_Assert(hashBitLen, SKEIN_BAD_HASHLEN); + Skein_Assert(hash_bit_len, SKEIN_BAD_HASHLEN); - switch (ctx->skeinSize) { + switch (ctx->skein_size) { case Skein256: - ret = skein_256_init_ext(&ctx->m.s256, hashBitLen, - treeInfo, - (const u8 *)key, keyLen); + ret = skein_256_init_ext(&ctx->m.s256, hash_bit_len, + tree_info, + (const u8 *)key, key_len); break; case Skein512: - ret = skein_512_init_ext(&ctx->m.s512, hashBitLen, - treeInfo, - (const u8 *)key, keyLen); + ret = skein_512_init_ext(&ctx->m.s512, hash_bit_len, + tree_info, + (const u8 *)key, key_len); break; case Skein1024: - ret = skein_1024_init_ext(&ctx->m.s1024, hashBitLen, - treeInfo, - (const u8 *)key, keyLen); + ret = skein_1024_init_ext(&ctx->m.s1024, hash_bit_len, + tree_info, + (const u8 *)key, key_len); break; } if (ret == SKEIN_SUCCESS) { /* * Save chaining variables for this combination of key, - * keyLen, hashBitLen + * key_len, hash_bit_len */ - memcpy(ctx->XSave, X, Xlen); + memcpy(ctx->X_save, X, X_len); } return ret; } void skein_reset(struct skein_ctx *ctx) { - size_t Xlen = 0; + size_t X_len = 0; u64 *X = NULL; /* @@ -136,32 +136,33 @@ void skein_reset(struct skein_ctx *ctx) * memory available. The beautiy of C :-) . */ X = ctx->m.s256.X; - Xlen = ctx->skeinSize/8; + X_len = ctx->skein_size/8; /* Restore the chaing variable, reset byte counter */ - memcpy(X, ctx->XSave, Xlen); + memcpy(X, ctx->X_save, X_len); /* Setup context to process the message */ Skein_Start_New_Type(&ctx->m, MSG); } int skein_update(struct skein_ctx *ctx, const u8 *msg, - size_t msgByteCnt) + size_t msg_byte_cnt) { int ret = SKEIN_FAIL; + Skein_Assert(ctx, SKEIN_FAIL); - switch (ctx->skeinSize) { + switch (ctx->skein_size) { case Skein256: ret = skein_256_update(&ctx->m.s256, (const u8 *)msg, - msgByteCnt); + msg_byte_cnt); break; case Skein512: ret = skein_512_update(&ctx->m.s512, (const u8 *)msg, - msgByteCnt); + msg_byte_cnt); break; case Skein1024: ret = skein_1024_update(&ctx->m.s1024, (const u8 *)msg, - msgByteCnt); + msg_byte_cnt); break; } return ret; @@ -169,7 +170,7 @@ int skein_update(struct skein_ctx *ctx, const u8 *msg, } int skein_update_bits(struct skein_ctx *ctx, const u8 *msg, - size_t msgBitCnt) + size_t msg_bit_cnt) { /* * I've used the bit pad implementation from skein_test.c (see NIST CD) @@ -185,13 +186,13 @@ int skein_update_bits(struct skein_ctx *ctx, const u8 *msg, * assert an error */ Skein_Assert((ctx->m.h.T[1] & SKEIN_T1_FLAG_BIT_PAD) == 0 || - msgBitCnt == 0, SKEIN_FAIL); + msg_bit_cnt == 0, SKEIN_FAIL); /* if number of bits is a multiple of bytes - that's easy */ - if ((msgBitCnt & 0x7) == 0) - return skein_update(ctx, msg, msgBitCnt >> 3); + if ((msg_bit_cnt & 0x7) == 0) + return skein_update(ctx, msg, msg_bit_cnt >> 3); - skein_update(ctx, msg, (msgBitCnt >> 3) + 1); + skein_update(ctx, msg, (msg_bit_cnt >> 3) + 1); /* * The next line rely on the fact that the real Skein contexts @@ -199,18 +200,18 @@ int skein_update_bits(struct skein_ctx *ctx, const u8 *msg, * Skein's real partial block buffer. * If this layout ever changes we have to adapt this as well. */ - up = (u8 *)ctx->m.s256.X + ctx->skeinSize / 8; + up = (u8 *)ctx->m.s256.X + ctx->skein_size / 8; /* set tweak flag for the skein_final call */ Skein_Set_Bit_Pad_Flag(ctx->m.h); /* now "pad" the final partial byte the way NIST likes */ - /* get the bCnt value (same location for all block sizes) */ - length = ctx->m.h.bCnt; + /* get the b_cnt value (same location for all block sizes) */ + length = ctx->m.h.b_cnt; /* internal sanity check: there IS a partial byte in the buffer! */ Skein_assert(length != 0); /* partial byte bit mask */ - mask = (u8) (1u << (7 - (msgBitCnt & 7))); + mask = (u8) (1u << (7 - (msg_bit_cnt & 7))); /* apply bit padding on final byte (in the buffer) */ up[length-1] = (u8)((up[length-1] & (0-mask))|mask); @@ -220,9 +221,10 @@ int skein_update_bits(struct skein_ctx *ctx, const u8 *msg, int skein_final(struct skein_ctx *ctx, u8 *hash) { int ret = SKEIN_FAIL; + Skein_Assert(ctx, SKEIN_FAIL); - switch (ctx->skeinSize) { + switch (ctx->skein_size) { case Skein256: ret = skein_256_final(&ctx->m.s256, (u8 *)hash); break; |