Commit d063d632 authored by David Sterba's avatar David Sterba Committed by Herbert Xu

crypto: blake2b - delete unused structs or members

All the code for param block has been inlined, last_node and outlen from
the state are not used or have become redundant due to other code.
Remove it.
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e87e484d
...@@ -32,10 +32,7 @@ ...@@ -32,10 +32,7 @@
enum blake2b_constant { enum blake2b_constant {
BLAKE2B_BLOCKBYTES = 128, BLAKE2B_BLOCKBYTES = 128,
BLAKE2B_OUTBYTES = 64,
BLAKE2B_KEYBYTES = 64, BLAKE2B_KEYBYTES = 64,
BLAKE2B_SALTBYTES = 16,
BLAKE2B_PERSONALBYTES = 16
}; };
struct blake2b_state { struct blake2b_state {
...@@ -44,25 +41,8 @@ struct blake2b_state { ...@@ -44,25 +41,8 @@ struct blake2b_state {
u64 f[2]; u64 f[2];
u8 buf[BLAKE2B_BLOCKBYTES]; u8 buf[BLAKE2B_BLOCKBYTES];
size_t buflen; size_t buflen;
size_t outlen;
u8 last_node;
}; };
struct blake2b_param {
u8 digest_length; /* 1 */
u8 key_length; /* 2 */
u8 fanout; /* 3 */
u8 depth; /* 4 */
__le32 leaf_length; /* 8 */
__le32 node_offset; /* 12 */
__le32 xof_length; /* 16 */
u8 node_depth; /* 17 */
u8 inner_length; /* 18 */
u8 reserved[14]; /* 32 */
u8 salt[BLAKE2B_SALTBYTES]; /* 48 */
u8 personal[BLAKE2B_PERSONALBYTES]; /* 64 */
} __packed;
static const u64 blake2b_IV[8] = { static const u64 blake2b_IV[8] = {
0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, 0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL, 0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
...@@ -85,16 +65,8 @@ static const u8 blake2b_sigma[12][16] = { ...@@ -85,16 +65,8 @@ static const u8 blake2b_sigma[12][16] = {
{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 } { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }
}; };
static void blake2b_set_lastnode(struct blake2b_state *S)
{
S->f[1] = (u64)-1;
}
static void blake2b_set_lastblock(struct blake2b_state *S) static void blake2b_set_lastblock(struct blake2b_state *S)
{ {
if (S->last_node)
blake2b_set_lastnode(S);
S->f[0] = (u64)-1; S->f[0] = (u64)-1;
} }
...@@ -334,8 +306,6 @@ static struct shash_alg blake2b_algs[] = { ...@@ -334,8 +306,6 @@ static struct shash_alg blake2b_algs[] = {
static int __init blake2b_mod_init(void) static int __init blake2b_mod_init(void)
{ {
BUILD_BUG_ON(sizeof(struct blake2b_param) != BLAKE2B_OUTBYTES);
return crypto_register_shashes(blake2b_algs, ARRAY_SIZE(blake2b_algs)); return crypto_register_shashes(blake2b_algs, ARRAY_SIZE(blake2b_algs));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment