AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix last patch for big-endian machines

Browse Source
This commit is contained in:
Ulrich Drepper 2011-07-02 13:03:53 -04:00
parent fcfc776bc6
commit feea4948bc
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypt/sha256.c
View File

@ -224,9 +224,11 @@ __sha256_finish_ctx (ctx, resbuf)
#ifdef _STRING_ARCH_unaligned
*(uint64_t *) &ctx->buffer[bytes + pad] = SWAP64 (ctx->total64 << 3);
#else
*(uint32_t *) &ctx->buffer[bytes + pad + 4] = SWAP (ctx->total[0] << 3);
*(uint32_t *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) |
(ctx->total[0] >> 29));
*(uint32_t *) &ctx->buffer[bytes + pad + 4]
= SWAP (ctx->total[TOTAL64_low] << 3);
*(uint32_t *) &ctx->buffer[bytes + pad]
= SWAP ((ctx->total[TOTAL64_high] << 3) |
(ctx->total[TOTAL64_low] >> 29));
#endif
/* Process last bytes. */

3
crypt/sha256.h
View File

@ -24,6 +24,7 @@
#include <limits.h>
#include <stdint.h>
#include <stdio.h>
#include <endian.h>
/* Structure to save state of computation between the single steps. */
@ -34,6 +35,8 @@ struct sha256_ctx
union
{
uint64_t total64;
#define TOTAL64_low (1 - (BYTE_ORDER == LITTLE_ENDIAN))
#define TOTAL64_high (BYTE_ORDER == LITTLE_ENDIAN)
uint32_t total[2];
};
uint32_t buflen;

20
crypt/sha512.c
View File

@ -124,9 +124,9 @@ sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx)
#ifdef USE_TOTAL128
ctx->total128 += len;
#else
ctx->total[0] += len;
if (ctx->total[0] < len)
++ctx->total[1];
ctx->total[TOTAL128_low] += len;
if (ctx->total[TOTAL128_low] < len)
++ctx->total[TOTAL128_high];
#endif
/* Process all bytes in the buffer with 128 bytes in each round of
@ -244,18 +244,20 @@ __sha512_finish_ctx (ctx, resbuf)
#ifdef USE_TOTAL128
ctx->total128 += bytes;
#else
ctx->total[0] += bytes;
if (ctx->total[0] < bytes)
++ctx->total[1];
ctx->total[TOTAL128_low] += bytes;
if (ctx->total[TOTAL128_low] < bytes)
++ctx->total[TOTAL128_high];
#endif
pad = bytes >= 112 ? 128 + 112 - bytes : 112 - bytes;
memcpy (&ctx->buffer[bytes], fillbuf, pad);
/* Put the 128-bit file length in *bits* at the end of the buffer. */
*(uint64_t *) &ctx->buffer[bytes + pad + 8] = SWAP (ctx->total[0] << 3);
*(uint64_t *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) |
(ctx->total[0] >> 61));
*(uint64_t *) &ctx->buffer[bytes + pad + 8]
= SWAP (ctx->total[TOTAL128_low] << 3);
*(uint64_t *) &ctx->buffer[bytes + pad]
= SWAP ((ctx->total[TOTAL128_high] << 3) |
(ctx->total[TOTAL128_low] >> 61));
/* Process last bytes. */
sha512_process_block (ctx->buffer, bytes + pad + 16, ctx);

12
crypt/sha512.h
View File

@ -24,9 +24,8 @@
#include <limits.h>
#include <stdint.h>
#include <stdio.h>
#ifdef _LIBC
# include <bits/wordsize.h>
#endif
#include <endian.h>
#include <bits/wordsize.h>
/* Structure to save state of computation between the single steps. */
@ -39,6 +38,13 @@ struct sha512_ctx
#if defined __GNUC__ && __WORDSIZE == 64
# define USE_TOTAL128
unsigned int total128 __attribute__ ((__mode__ (TI)));
#endif
#if BYTE_ORDER == LITTLE_ENDIAN
# define TOTAL128_low 0
# define TOTAL128_high 1
#else
# define TOTAL128_low 1
# define TOTAL128_high 0
#endif
uint64_t total[2];
};