diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-19 00:09:22 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-19 00:09:22 +0300 |
commit | 61f4769affffc398499250ccacf0b86d5b654399 (patch) | |
tree | a76e4bfc279b7123465835e5bfe3aff61a00f807 /arch | |
parent | 5adb635077d1b4bd65b183022775a59a378a9c00 (diff) | |
parent | 9d4204a8106fe7dc80e3f2e440c8f2ba1ba47319 (diff) | |
download | linux-61f4769affffc398499250ccacf0b86d5b654399.tar.xz |
Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux
Pull crypto library fixes from Eric Biggers:
- Fix a regression in the arm64 Poly1305 code
- Fix a couple compiler warnings
* tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
lib/crypto/poly1305: Fix arm64's poly1305_blocks_arch()
lib/crypto/curve25519-hacl64: Disable KASAN with clang-17 and older
lib/crypto: Annotate crypto strings with nonstring
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm64/lib/crypto/poly1305-glue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/lib/crypto/poly1305-glue.c b/arch/arm64/lib/crypto/poly1305-glue.c index 6a661cf04821..c9a74766785b 100644 --- a/arch/arm64/lib/crypto/poly1305-glue.c +++ b/arch/arm64/lib/crypto/poly1305-glue.c @@ -38,14 +38,14 @@ void poly1305_blocks_arch(struct poly1305_block_state *state, const u8 *src, unsigned int todo = min_t(unsigned int, len, SZ_4K); kernel_neon_begin(); - poly1305_blocks_neon(state, src, todo, 1); + poly1305_blocks_neon(state, src, todo, padbit); kernel_neon_end(); len -= todo; src += todo; } while (len); } else - poly1305_blocks(state, src, len, 1); + poly1305_blocks(state, src, len, padbit); } EXPORT_SYMBOL_GPL(poly1305_blocks_arch); |