Commit 5d313a76 authored by Eric Biggers's avatar Eric Biggers
Browse files

lib/crypto: blake2s: Move generic code into blake2s.c 



Move blake2s_compress_generic() from blake2s-generic.c to blake2s.c.

For now it's still guarded by CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC, but
this prepares for changing it to a 'static __maybe_unused' function and
just using the compiler to automatically decide its inclusion.

Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250827151131.27733-11-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
parent 56e48d4e

lib/crypto/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ obj-$(CONFIG_CRYPTO_LIB_GF128MUL) += gf128mul.o 
# blake2s is used by the /dev/random driver which is always builtin

obj-y						+= libblake2s.o

libblake2s-y					:= blake2s.o

libblake2s-$(CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC)	+= blake2s-generic.o



################################################################################

lib/crypto/blake2s-generic.c

deleted100644 → 0
+0 −111
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR MIT

/*

 * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.

 *

 * This is an implementation of the BLAKE2s hash and PRF functions.

 *

 * Information: https://blake2.net/

 *

 */



#include <crypto/internal/blake2s.h>

#include <linux/bug.h>

#include <linux/export.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/types.h>

#include <linux/unaligned.h>



static const u8 blake2s_sigma[10][16] = {

	{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },

	{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },

	{ 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 },

	{ 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },

	{ 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 },

	{ 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },

	{ 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 },

	{ 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },

	{ 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 },

	{ 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },

};



static inline void blake2s_increment_counter(struct blake2s_state *state,

					     const u32 inc)

{

	state->t[0] += inc;

	state->t[1] += (state->t[0] < inc);

}



void blake2s_compress(struct blake2s_state *state, const u8 *block,

		      size_t nblocks, const u32 inc)

		      __weak __alias(blake2s_compress_generic);



void blake2s_compress_generic(struct blake2s_state *state, const u8 *block,

			      size_t nblocks, const u32 inc)

{

	u32 m[16];

	u32 v[16];

	int i;



	WARN_ON(IS_ENABLED(DEBUG) &&

		(nblocks > 1 && inc != BLAKE2S_BLOCK_SIZE));



	while (nblocks > 0) {

		blake2s_increment_counter(state, inc);

		memcpy(m, block, BLAKE2S_BLOCK_SIZE);

		le32_to_cpu_array(m, ARRAY_SIZE(m));

		memcpy(v, state->h, 32);

		v[ 8] = BLAKE2S_IV0;

		v[ 9] = BLAKE2S_IV1;

		v[10] = BLAKE2S_IV2;

		v[11] = BLAKE2S_IV3;

		v[12] = BLAKE2S_IV4 ^ state->t[0];

		v[13] = BLAKE2S_IV5 ^ state->t[1];

		v[14] = BLAKE2S_IV6 ^ state->f[0];

		v[15] = BLAKE2S_IV7 ^ state->f[1];



#define G(r, i, a, b, c, d) do { \

	a += b + m[blake2s_sigma[r][2 * i + 0]]; \

	d = ror32(d ^ a, 16); \

	c += d; \

	b = ror32(b ^ c, 12); \

	a += b + m[blake2s_sigma[r][2 * i + 1]]; \

	d = ror32(d ^ a, 8); \

	c += d; \

	b = ror32(b ^ c, 7); \

} while (0)



#define ROUND(r) do { \

	G(r, 0, v[0], v[ 4], v[ 8], v[12]); \

	G(r, 1, v[1], v[ 5], v[ 9], v[13]); \

	G(r, 2, v[2], v[ 6], v[10], v[14]); \

	G(r, 3, v[3], v[ 7], v[11], v[15]); \

	G(r, 4, v[0], v[ 5], v[10], v[15]); \

	G(r, 5, v[1], v[ 6], v[11], v[12]); \

	G(r, 6, v[2], v[ 7], v[ 8], v[13]); \

	G(r, 7, v[3], v[ 4], v[ 9], v[14]); \

} while (0)

		ROUND(0);

		ROUND(1);

		ROUND(2);

		ROUND(3);

		ROUND(4);

		ROUND(5);

		ROUND(6);

		ROUND(7);

		ROUND(8);

		ROUND(9);



#undef G

#undef ROUND



		for (i = 0; i < 8; ++i)

			state->h[i] ^= v[i] ^ v[i + 8];



		block += BLAKE2S_BLOCK_SIZE;

		--nblocks;

	}

}



EXPORT_SYMBOL(blake2s_compress_generic);

lib/crypto/blake2s.c

+94 −0
Original line number Diff line number Diff line
@@ -16,6 +16,100 @@ 
#include <linux/string.h>

#include <linux/types.h>



#ifdef CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC

static const u8 blake2s_sigma[10][16] = {

	{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },

	{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },

	{ 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 },

	{ 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },

	{ 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 },

	{ 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },

	{ 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 },

	{ 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },

	{ 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 },

	{ 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },

};



static inline void blake2s_increment_counter(struct blake2s_state *state,

					     const u32 inc)

{

	state->t[0] += inc;

	state->t[1] += (state->t[0] < inc);

}



void blake2s_compress(struct blake2s_state *state, const u8 *block,

		      size_t nblocks, const u32 inc)

		      __weak __alias(blake2s_compress_generic);



void blake2s_compress_generic(struct blake2s_state *state, const u8 *block,

			      size_t nblocks, const u32 inc)

{

	u32 m[16];

	u32 v[16];

	int i;



	WARN_ON(IS_ENABLED(DEBUG) &&

		(nblocks > 1 && inc != BLAKE2S_BLOCK_SIZE));



	while (nblocks > 0) {

		blake2s_increment_counter(state, inc);

		memcpy(m, block, BLAKE2S_BLOCK_SIZE);

		le32_to_cpu_array(m, ARRAY_SIZE(m));

		memcpy(v, state->h, 32);

		v[ 8] = BLAKE2S_IV0;

		v[ 9] = BLAKE2S_IV1;

		v[10] = BLAKE2S_IV2;

		v[11] = BLAKE2S_IV3;

		v[12] = BLAKE2S_IV4 ^ state->t[0];

		v[13] = BLAKE2S_IV5 ^ state->t[1];

		v[14] = BLAKE2S_IV6 ^ state->f[0];

		v[15] = BLAKE2S_IV7 ^ state->f[1];



#define G(r, i, a, b, c, d) do { \

	a += b + m[blake2s_sigma[r][2 * i + 0]]; \

	d = ror32(d ^ a, 16); \

	c += d; \

	b = ror32(b ^ c, 12); \

	a += b + m[blake2s_sigma[r][2 * i + 1]]; \

	d = ror32(d ^ a, 8); \

	c += d; \

	b = ror32(b ^ c, 7); \

} while (0)



#define ROUND(r) do { \

	G(r, 0, v[0], v[ 4], v[ 8], v[12]); \

	G(r, 1, v[1], v[ 5], v[ 9], v[13]); \

	G(r, 2, v[2], v[ 6], v[10], v[14]); \

	G(r, 3, v[3], v[ 7], v[11], v[15]); \

	G(r, 4, v[0], v[ 5], v[10], v[15]); \

	G(r, 5, v[1], v[ 6], v[11], v[12]); \

	G(r, 6, v[2], v[ 7], v[ 8], v[13]); \

	G(r, 7, v[3], v[ 4], v[ 9], v[14]); \

} while (0)

		ROUND(0);

		ROUND(1);

		ROUND(2);

		ROUND(3);

		ROUND(4);

		ROUND(5);

		ROUND(6);

		ROUND(7);

		ROUND(8);

		ROUND(9);



#undef G

#undef ROUND



		for (i = 0; i < 8; ++i)

			state->h[i] ^= v[i] ^ v[i + 8];



		block += BLAKE2S_BLOCK_SIZE;

		--nblocks;

	}

}

EXPORT_SYMBOL(blake2s_compress_generic);

#endif /* CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC */



static inline void blake2s_set_lastblock(struct blake2s_state *state)

{

	state->f[0] = -1;