mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-15 01:21:06 +00:00
34a5a1460e
The GNU Coding Standards specify that line breaks in expressions should go before an operator, not after one. This patch fixes various code to do this. It only changes code that appears to be mostly following GNU style anyway, not files and directories with substantially different formatting. It is not exhaustive even for files using GNU style (for example, changes to sysdeps files are deferred for subsequent cleanups). Some files changed are shared with gnulib, but most are specific to glibc. Changes were made manually, with places to change found by grep (so some cases, e.g. where the operator was followed by a comment at end of line, are particularly liable to have been missed by grep, but I did include cases where the operator was followed by backslash-newline). This patch generally does not attempt to address other coding style issues in the expressions changed (for example, missing spaces before '(', or lack of parentheses to ensure indentation of continuation lines properly reflects operator precedence). Tested for x86_64, and with build-many-glibcs.py. * benchtests/bench-memmem.c (simple_memmem): Break lines before rather than after operators. * benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise. * crypt/md5.c (md5_finish_ctx): Likewise. * crypt/sha256.c (__sha256_finish_ctx): Likewise. * crypt/sha512.c (__sha512_finish_ctx): Likewise. * elf/cache.c (load_aux_cache): Likewise. * elf/dl-load.c (open_verify): Likewise. * elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise. * elf/readelflib.c (process_elf_file): Likewise. * elf/rtld.c (dl_main): Likewise. * elf/sprof.c (generate_call_graph): Likewise. * hurd/ctty-input.c (_hurd_ctty_input): Likewise. * hurd/ctty-output.c (_hurd_ctty_output): Likewise. * hurd/dtable.c (reauth_dtable): Likewise. * hurd/getdport.c (__getdport): Likewise. * hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise. * hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise. * hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise): Likewise. * hurd/hurdioctl.c (fioctl): Likewise. * hurd/hurdselect.c (_hurd_select): Likewise. * hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise. (STOPSIGS): Likewise. * hurd/hurdstartup.c (_hurd_startup): Likewise. * hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise. * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise. * hurd/msgportdemux.c (msgport_server): Likewise. * hurd/setauth.c (_hurd_setauth): Likewise. * include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise. * libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise. * locale/programs/ld-ctype.c (set_class_defaults): Likewise. * localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise. * login/tst-utmp.c (do_check): Likewise. (simulate_login): Likewise. * mach/lowlevellock.h (lll_lock): Likewise. (lll_trylock): Likewise. * math/test-fenv.c (ALL_EXC): Likewise. * math/test-fenvinline.c (ALL_EXC): Likewise. * misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise. * nis/nis_call.c (__do_niscall3): Likewise. * nis/nis_callback.c (cb_prog_1): Likewise. * nis/nis_defaults.c (searchaccess): Likewise. * nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise. * nis/nis_ismember.c (internal_ismember): Likewise. * nis/nis_local_names.c (nis_local_principal): Likewise. * nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise. * nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r): Likewise. * nis/ypclnt.c (yp_match): Likewise. (yp_first): Likewise. (yp_next): Likewise. (yp_master): Likewise. (yp_order): Likewise. * nscd/hstcache.c (cache_addhst): Likewise. * nscd/initgrcache.c (addinitgroupsX): Likewise. * nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise. (internal_getpwuid_r): Likewise. * nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise. * posix/glob.h (__GLOB_FLAGS): Likewise. * posix/regcomp.c (peek_token): Likewise. (peek_token_bracket): Likewise. (parse_expression): Likewise. * posix/regexec.c (sift_states_iter_mb): Likewise. (check_node_accept_bytes): Likewise. * posix/tst-spawn3.c (do_test): Likewise. * posix/wordexp-test.c (testit): Likewise. * posix/wordexp.c (parse_tilde): Likewise. (exec_comm): Likewise. * posix/wordexp.h (__WRDE_FLAGS): Likewise. * resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise. * setjmp/sigjmp.c (__sigjmp_save): Likewise. * stdio-common/printf_fp.c (__printf_fp_l): Likewise. * stdio-common/tst-fileno.c (do_test): Likewise. * stdio-common/vfprintf-internal.c (vfprintf): Likewise. * stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise. * stdlib/strtod_l.c (round_and_return): Likewise. (____STRTOF_INTERNAL): Likewise. * stdlib/tst-strfrom.h (TEST_STRFROM): Likewise. * string/strcspn.c (STRCSPN): Likewise. * string/test-memmem.c (simple_memmem): Likewise. * termios/tcsetattr.c (tcsetattr): Likewise. * time/alt_digit.c (_nl_parse_alt_digit): Likewise. * time/asctime.c (asctime_internal): Likewise. * time/strptime_l.c (__strptime_internal): Likewise. * time/sys/time.h (timercmp): Likewise. * time/tzfile.c (__tzfile_compute): Likewise.
239 lines
8.1 KiB
C
239 lines
8.1 KiB
C
/* Functions to compute SHA512 message digest of files or memory blocks.
|
|
according to the definition of SHA512 in FIPS 180-2.
|
|
Copyright (C) 2007-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <endian.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "sha512.h"
|
|
|
|
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
|
# ifdef _LIBC
|
|
# include <byteswap.h>
|
|
# define SWAP(n) bswap_64 (n)
|
|
# else
|
|
# define SWAP(n) \
|
|
(((n) << 56) \
|
|
| (((n) & 0xff00) << 40) \
|
|
| (((n) & 0xff0000) << 24) \
|
|
| (((n) & 0xff000000) << 8) \
|
|
| (((n) >> 8) & 0xff000000) \
|
|
| (((n) >> 24) & 0xff0000) \
|
|
| (((n) >> 40) & 0xff00) \
|
|
| ((n) >> 56))
|
|
# endif
|
|
#else
|
|
# define SWAP(n) (n)
|
|
#endif
|
|
|
|
|
|
/* This array contains the bytes used to pad the buffer to the next
|
|
64-byte boundary. (FIPS 180-2:5.1.2) */
|
|
static const unsigned char fillbuf[128] = { 0x80, 0 /* , 0, 0, ... */ };
|
|
|
|
|
|
/* Constants for SHA512 from FIPS 180-2:4.2.3. */
|
|
static const uint64_t K[80] =
|
|
{
|
|
UINT64_C (0x428a2f98d728ae22), UINT64_C (0x7137449123ef65cd),
|
|
UINT64_C (0xb5c0fbcfec4d3b2f), UINT64_C (0xe9b5dba58189dbbc),
|
|
UINT64_C (0x3956c25bf348b538), UINT64_C (0x59f111f1b605d019),
|
|
UINT64_C (0x923f82a4af194f9b), UINT64_C (0xab1c5ed5da6d8118),
|
|
UINT64_C (0xd807aa98a3030242), UINT64_C (0x12835b0145706fbe),
|
|
UINT64_C (0x243185be4ee4b28c), UINT64_C (0x550c7dc3d5ffb4e2),
|
|
UINT64_C (0x72be5d74f27b896f), UINT64_C (0x80deb1fe3b1696b1),
|
|
UINT64_C (0x9bdc06a725c71235), UINT64_C (0xc19bf174cf692694),
|
|
UINT64_C (0xe49b69c19ef14ad2), UINT64_C (0xefbe4786384f25e3),
|
|
UINT64_C (0x0fc19dc68b8cd5b5), UINT64_C (0x240ca1cc77ac9c65),
|
|
UINT64_C (0x2de92c6f592b0275), UINT64_C (0x4a7484aa6ea6e483),
|
|
UINT64_C (0x5cb0a9dcbd41fbd4), UINT64_C (0x76f988da831153b5),
|
|
UINT64_C (0x983e5152ee66dfab), UINT64_C (0xa831c66d2db43210),
|
|
UINT64_C (0xb00327c898fb213f), UINT64_C (0xbf597fc7beef0ee4),
|
|
UINT64_C (0xc6e00bf33da88fc2), UINT64_C (0xd5a79147930aa725),
|
|
UINT64_C (0x06ca6351e003826f), UINT64_C (0x142929670a0e6e70),
|
|
UINT64_C (0x27b70a8546d22ffc), UINT64_C (0x2e1b21385c26c926),
|
|
UINT64_C (0x4d2c6dfc5ac42aed), UINT64_C (0x53380d139d95b3df),
|
|
UINT64_C (0x650a73548baf63de), UINT64_C (0x766a0abb3c77b2a8),
|
|
UINT64_C (0x81c2c92e47edaee6), UINT64_C (0x92722c851482353b),
|
|
UINT64_C (0xa2bfe8a14cf10364), UINT64_C (0xa81a664bbc423001),
|
|
UINT64_C (0xc24b8b70d0f89791), UINT64_C (0xc76c51a30654be30),
|
|
UINT64_C (0xd192e819d6ef5218), UINT64_C (0xd69906245565a910),
|
|
UINT64_C (0xf40e35855771202a), UINT64_C (0x106aa07032bbd1b8),
|
|
UINT64_C (0x19a4c116b8d2d0c8), UINT64_C (0x1e376c085141ab53),
|
|
UINT64_C (0x2748774cdf8eeb99), UINT64_C (0x34b0bcb5e19b48a8),
|
|
UINT64_C (0x391c0cb3c5c95a63), UINT64_C (0x4ed8aa4ae3418acb),
|
|
UINT64_C (0x5b9cca4f7763e373), UINT64_C (0x682e6ff3d6b2b8a3),
|
|
UINT64_C (0x748f82ee5defb2fc), UINT64_C (0x78a5636f43172f60),
|
|
UINT64_C (0x84c87814a1f0ab72), UINT64_C (0x8cc702081a6439ec),
|
|
UINT64_C (0x90befffa23631e28), UINT64_C (0xa4506cebde82bde9),
|
|
UINT64_C (0xbef9a3f7b2c67915), UINT64_C (0xc67178f2e372532b),
|
|
UINT64_C (0xca273eceea26619c), UINT64_C (0xd186b8c721c0c207),
|
|
UINT64_C (0xeada7dd6cde0eb1e), UINT64_C (0xf57d4f7fee6ed178),
|
|
UINT64_C (0x06f067aa72176fba), UINT64_C (0x0a637dc5a2c898a6),
|
|
UINT64_C (0x113f9804bef90dae), UINT64_C (0x1b710b35131c471b),
|
|
UINT64_C (0x28db77f523047d84), UINT64_C (0x32caab7b40c72493),
|
|
UINT64_C (0x3c9ebe0a15c9bebc), UINT64_C (0x431d67c49c100d4c),
|
|
UINT64_C (0x4cc5d4becb3e42b6), UINT64_C (0x597f299cfc657e2a),
|
|
UINT64_C (0x5fcb6fab3ad6faec), UINT64_C (0x6c44198c4a475817)
|
|
};
|
|
|
|
void __sha512_process_block (const void *buffer, size_t len,
|
|
struct sha512_ctx *ctx);
|
|
|
|
/* Initialize structure containing state of computation.
|
|
(FIPS 180-2:5.3.3) */
|
|
void
|
|
__sha512_init_ctx (struct sha512_ctx *ctx)
|
|
{
|
|
ctx->H[0] = UINT64_C (0x6a09e667f3bcc908);
|
|
ctx->H[1] = UINT64_C (0xbb67ae8584caa73b);
|
|
ctx->H[2] = UINT64_C (0x3c6ef372fe94f82b);
|
|
ctx->H[3] = UINT64_C (0xa54ff53a5f1d36f1);
|
|
ctx->H[4] = UINT64_C (0x510e527fade682d1);
|
|
ctx->H[5] = UINT64_C (0x9b05688c2b3e6c1f);
|
|
ctx->H[6] = UINT64_C (0x1f83d9abfb41bd6b);
|
|
ctx->H[7] = UINT64_C (0x5be0cd19137e2179);
|
|
|
|
ctx->total[0] = ctx->total[1] = 0;
|
|
ctx->buflen = 0;
|
|
}
|
|
|
|
|
|
/* Process the remaining bytes in the internal buffer and the usual
|
|
prolog according to the standard and write the result to RESBUF.
|
|
|
|
IMPORTANT: On some systems it is required that RESBUF is correctly
|
|
aligned for a 32 bits value. */
|
|
void *
|
|
__sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf)
|
|
{
|
|
/* Take yet unprocessed bytes into account. */
|
|
uint64_t bytes = ctx->buflen;
|
|
size_t pad;
|
|
|
|
/* Now count remaining bytes. */
|
|
#ifdef USE_TOTAL128
|
|
ctx->total128 += bytes;
|
|
#else
|
|
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. */
|
|
ctx->buffer64[(bytes + pad + 8) / 8] = SWAP (ctx->total[TOTAL128_low] << 3);
|
|
ctx->buffer64[(bytes + pad) / 8] = SWAP ((ctx->total[TOTAL128_high] << 3)
|
|
| (ctx->total[TOTAL128_low] >> 61));
|
|
|
|
/* Process last bytes. */
|
|
__sha512_process_block (ctx->buffer, bytes + pad + 16, ctx);
|
|
|
|
/* Put result from CTX in first 64 bytes following RESBUF. */
|
|
for (unsigned int i = 0; i < 8; ++i)
|
|
((uint64_t *) resbuf)[i] = SWAP (ctx->H[i]);
|
|
|
|
return resbuf;
|
|
}
|
|
|
|
|
|
void
|
|
__sha512_process_bytes (const void *buffer, size_t len, struct sha512_ctx *ctx)
|
|
{
|
|
/* When we already have some bits in our internal buffer concatenate
|
|
both inputs first. */
|
|
if (ctx->buflen != 0)
|
|
{
|
|
size_t left_over = ctx->buflen;
|
|
size_t add = 256 - left_over > len ? len : 256 - left_over;
|
|
|
|
memcpy (&ctx->buffer[left_over], buffer, add);
|
|
ctx->buflen += add;
|
|
|
|
if (ctx->buflen > 128)
|
|
{
|
|
__sha512_process_block (ctx->buffer, ctx->buflen & ~127, ctx);
|
|
|
|
ctx->buflen &= 127;
|
|
/* The regions in the following copy operation cannot overlap. */
|
|
memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~127],
|
|
ctx->buflen);
|
|
}
|
|
|
|
buffer = (const char *) buffer + add;
|
|
len -= add;
|
|
}
|
|
|
|
/* 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
|
|
{
|
|
__sha512_process_block (buffer, len & ~127, ctx);
|
|
buffer = (const char *) buffer + (len & ~127);
|
|
len &= 127;
|
|
}
|
|
}
|
|
|
|
/* Move remaining bytes into internal buffer. */
|
|
if (len > 0)
|
|
{
|
|
size_t left_over = ctx->buflen;
|
|
|
|
memcpy (&ctx->buffer[left_over], buffer, len);
|
|
left_over += len;
|
|
if (left_over >= 128)
|
|
{
|
|
__sha512_process_block (ctx->buffer, 128, ctx);
|
|
left_over -= 128;
|
|
memcpy (ctx->buffer, &ctx->buffer[128], left_over);
|
|
}
|
|
ctx->buflen = left_over;
|
|
}
|
|
}
|
|
|
|
#include <sha512-block.c>
|