From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id DFA09385828E; Fri, 17 Feb 2023 19:05:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DFA09385828E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676660723; bh=7DhEcYCmUxC92w8YjBHBKkcVnpc3E+vLEUCyezyHNuc=; h=From:To:Subject:Date:From; b=jtRVr6GXsq/OcPWIn+dL3EENkBblVCA1Yy3ydXSQb2lrpUUwRWVeLyZCrpeBntIum gLfAAh84x5dtT2KfL6iRprc1I1LIHsz0DGB80zqTlpu5AcgJmoIwDXQmw+g+4M/9jG h5jExURMsFkftYV1KuLxI1Ha6XQztrX7AUSRaetc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] crypto: Remove _STRING_ARCH_unaligned usage X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 609054152fd77c9b572bb04c4af2f8da1ed0c86e X-Git-Newrev: 11053fd4245c5cc0dbd885122e0ef28d11b2db7e Message-Id: <20230217190523.DFA09385828E@sourceware.org> Date: Fri, 17 Feb 2023 19:05:23 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=11053fd4245c5cc0dbd885122e0ef28d11b2db7e commit 11053fd4245c5cc0dbd885122e0ef28d11b2db7e Author: Adhemerval Zanella Date: Thu Feb 9 10:26:43 2023 -0300 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 Diff: --- crypt/md5.c | 24 ++++-------------------- crypt/sha256.c | 28 ++++------------------------ crypt/sha512.c | 26 +++++--------------------- 3 files changed, 13 insertions(+), 65 deletions(-) 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; } } 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; } } 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; } }