Commit 3135d5be authored by Eric Biggers's avatar Eric Biggers
Browse files

lib/crypto: sha256: Reorder some code 



First, move the declarations of sha224_init/update/final to be just
above the corresponding SHA-256 code, matching the order that I used for
SHA-384 and SHA-512.  In sha2.h, the end result is that SHA-224,
SHA-256, SHA-384, and SHA-512 are all in the logical order.

Second, move sha224_block_init() and sha256_block_init() to be just
below crypto_sha256_state.  In later changes, these functions as well as
struct crypto_sha256_state will no longer be used by the library
functions.  They'll remain just for some legacy offload drivers.  This
gets them into a logical place in the file for that.

No code changes other than reordering.

Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250630160645.3198-4-ebiggers@kernel.org


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

include/crypto/sha2.h

+30 −30
Original line number Diff line number Diff line
@@ -71,6 +71,32 @@ struct crypto_sha256_state { 
	u64 count;

};



static inline void sha224_block_init(struct crypto_sha256_state *sctx)

{

	sctx->state[0] = SHA224_H0;

	sctx->state[1] = SHA224_H1;

	sctx->state[2] = SHA224_H2;

	sctx->state[3] = SHA224_H3;

	sctx->state[4] = SHA224_H4;

	sctx->state[5] = SHA224_H5;

	sctx->state[6] = SHA224_H6;

	sctx->state[7] = SHA224_H7;

	sctx->count = 0;

}



static inline void sha256_block_init(struct crypto_sha256_state *sctx)

{

	sctx->state[0] = SHA256_H0;

	sctx->state[1] = SHA256_H1;

	sctx->state[2] = SHA256_H2;

	sctx->state[3] = SHA256_H3;

	sctx->state[4] = SHA256_H4;

	sctx->state[5] = SHA256_H5;

	sctx->state[6] = SHA256_H6;

	sctx->state[7] = SHA256_H7;

	sctx->count = 0;

}



struct sha256_state {

	union {

		struct crypto_sha256_state ctx;
@@ -88,18 +114,12 @@ struct sha512_state { 
	u8 buf[SHA512_BLOCK_SIZE];

};



static inline void sha256_block_init(struct crypto_sha256_state *sctx)

static inline void sha224_init(struct sha256_state *sctx)

{

	sctx->state[0] = SHA256_H0;

	sctx->state[1] = SHA256_H1;

	sctx->state[2] = SHA256_H2;

	sctx->state[3] = SHA256_H3;

	sctx->state[4] = SHA256_H4;

	sctx->state[5] = SHA256_H5;

	sctx->state[6] = SHA256_H6;

	sctx->state[7] = SHA256_H7;

	sctx->count = 0;

	sha224_block_init(&sctx->ctx);

}

/* Simply use sha256_update as it is equivalent to sha224_update. */

void sha224_final(struct sha256_state *sctx, u8 out[SHA224_DIGEST_SIZE]);



static inline void sha256_init(struct sha256_state *sctx)

{
@@ -109,26 +129,6 @@ void sha256_update(struct sha256_state *sctx, const u8 *data, size_t len); 
void sha256_final(struct sha256_state *sctx, u8 out[SHA256_DIGEST_SIZE]);

void sha256(const u8 *data, size_t len, u8 out[SHA256_DIGEST_SIZE]);



static inline void sha224_block_init(struct crypto_sha256_state *sctx)

{

	sctx->state[0] = SHA224_H0;

	sctx->state[1] = SHA224_H1;

	sctx->state[2] = SHA224_H2;

	sctx->state[3] = SHA224_H3;

	sctx->state[4] = SHA224_H4;

	sctx->state[5] = SHA224_H5;

	sctx->state[6] = SHA224_H6;

	sctx->state[7] = SHA224_H7;

	sctx->count = 0;

}



static inline void sha224_init(struct sha256_state *sctx)

{

	sha224_block_init(&sctx->ctx);

}

/* Simply use sha256_update as it is equivalent to sha224_update. */

void sha224_final(struct sha256_state *sctx, u8 out[SHA224_DIGEST_SIZE]);



/* State for the SHA-512 (and SHA-384) compression function */

struct sha512_block_state {

	u64 h[8];

lib/crypto/sha256.c

+6 −6
Original line number Diff line number Diff line
@@ -58,18 +58,18 @@ static inline void __sha256_final(struct sha256_state *sctx, u8 *out, 
	memzero_explicit(sctx, sizeof(*sctx));

}



void sha256_final(struct sha256_state *sctx, u8 out[SHA256_DIGEST_SIZE])

{

	__sha256_final(sctx, out, SHA256_DIGEST_SIZE);

}

EXPORT_SYMBOL(sha256_final);



void sha224_final(struct sha256_state *sctx, u8 out[SHA224_DIGEST_SIZE])

{

	__sha256_final(sctx, out, SHA224_DIGEST_SIZE);

}

EXPORT_SYMBOL(sha224_final);



void sha256_final(struct sha256_state *sctx, u8 out[SHA256_DIGEST_SIZE])

{

	__sha256_final(sctx, out, SHA256_DIGEST_SIZE);

}

EXPORT_SYMBOL(sha256_final);



void sha256(const u8 *data, size_t len, u8 out[SHA256_DIGEST_SIZE])

{

	struct sha256_state sctx;