From: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
"libc-alpha@sourceware.org" <libc-alpha@sourceware.org>
Subject: Re: [PATCH 1/7] crypto: Remove _STRING_ARCH_unaligned usage
Date: Wed, 15 Feb 2023 17:55:09 +0000 [thread overview]
Message-ID: <PAWPR08MB8982D070389D20AC3E7C3CEC83A39@PAWPR08MB8982.eurprd08.prod.outlook.com> (raw)
In-Reply-To: <20230213135558.3328727-2-adhemerval.zanella@linaro.org>
Hi Adhemerval,
This looks good to me.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
diff --git a/crypt/md5.c b/crypt/md5.c
index c7a232ad38..03240a9a36 100644
--- a/crypt/md5.c
+++ b/crypt/md5.c
@@ -229,27 +229,11 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
/* Process available complete blocks. */
if (len >= 64)
{
-#if !_STRING_ARCH_unaligned
-/* To check alignment gcc has an appropriate operator. Other
- compilers don't. */
-# if __GNUC__ >= 2
-# define UNALIGNED_P(p) (((md5_uintptr) p) % __alignof__ (md5_uint32) != 0)
-# else
-# define UNALIGNED_P(p) (((md5_uintptr) p) % sizeof (md5_uint32) != 0)
-# endif
- if (UNALIGNED_P (buffer))
- while (len > 64)
- {
- __md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
- buffer = (const char *) buffer + 64;
- len -= 64;
- }
- else
-#endif
+ while (len > 64)
{
- __md5_process_block (buffer, len & ~63, ctx);
- buffer = (const char *) buffer + (len & ~63);
- len &= 63;
+ __md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+ buffer = (const char *) buffer + 64;
+ len -= 64;
}
}
OK
diff --git a/crypt/sha256.c b/crypt/sha256.c
index 93b73997c7..96153d67dc 100644
--- a/crypt/sha256.c
+++ b/crypt/sha256.c
@@ -120,13 +120,9 @@ __sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf)
memcpy (&ctx->buffer[bytes], fillbuf, pad);
/* Put the 64-bit file length in *bits* at the end of the buffer. */
-#if _STRING_ARCH_unaligned
- ctx->buffer64[(bytes + pad) / 8] = SWAP64 (ctx->total64 << 3);
-#else
ctx->buffer32[(bytes + pad + 4) / 4] = SWAP (ctx->total[TOTAL64_low] << 3);
ctx->buffer32[(bytes + pad) / 4] = SWAP ((ctx->total[TOTAL64_high] << 3)
| (ctx->total[TOTAL64_low] >> 29));
-#endif
/* Process last bytes. */
__sha256_process_block (ctx->buffer, bytes + pad + 8, ctx);
@@ -169,27 +165,11 @@ __sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx)
/* Process available complete blocks. */
if (len >= 64)
{
-#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__ (uint32_t) != 0)
-# else
-# define UNALIGNED_P(p) (((uintptr_t) p) % sizeof (uint32_t) != 0)
-# endif
- if (UNALIGNED_P (buffer))
- while (len > 64)
- {
- __sha256_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
- buffer = (const char *) buffer + 64;
- len -= 64;
- }
- else
-#endif
+ while (len > 64)
{
- __sha256_process_block (buffer, len & ~63, ctx);
- buffer = (const char *) buffer + (len & ~63);
- len &= 63;
+ __sha256_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+ buffer = (const char *) buffer + 64;
+ len -= 64;
}
}
OK
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;
}
}
OK
next prev parent reply other threads:[~2023-02-15 17:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 13:55 [PATCH 0/7] Remove _STRING_ARCH_unaligned Adhemerval Zanella
2023-02-13 13:55 ` [PATCH 1/7] crypto: Remove _STRING_ARCH_unaligned usage Adhemerval Zanella
2023-02-15 17:55 ` Wilco Dijkstra [this message]
2023-02-13 13:55 ` [PATCH 2/7] stdlib: Simplify getenv Adhemerval Zanella
2023-02-15 17:50 ` Wilco Dijkstra
2023-02-16 13:49 ` Adhemerval Zanella Netto
2023-02-16 14:02 ` Andreas Schwab
2023-02-16 18:02 ` Wilco Dijkstra
2023-02-16 18:38 ` Adhemerval Zanella Netto
2023-02-16 18:47 ` Wilco Dijkstra
2023-02-16 19:29 ` Adhemerval Zanella Netto
2023-02-17 17:13 ` Wilco Dijkstra
2023-02-13 13:55 ` [PATCH 3/7] nscd: Remove _STRING_ARCH_unaligned usage Adhemerval Zanella
2023-02-15 17:59 ` Wilco Dijkstra
2023-02-13 13:55 ` [PATCH 4/7] resolv: " Adhemerval Zanella
2023-02-15 18:04 ` Wilco Dijkstra
2023-02-13 13:55 ` [PATCH 5/7] iconv: Remove _STRING_ARCH_unaligned usage for get/set macros Adhemerval Zanella
2023-02-13 14:05 ` Andreas Schwab
2023-02-15 18:34 ` Wilco Dijkstra
2023-02-13 13:55 ` [PATCH 6/7] iconv: Remove _STRING_ARCH_unaligned usage Adhemerval Zanella
2023-02-15 19:02 ` Wilco Dijkstra
2023-02-13 13:55 ` [PATCH 7/7] string: Remove string_private.h Adhemerval Zanella
2023-02-15 19:04 ` Wilco Dijkstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=PAWPR08MB8982D070389D20AC3E7C3CEC83A39@PAWPR08MB8982.eurprd08.prod.outlook.com \
--to=wilco.dijkstra@arm.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).