aboutsummaryrefslogtreecommitdiff
path: root/crypt/sha512.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2023-02-09 10:26:43 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2023-02-17 15:56:41 -0300
commit11053fd4245c5cc0dbd885122e0ef28d11b2db7e (patch)
treeb3402a8d187d4fd7edb7da7248323def042b47ff /crypt/sha512.c
parent609054152fd77c9b572bb04c4af2f8da1ed0c86e (diff)
downloadglibc-11053fd4245c5cc0dbd885122e0ef28d11b2db7e.tar
glibc-11053fd4245c5cc0dbd885122e0ef28d11b2db7e.tar.gz
glibc-11053fd4245c5cc0dbd885122e0ef28d11b2db7e.tar.bz2
glibc-11053fd4245c5cc0dbd885122e0ef28d11b2db7e.zip
crypto: Remove _STRING_ARCH_unaligned usage
Assume unaligned inputs on all cases. The code is built and used only in compat mode. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
Diffstat (limited to 'crypt/sha512.c')
-rw-r--r--crypt/sha512.c26
1 files changed, 5 insertions, 21 deletions
diff --git a/crypt/sha512.c b/crypt/sha512.c
index d7e51b3604..ceabad1bf7 100644
--- a/crypt/sha512.c
+++ b/crypt/sha512.c
@@ -192,28 +192,12 @@ __sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx)
/* Process available complete blocks. */
if (len >= 128)
{
-#if !_STRING_ARCH_unaligned
-/* To check alignment gcc has an appropriate operator. Other
- compilers don't. */
-# if __GNUC__ >= 2
-# define UNALIGNED_P(p) (((uintptr_t) p) % __alignof__ (uint64_t) != 0)
-# else
-# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint64_t) != 0)
-# endif
- if (UNALIGNED_P (buffer))
- while (len > 128)
- {
- __sha512_process_block (memcpy (ctx->buffer, buffer, 128), 128,
- ctx);
- buffer = (const char *) buffer + 128;
- len -= 128;
- }
- else
-#endif
+ while (len > 128)
{
- __sha512_process_block (buffer, len & ~127, ctx);
- buffer = (const char *) buffer + (len & ~127);
- len &= 127;
+ __sha512_process_block (memcpy (ctx->buffer, buffer, 128), 128,
+ ctx);
+ buffer = (const char *) buffer + 128;
+ len -= 128;
}
}