* [PATCH] lib/crypto: Remove unused file blockhash.h
@ 2026-03-14 17:35 Eric Biggers
2026-03-17 11:07 ` Ard Biesheuvel
2026-03-17 16:39 ` Eric Biggers
0 siblings, 2 replies; 3+ messages in thread
From: Eric Biggers @ 2026-03-14 17:35 UTC (permalink / raw)
To: linux-crypto
Cc: linux-kernel, Ard Biesheuvel, Jason A . Donenfeld, Herbert Xu,
Eric Biggers
For a short time this file was used by the SHA-256 and Poly1305 library
code, but they are no longer using it. Remove this unused file.
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
---
This patch is targeting libcrypto-next
include/crypto/internal/blockhash.h | 52 -----------------------------
1 file changed, 52 deletions(-)
delete mode 100644 include/crypto/internal/blockhash.h
diff --git a/include/crypto/internal/blockhash.h b/include/crypto/internal/blockhash.h
deleted file mode 100644
index 52d9d4c82493d..0000000000000
--- a/include/crypto/internal/blockhash.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Handle partial blocks for block hash.
- *
- * Copyright (c) 2015 Linaro Ltd <ard.biesheuvel@linaro.org>
- * Copyright (c) 2025 Herbert Xu <herbert@gondor.apana.org.au>
- */
-
-#ifndef _CRYPTO_INTERNAL_BLOCKHASH_H
-#define _CRYPTO_INTERNAL_BLOCKHASH_H
-
-#include <linux/string.h>
-#include <linux/types.h>
-
-#define BLOCK_HASH_UPDATE_BASE(block_fn, state, src, nbytes, bs, dv, \
- buf, buflen) \
- ({ \
- typeof(block_fn) *_block_fn = &(block_fn); \
- typeof(state + 0) _state = (state); \
- unsigned int _buflen = (buflen); \
- size_t _nbytes = (nbytes); \
- unsigned int _bs = (bs); \
- const u8 *_src = (src); \
- u8 *_buf = (buf); \
- while ((_buflen + _nbytes) >= _bs) { \
- const u8 *data = _src; \
- size_t len = _nbytes; \
- size_t blocks; \
- int remain; \
- if (_buflen) { \
- remain = _bs - _buflen; \
- memcpy(_buf + _buflen, _src, remain); \
- data = _buf; \
- len = _bs; \
- } \
- remain = len % bs; \
- blocks = (len - remain) / (dv); \
- (*_block_fn)(_state, data, blocks); \
- _src += len - remain - _buflen; \
- _nbytes -= len - remain - _buflen; \
- _buflen = 0; \
- } \
- memcpy(_buf + _buflen, _src, _nbytes); \
- _buflen += _nbytes; \
- })
-
-#define BLOCK_HASH_UPDATE(block, state, src, nbytes, bs, buf, buflen) \
- BLOCK_HASH_UPDATE_BASE(block, state, src, nbytes, bs, 1, buf, buflen)
-#define BLOCK_HASH_UPDATE_BLOCKS(block, state, src, nbytes, bs, buf, buflen) \
- BLOCK_HASH_UPDATE_BASE(block, state, src, nbytes, bs, bs, buf, buflen)
-
-#endif /* _CRYPTO_INTERNAL_BLOCKHASH_H */
base-commit: ce260754bb435aea18e6a1a1ce3759249013f5a4
--
2.53.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] lib/crypto: Remove unused file blockhash.h
2026-03-14 17:35 [PATCH] lib/crypto: Remove unused file blockhash.h Eric Biggers
@ 2026-03-17 11:07 ` Ard Biesheuvel
2026-03-17 16:39 ` Eric Biggers
1 sibling, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2026-03-17 11:07 UTC (permalink / raw)
To: Eric Biggers, linux-crypto; +Cc: linux-kernel, Jason A . Donenfeld, Herbert Xu
On Sat, 14 Mar 2026, at 18:35, Eric Biggers wrote:
> For a short time this file was used by the SHA-256 and Poly1305 library
> code, but they are no longer using it. Remove this unused file.
>
> Signed-off-by: Eric Biggers <ebiggers@kernel.org>
> ---
>
> This patch is targeting libcrypto-next
>
> include/crypto/internal/blockhash.h | 52 -----------------------------
> 1 file changed, 52 deletions(-)
> delete mode 100644 include/crypto/internal/blockhash.h
>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
> diff --git a/include/crypto/internal/blockhash.h
> b/include/crypto/internal/blockhash.h
> deleted file mode 100644
> index 52d9d4c82493d..0000000000000
> --- a/include/crypto/internal/blockhash.h
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> -/*
> - * Handle partial blocks for block hash.
> - *
> - * Copyright (c) 2015 Linaro Ltd <ard.biesheuvel@linaro.org>
> - * Copyright (c) 2025 Herbert Xu <herbert@gondor.apana.org.au>
> - */
> -
> -#ifndef _CRYPTO_INTERNAL_BLOCKHASH_H
> -#define _CRYPTO_INTERNAL_BLOCKHASH_H
> -
> -#include <linux/string.h>
> -#include <linux/types.h>
> -
> -#define BLOCK_HASH_UPDATE_BASE(block_fn, state, src, nbytes, bs, dv, \
> - buf, buflen) \
> - ({ \
> - typeof(block_fn) *_block_fn = &(block_fn); \
> - typeof(state + 0) _state = (state); \
> - unsigned int _buflen = (buflen); \
> - size_t _nbytes = (nbytes); \
> - unsigned int _bs = (bs); \
> - const u8 *_src = (src); \
> - u8 *_buf = (buf); \
> - while ((_buflen + _nbytes) >= _bs) { \
> - const u8 *data = _src; \
> - size_t len = _nbytes; \
> - size_t blocks; \
> - int remain; \
> - if (_buflen) { \
> - remain = _bs - _buflen; \
> - memcpy(_buf + _buflen, _src, remain); \
> - data = _buf; \
> - len = _bs; \
> - } \
> - remain = len % bs; \
> - blocks = (len - remain) / (dv); \
> - (*_block_fn)(_state, data, blocks); \
> - _src += len - remain - _buflen; \
> - _nbytes -= len - remain - _buflen; \
> - _buflen = 0; \
> - } \
> - memcpy(_buf + _buflen, _src, _nbytes); \
> - _buflen += _nbytes; \
> - })
> -
> -#define BLOCK_HASH_UPDATE(block, state, src, nbytes, bs, buf, buflen) \
> - BLOCK_HASH_UPDATE_BASE(block, state, src, nbytes, bs, 1, buf, buflen)
> -#define BLOCK_HASH_UPDATE_BLOCKS(block, state, src, nbytes, bs, buf,
> buflen) \
> - BLOCK_HASH_UPDATE_BASE(block, state, src, nbytes, bs, bs, buf, buflen)
> -
> -#endif /* _CRYPTO_INTERNAL_BLOCKHASH_H */
>
> base-commit: ce260754bb435aea18e6a1a1ce3759249013f5a4
> --
> 2.53.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] lib/crypto: Remove unused file blockhash.h
2026-03-14 17:35 [PATCH] lib/crypto: Remove unused file blockhash.h Eric Biggers
2026-03-17 11:07 ` Ard Biesheuvel
@ 2026-03-17 16:39 ` Eric Biggers
1 sibling, 0 replies; 3+ messages in thread
From: Eric Biggers @ 2026-03-17 16:39 UTC (permalink / raw)
To: linux-crypto
Cc: linux-kernel, Ard Biesheuvel, Jason A . Donenfeld, Herbert Xu
On Sat, Mar 14, 2026 at 10:35:26AM -0700, Eric Biggers wrote:
> For a short time this file was used by the SHA-256 and Poly1305 library
> code, but they are no longer using it. Remove this unused file.
>
> Signed-off-by: Eric Biggers <ebiggers@kernel.org>
> ---
>
> This patch is targeting libcrypto-next
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git/log/?h=libcrypto-next
- Eric
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-03-17 16:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-14 17:35 [PATCH] lib/crypto: Remove unused file blockhash.h Eric Biggers
2026-03-17 11:07 ` Ard Biesheuvel
2026-03-17 16:39 ` Eric Biggers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox