OSDN Git Service

crypto: blake2b - open code set last block helper
authorDavid Sterba <dsterba@suse.com>
Tue, 12 Nov 2019 10:20:28 +0000 (11:20 +0100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 22 Nov 2019 10:48:35 +0000 (18:48 +0800)
The helper is trival and called once, inlining makes things simpler.
There's a comment to tie it back to the idea behind the code.

Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/blake2b_generic.c

index 442c639..463ac59 100644 (file)
@@ -65,11 +65,6 @@ static const u8 blake2b_sigma[12][16] = {
        { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
 };
 
-static void blake2b_set_lastblock(struct blake2b_state *S)
-{
-       S->f[0] = (u64)-1;
-}
-
 static void blake2b_increment_counter(struct blake2b_state *S, const u64 inc)
 {
        S->t[0] += inc;
@@ -231,7 +226,8 @@ static int blake2b_final(struct shash_desc *desc, u8 *out)
        size_t i;
 
        blake2b_increment_counter(state, state->buflen);
-       blake2b_set_lastblock(state);
+       /* Set last block */
+       state->f[0] = (u64)-1;
        /* Padding */
        memset(state->buf + state->buflen, 0, BLAKE2B_BLOCKBYTES - state->buflen);
        blake2b_compress(state, state->buf);