2000-09-22 20:31:23 +02:00
|
|
|
/* md5.c - Functions to compute MD5 message digest of files or memory blocks
|
|
|
|
according to the definition of MD5 in RFC 1321 from April 1992.
|
Update libiberty sources with changes in the gcc mainline.
+2020-01-01 Jakub Jelinek <jakub@redhat.com>
+
+ Update copyright years.
+
+2019-12-06 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * make-relative-prefix.c (split_directories):
+ Return early on empty 'name'
+
+2019-11-16 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * cp-demangle.c (d_print_init): Remove const from 4th param.
+ (cplus_demangle_fill_name): Initialize d->d_counting.
+ (cplus_demangle_fill_extended_operator): Likewise.
+ (cplus_demangle_fill_ctor): Likewise.
+ (cplus_demangle_fill_dtor): Likewise.
+ (d_make_empty): Likewise.
+ (d_count_templates_scopes): Remobe const from 3rd param,
+ Return on dc->d_counting > 1,
+ Increment dc->d_counting.
+ * cp-demint.c (cplus_demangle_fill_component): Initialize d->d_counting.
+ (cplus_demangle_fill_builtin_type): Likewise.
+ (cplus_demangle_fill_operator): Likewise.
+
+2019-11-16 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * cplus-dem.c (cplus_demangle): Use rust_demangle directly.
+ (rust_demangle): Remove.
+ * rust-demangle.c (is_prefixed_hash): Rename to is_legacy_prefixed_hash.
+ (parse_lower_hex_nibble): Rename to decode_lower_hex_nibble.
+ (parse_legacy_escape): Rename to decode_legacy_escape.
+ (rust_is_mangled): Remove.
+ (struct rust_demangler): Add.
+ (peek): Add.
+ (next): Add.
+ (struct rust_mangled_ident): Add.
+ (parse_ident): Add.
+ (rust_demangle_sym): Remove.
+ (print_str): Add.
+ (PRINT): Add.
+ (print_ident): Add.
+ (rust_demangle_callback): Add.
+ (struct str_buf): Add.
+ (str_buf_reserve): Add.
+ (str_buf_append): Add.
+ (str_buf_demangle_callback): Add.
+ (rust_demangle): Add.
+ * rust-demangle.h: Remove.
+
+2019-11-15 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * testsuite/demangle-expected: Fix test.
+
+2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com>
+
+ * cp-demangle.c (d_expr_primary): Handle
+ nullptr demangling.
+ * testsuite/demangle-expected: Added test.
+
+2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * cp-demangle.c (d_number): Avoid signed int overflow.
+
+2019-10-28 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * cp-demangle.c (d_print_mod): Add a space before printing `complex`
+ and `imaginary`, as opposed to after.
+ * testsuite/demangle-expected: Adjust test.
+
+2019-10-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (looks_like_rust): Remove.
+ (rust_is_mangled): Don't check escapes.
+ (is_prefixed_hash): Allow 0-9a-f permutations.
+ (rust_demangle_sym): Don't bail on unknown escapes.
+ * testsuite/rust-demangle-expected: Update 'main::$99$' test.
+
+2019-09-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (unescape): Remove.
+ (parse_lower_hex_nibble): New function.
+ (parse_legacy_escape): New function.
+ (is_prefixed_hash): Use parse_lower_hex_nibble.
+ (looks_like_rust): Use parse_legacy_escape.
+ (rust_demangle_sym): Use parse_legacy_escape.
+ * testsuite/rust-demangle-expected: Add 'llv$u6d$' test.
+
+2019-08-27 Martin Liska <mliska@suse.cz>
+
+ PR lto/91478
+ * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections):
+ First find a WEAK HIDDEN symbol in symbol table that will be
+ preserved. Later, use the symbol name for all removed symbols.
+
+2019-08-12 Martin Liska <mliska@suse.cz>
+
+ * Makefile.in: Add filedescriptor.c.
+ * filedescriptor.c: New file.
+ * lrealpath.c (is_valid_fd): Remove.
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 0be45b4ae8..fe738d0db4 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -1,7 +1,7 @@
# Makefile for the libiberty library.
# Originally written by K. Richard Pixley <rich@cygnus.com>.
#
-# Copyright (C) 1990-2019 Free Software Foundation, Inc.
+# Copyright (C) 1990-2020 Free Software Foundation, Inc.
#
# This file is part of the libiberty library.
# Libiberty is free software; you can redistribute it and/or
@@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \
calloc.c choose-temp.c clock.c concat.c cp-demangle.c \
cp-demint.c cplus-dem.c crc32.c \
d-demangle.c dwarfnames.c dyn-string.c \
- fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \
+ fdmatch.c ffs.c fibheap.c filedescriptor.c filename_cmp.c floatformat.c \
fnmatch.c fopen_unlocked.c \
getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \
gettimeofday.c \
@@ -171,6 +171,7 @@ REQUIRED_OFILES = \
./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \
./dwarfnames.$(objext) ./dyn-string.$(objext) \
./fdmatch.$(objext) ./fibheap.$(objext) \
+ ./filedescriptor.$(objext) \
./filename_cmp.$(objext) ./floatformat.$(objext) \
./fnmatch.$(objext) ./fopen_unlocked.$(objext) \
./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \
@@ -756,6 +757,17 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir
else true; fi
$(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
+./filedescriptor.$(objext): $(srcdir)/filedescriptor.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/filedescriptor.c -o pic/$@; \
+ else true; fi
+ if [ x"$(NOASANFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/filedescriptor.c -o noasan/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/filedescriptor.c $(OUTPUT_OPTION)
+
+
./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
$(INCDIR)/safe-ctype.h
diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c
index d44dc415ed..a739f4304f 100644
--- a/libiberty/_doprnt.c
+++ b/libiberty/_doprnt.c
@@ -1,5 +1,5 @@
/* Provide a version of _doprnt in terms of fprintf.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98
This program is free software; you can redistribute it and/or modify it
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 6444896f99..8c9794db6a 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -1,5 +1,5 @@
/* Create and destroy argument vectors (argv's)
- Copyright (C) 1992-2019 Free Software Foundation, Inc.
+ Copyright (C) 1992-2020 Free Software Foundation, Inc.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c
index 5718682f69..6e38e2234d 100644
--- a/libiberty/asprintf.c
+++ b/libiberty/asprintf.c
@@ -1,6 +1,6 @@
/* Like sprintf but provides a pointer to malloc'd storage, which must
be freed by the caller.
- Copyright (C) 1997-2019 Free Software Foundation, Inc.
+ Copyright (C) 1997-2020 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of the libiberty library.
diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index 72c1b710bd..49a2faaa51 100644
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -1,5 +1,5 @@
/* Utility to pick a temporary filename prefix.
- Copyright (C) 1996-2019 Free Software Foundation, Inc.
+ Copyright (C) 1996-2020 Free Software Foundation, Inc.
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
diff --git a/libiberty/clock.c b/libiberty/clock.c
index a3730714bd..0de74657d0 100644
--- a/libiberty/clock.c
+++ b/libiberty/clock.c
@@ -1,5 +1,5 @@
/* ANSI-compatible clock function.
- Copyright (C) 1994-2019 Free Software Foundation, Inc.
+ Copyright (C) 1994-2020 Free Software Foundation, Inc.
This file is part of the libiberty library. This library is free
software; you can redistribute it and/or modify it under the
diff --git
2020-01-17 15:13:22 +01:00
|
|
|
Copyright (C) 1995-2020 Free Software Foundation, Inc.
|
2000-12-29 21:16:02 +01:00
|
|
|
|
|
|
|
NOTE: This source is derived from an old version taken from the GNU C
|
|
|
|
Library (glibc).
|
2000-09-22 20:31:23 +02:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
|
|
under the terms of the GNU General Public License as published by the
|
|
|
|
Free Software Foundation; either version 2, or (at your option) any
|
|
|
|
later version.
|
|
|
|
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software Foundation,
|
2005-05-10 17:33:34 +02:00
|
|
|
Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
|
2000-09-22 20:31:23 +02:00
|
|
|
|
|
|
|
/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#if STDC_HEADERS || defined _LIBC
|
|
|
|
# include <stdlib.h>
|
|
|
|
# include <string.h>
|
|
|
|
#else
|
|
|
|
# ifndef HAVE_MEMCPY
|
|
|
|
# define memcpy(d, s, n) bcopy ((s), (d), (n))
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
2000-09-26 03:39:17 +02:00
|
|
|
#include "ansidecl.h"
|
2000-09-22 20:31:23 +02:00
|
|
|
#include "md5.h"
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
# include <endian.h>
|
|
|
|
# if __BYTE_ORDER == __BIG_ENDIAN
|
|
|
|
# define WORDS_BIGENDIAN 1
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef WORDS_BIGENDIAN
|
|
|
|
# define SWAP(n) \
|
|
|
|
(((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
|
|
|
|
#else
|
|
|
|
# define SWAP(n) (n)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* This array contains the bytes used to pad the buffer to the next
|
|
|
|
64-byte boundary. (RFC 1321, 3.1: Step 1) */
|
|
|
|
static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ };
|
|
|
|
|
|
|
|
|
|
|
|
/* Initialize structure containing state of computation.
|
|
|
|
(RFC 1321, 3.3: Step 3) */
|
|
|
|
void
|
2005-03-28 04:09:01 +02:00
|
|
|
md5_init_ctx (struct md5_ctx *ctx)
|
2000-09-22 20:31:23 +02:00
|
|
|
{
|
2001-05-09 22:08:48 +02:00
|
|
|
ctx->A = (md5_uint32) 0x67452301;
|
|
|
|
ctx->B = (md5_uint32) 0xefcdab89;
|
|
|
|
ctx->C = (md5_uint32) 0x98badcfe;
|
|
|
|
ctx->D = (md5_uint32) 0x10325476;
|
2000-09-22 20:31:23 +02:00
|
|
|
|
|
|
|
ctx->total[0] = ctx->total[1] = 0;
|
|
|
|
ctx->buflen = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Put result from CTX in first 16 bytes following RESBUF. The result
|
|
|
|
must be in little endian byte order.
|
|
|
|
|
2011-08-12 20:44:43 +02:00
|
|
|
IMPORTANT: RESBUF may not be aligned as strongly as MD5_UNIT32 so we
|
|
|
|
put things in a local (aligned) buffer first, then memcpy into RESBUF. */
|
2000-09-22 20:31:23 +02:00
|
|
|
void *
|
2005-03-28 04:09:01 +02:00
|
|
|
md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
|
2000-09-22 20:31:23 +02:00
|
|
|
{
|
2011-08-12 20:44:43 +02:00
|
|
|
md5_uint32 buffer[4];
|
|
|
|
|
|
|
|
buffer[0] = SWAP (ctx->A);
|
|
|
|
buffer[1] = SWAP (ctx->B);
|
|
|
|
buffer[2] = SWAP (ctx->C);
|
|
|
|
buffer[3] = SWAP (ctx->D);
|
|
|
|
|
|
|
|
memcpy (resbuf, buffer, 16);
|
2000-09-22 20:31:23 +02:00
|
|
|
|
|
|
|
return resbuf;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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 *
|
2005-03-28 04:09:01 +02:00
|
|
|
md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
|
2000-09-22 20:31:23 +02:00
|
|
|
{
|
|
|
|
/* Take yet unprocessed bytes into account. */
|
|
|
|
md5_uint32 bytes = ctx->buflen;
|
2012-07-31 11:02:35 +02:00
|
|
|
md5_uint32 swap_bytes;
|
2000-09-22 20:31:23 +02:00
|
|
|
size_t pad;
|
|
|
|
|
|
|
|
/* Now count remaining bytes. */
|
|
|
|
ctx->total[0] += bytes;
|
|
|
|
if (ctx->total[0] < bytes)
|
|
|
|
++ctx->total[1];
|
|
|
|
|
|
|
|
pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
|
|
|
|
memcpy (&ctx->buffer[bytes], fillbuf, pad);
|
|
|
|
|
2012-07-31 11:02:35 +02:00
|
|
|
/* Put the 64-bit file length in *bits* at the end of the buffer.
|
|
|
|
Use memcpy to avoid aliasing problems. On most systems, this
|
|
|
|
will be optimized away to the same code. */
|
|
|
|
swap_bytes = SWAP (ctx->total[0] << 3);
|
|
|
|
memcpy (&ctx->buffer[bytes + pad], &swap_bytes, sizeof (swap_bytes));
|
|
|
|
swap_bytes = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
|
|
|
|
memcpy (&ctx->buffer[bytes + pad + 4], &swap_bytes, sizeof (swap_bytes));
|
2000-09-22 20:31:23 +02:00
|
|
|
|
|
|
|
/* Process last bytes. */
|
|
|
|
md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
|
|
|
|
|
|
|
|
return md5_read_ctx (ctx, resbuf);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compute MD5 message digest for bytes read from STREAM. The
|
|
|
|
resulting message digest number will be written into the 16 bytes
|
|
|
|
beginning at RESBLOCK. */
|
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
md5_stream (FILE *stream, void *resblock)
|
2000-09-22 20:31:23 +02:00
|
|
|
{
|
|
|
|
/* Important: BLOCKSIZE must be a multiple of 64. */
|
|
|
|
#define BLOCKSIZE 4096
|
|
|
|
struct md5_ctx ctx;
|
|
|
|
char buffer[BLOCKSIZE + 72];
|
|
|
|
size_t sum;
|
|
|
|
|
|
|
|
/* Initialize the computation context. */
|
|
|
|
md5_init_ctx (&ctx);
|
|
|
|
|
|
|
|
/* Iterate over full file contents. */
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
/* We read the file in blocks of BLOCKSIZE bytes. One call of the
|
|
|
|
computation function processes the whole buffer so that with the
|
|
|
|
next round of the loop another block can be read. */
|
|
|
|
size_t n;
|
|
|
|
sum = 0;
|
|
|
|
|
|
|
|
/* Read block. Take care for partial reads. */
|
|
|
|
do
|
|
|
|
{
|
|
|
|
n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
|
|
|
|
|
|
|
|
sum += n;
|
|
|
|
}
|
|
|
|
while (sum < BLOCKSIZE && n != 0);
|
|
|
|
if (n == 0 && ferror (stream))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* If end of file is reached, end the loop. */
|
|
|
|
if (n == 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Process buffer with BLOCKSIZE bytes. Note that
|
|
|
|
BLOCKSIZE % 64 == 0
|
|
|
|
*/
|
|
|
|
md5_process_block (buffer, BLOCKSIZE, &ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add the last bytes if necessary. */
|
|
|
|
if (sum > 0)
|
|
|
|
md5_process_bytes (buffer, sum, &ctx);
|
|
|
|
|
|
|
|
/* Construct result in desired memory. */
|
|
|
|
md5_finish_ctx (&ctx, resblock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
|
|
|
|
result is always in little endian byte order, so that a byte-wise
|
|
|
|
output yields to the wanted ASCII representation of the message
|
|
|
|
digest. */
|
|
|
|
void *
|
2005-03-28 04:09:01 +02:00
|
|
|
md5_buffer (const char *buffer, size_t len, void *resblock)
|
2000-09-22 20:31:23 +02:00
|
|
|
{
|
|
|
|
struct md5_ctx ctx;
|
|
|
|
|
|
|
|
/* Initialize the computation context. */
|
|
|
|
md5_init_ctx (&ctx);
|
|
|
|
|
|
|
|
/* Process whole buffer but last len % 64 bytes. */
|
|
|
|
md5_process_bytes (buffer, len, &ctx);
|
|
|
|
|
|
|
|
/* Put result in desired memory area. */
|
|
|
|
return md5_finish_ctx (&ctx, resblock);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2005-03-28 04:09:01 +02:00
|
|
|
md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
|
2000-09-22 20:31:23 +02:00
|
|
|
{
|
|
|
|
/* 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 = 128 - left_over > len ? len : 128 - left_over;
|
|
|
|
|
|
|
|
memcpy (&ctx->buffer[left_over], buffer, add);
|
|
|
|
ctx->buflen += add;
|
|
|
|
|
|
|
|
if (left_over + add > 64)
|
|
|
|
{
|
|
|
|
md5_process_block (ctx->buffer, (left_over + add) & ~63, ctx);
|
|
|
|
/* The regions in the following copy operation cannot overlap. */
|
|
|
|
memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
|
|
|
|
(left_over + add) & 63);
|
|
|
|
ctx->buflen = (left_over + add) & 63;
|
|
|
|
}
|
|
|
|
|
2002-09-20 15:45:20 +02:00
|
|
|
buffer = (const void *) ((const char *) buffer + add);
|
2000-09-22 20:31:23 +02:00
|
|
|
len -= add;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Process available complete blocks. */
|
|
|
|
if (len > 64)
|
|
|
|
{
|
2018-05-10 12:15:42 +02:00
|
|
|
#if !_STRING_ARCH_unaligned || defined UBSAN_BOOTSTRAP
|
2005-07-03 21:16:20 +02:00
|
|
|
/* 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)
|
|
|
|
{
|
2008-03-11 17:11:55 +01:00
|
|
|
memcpy (ctx->buffer, buffer, 64);
|
|
|
|
md5_process_block (ctx->buffer, 64, ctx);
|
2005-07-03 21:16:20 +02:00
|
|
|
buffer = (const char *) buffer + 64;
|
|
|
|
len -= 64;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
2011-09-23 22:01:11 +02:00
|
|
|
{
|
|
|
|
md5_process_block (buffer, len & ~63, ctx);
|
|
|
|
buffer = (const void *) ((const char *) buffer + (len & ~63));
|
|
|
|
len &= 63;
|
|
|
|
}
|
2000-09-22 20:31:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Move remaining bytes in internal buffer. */
|
|
|
|
if (len > 0)
|
|
|
|
{
|
|
|
|
memcpy (ctx->buffer, buffer, len);
|
|
|
|
ctx->buflen = len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* These are the four functions used in the four steps of the MD5 algorithm
|
|
|
|
and defined in the RFC 1321. The first function is a little bit optimized
|
|
|
|
(as found in Colin Plumbs public domain implementation). */
|
|
|
|
/* #define FF(b, c, d) ((b & c) | (~b & d)) */
|
|
|
|
#define FF(b, c, d) (d ^ (b & (c ^ d)))
|
|
|
|
#define FG(b, c, d) FF (d, b, c)
|
|
|
|
#define FH(b, c, d) (b ^ c ^ d)
|
|
|
|
#define FI(b, c, d) (c ^ (b | ~d))
|
|
|
|
|
|
|
|
/* Process LEN bytes of BUFFER, accumulating context into CTX.
|
|
|
|
It is assumed that LEN % 64 == 0. */
|
|
|
|
|
|
|
|
void
|
2005-03-28 04:09:01 +02:00
|
|
|
md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
|
2000-09-22 20:31:23 +02:00
|
|
|
{
|
|
|
|
md5_uint32 correct_words[16];
|
2002-09-20 15:45:20 +02:00
|
|
|
const md5_uint32 *words = (const md5_uint32 *) buffer;
|
2000-09-22 20:31:23 +02:00
|
|
|
size_t nwords = len / sizeof (md5_uint32);
|
|
|
|
const md5_uint32 *endp = words + nwords;
|
|
|
|
md5_uint32 A = ctx->A;
|
|
|
|
md5_uint32 B = ctx->B;
|
|
|
|
md5_uint32 C = ctx->C;
|
|
|
|
md5_uint32 D = ctx->D;
|
|
|
|
|
|
|
|
/* First increment the byte count. RFC 1321 specifies the possible
|
|
|
|
length of the file up to 2^64 bits. Here we only compute the
|
|
|
|
number of bytes. Do a double word increment. */
|
|
|
|
ctx->total[0] += len;
|
2013-01-31 09:10:38 +01:00
|
|
|
ctx->total[1] += ((len >> 31) >> 1) + (ctx->total[0] < len);
|
2000-09-22 20:31:23 +02:00
|
|
|
|
|
|
|
/* Process all bytes in the buffer with 64 bytes in each round of
|
|
|
|
the loop. */
|
|
|
|
while (words < endp)
|
|
|
|
{
|
|
|
|
md5_uint32 *cwp = correct_words;
|
|
|
|
md5_uint32 A_save = A;
|
|
|
|
md5_uint32 B_save = B;
|
|
|
|
md5_uint32 C_save = C;
|
|
|
|
md5_uint32 D_save = D;
|
|
|
|
|
|
|
|
/* First round: using the given function, the context and a constant
|
|
|
|
the next context is computed. Because the algorithms processing
|
|
|
|
unit is a 32-bit word and it is determined to work on words in
|
|
|
|
little endian byte order we perhaps have to change the byte order
|
|
|
|
before the computation. To reduce the work for the next steps
|
|
|
|
we store the swapped words in the array CORRECT_WORDS. */
|
|
|
|
|
|
|
|
#define OP(a, b, c, d, s, T) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
|
|
|
|
++words; \
|
|
|
|
CYCLIC (a, s); \
|
|
|
|
a += b; \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
/* It is unfortunate that C does not provide an operator for
|
|
|
|
cyclic rotation. Hope the C compiler is smart enough. */
|
|
|
|
#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
|
|
|
|
|
|
|
|
/* Before we start, one word to the strange constants.
|
|
|
|
They are defined in RFC 1321 as
|
|
|
|
|
|
|
|
T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Round 1. */
|
2001-05-09 22:08:48 +02:00
|
|
|
OP (A, B, C, D, 7, (md5_uint32) 0xd76aa478);
|
|
|
|
OP (D, A, B, C, 12, (md5_uint32) 0xe8c7b756);
|
|
|
|
OP (C, D, A, B, 17, (md5_uint32) 0x242070db);
|
|
|
|
OP (B, C, D, A, 22, (md5_uint32) 0xc1bdceee);
|
|
|
|
OP (A, B, C, D, 7, (md5_uint32) 0xf57c0faf);
|
|
|
|
OP (D, A, B, C, 12, (md5_uint32) 0x4787c62a);
|
|
|
|
OP (C, D, A, B, 17, (md5_uint32) 0xa8304613);
|
|
|
|
OP (B, C, D, A, 22, (md5_uint32) 0xfd469501);
|
|
|
|
OP (A, B, C, D, 7, (md5_uint32) 0x698098d8);
|
|
|
|
OP (D, A, B, C, 12, (md5_uint32) 0x8b44f7af);
|
|
|
|
OP (C, D, A, B, 17, (md5_uint32) 0xffff5bb1);
|
|
|
|
OP (B, C, D, A, 22, (md5_uint32) 0x895cd7be);
|
|
|
|
OP (A, B, C, D, 7, (md5_uint32) 0x6b901122);
|
|
|
|
OP (D, A, B, C, 12, (md5_uint32) 0xfd987193);
|
|
|
|
OP (C, D, A, B, 17, (md5_uint32) 0xa679438e);
|
|
|
|
OP (B, C, D, A, 22, (md5_uint32) 0x49b40821);
|
2000-09-22 20:31:23 +02:00
|
|
|
|
|
|
|
/* For the second to fourth round we have the possibly swapped words
|
|
|
|
in CORRECT_WORDS. Redefine the macro to take an additional first
|
|
|
|
argument specifying the function to use. */
|
|
|
|
#undef OP
|
2002-11-16 13:39:57 +01:00
|
|
|
#define OP(a, b, c, d, k, s, T) \
|
2000-09-22 20:31:23 +02:00
|
|
|
do \
|
|
|
|
{ \
|
2002-11-16 13:39:57 +01:00
|
|
|
a += FX (b, c, d) + correct_words[k] + T; \
|
2000-09-22 20:31:23 +02:00
|
|
|
CYCLIC (a, s); \
|
|
|
|
a += b; \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
|
2002-11-16 13:39:57 +01:00
|
|
|
#define FX(b, c, d) FG (b, c, d)
|
|
|
|
|
2000-09-22 20:31:23 +02:00
|
|
|
/* Round 2. */
|
2002-11-16 13:39:57 +01:00
|
|
|
OP (A, B, C, D, 1, 5, (md5_uint32) 0xf61e2562);
|
|
|
|
OP (D, A, B, C, 6, 9, (md5_uint32) 0xc040b340);
|
|
|
|
OP (C, D, A, B, 11, 14, (md5_uint32) 0x265e5a51);
|
|
|
|
OP (B, C, D, A, 0, 20, (md5_uint32) 0xe9b6c7aa);
|
|
|
|
OP (A, B, C, D, 5, 5, (md5_uint32) 0xd62f105d);
|
|
|
|
OP (D, A, B, C, 10, 9, (md5_uint32) 0x02441453);
|
|
|
|
OP (C, D, A, B, 15, 14, (md5_uint32) 0xd8a1e681);
|
|
|
|
OP (B, C, D, A, 4, 20, (md5_uint32) 0xe7d3fbc8);
|
|
|
|
OP (A, B, C, D, 9, 5, (md5_uint32) 0x21e1cde6);
|
|
|
|
OP (D, A, B, C, 14, 9, (md5_uint32) 0xc33707d6);
|
|
|
|
OP (C, D, A, B, 3, 14, (md5_uint32) 0xf4d50d87);
|
|
|
|
OP (B, C, D, A, 8, 20, (md5_uint32) 0x455a14ed);
|
|
|
|
OP (A, B, C, D, 13, 5, (md5_uint32) 0xa9e3e905);
|
|
|
|
OP (D, A, B, C, 2, 9, (md5_uint32) 0xfcefa3f8);
|
|
|
|
OP (C, D, A, B, 7, 14, (md5_uint32) 0x676f02d9);
|
|
|
|
OP (B, C, D, A, 12, 20, (md5_uint32) 0x8d2a4c8a);
|
|
|
|
|
|
|
|
#undef FX
|
|
|
|
#define FX(b, c, d) FH (b, c, d)
|
2000-09-22 20:31:23 +02:00
|
|
|
|
|
|
|
/* Round 3. */
|
2002-11-16 13:39:57 +01:00
|
|
|
OP (A, B, C, D, 5, 4, (md5_uint32) 0xfffa3942);
|
|
|
|
OP (D, A, B, C, 8, 11, (md5_uint32) 0x8771f681);
|
|
|
|
OP (C, D, A, B, 11, 16, (md5_uint32) 0x6d9d6122);
|
|
|
|
OP (B, C, D, A, 14, 23, (md5_uint32) 0xfde5380c);
|
|
|
|
OP (A, B, C, D, 1, 4, (md5_uint32) 0xa4beea44);
|
|
|
|
OP (D, A, B, C, 4, 11, (md5_uint32) 0x4bdecfa9);
|
|
|
|
OP (C, D, A, B, 7, 16, (md5_uint32) 0xf6bb4b60);
|
|
|
|
OP (B, C, D, A, 10, 23, (md5_uint32) 0xbebfbc70);
|
|
|
|
OP (A, B, C, D, 13, 4, (md5_uint32) 0x289b7ec6);
|
|
|
|
OP (D, A, B, C, 0, 11, (md5_uint32) 0xeaa127fa);
|
|
|
|
OP (C, D, A, B, 3, 16, (md5_uint32) 0xd4ef3085);
|
|
|
|
OP (B, C, D, A, 6, 23, (md5_uint32) 0x04881d05);
|
|
|
|
OP (A, B, C, D, 9, 4, (md5_uint32) 0xd9d4d039);
|
|
|
|
OP (D, A, B, C, 12, 11, (md5_uint32) 0xe6db99e5);
|
|
|
|
OP (C, D, A, B, 15, 16, (md5_uint32) 0x1fa27cf8);
|
|
|
|
OP (B, C, D, A, 2, 23, (md5_uint32) 0xc4ac5665);
|
|
|
|
|
|
|
|
#undef FX
|
|
|
|
#define FX(b, c, d) FI (b, c, d)
|
2000-09-22 20:31:23 +02:00
|
|
|
|
|
|
|
/* Round 4. */
|
2002-11-16 13:39:57 +01:00
|
|
|
OP (A, B, C, D, 0, 6, (md5_uint32) 0xf4292244);
|
|
|
|
OP (D, A, B, C, 7, 10, (md5_uint32) 0x432aff97);
|
|
|
|
OP (C, D, A, B, 14, 15, (md5_uint32) 0xab9423a7);
|
|
|
|
OP (B, C, D, A, 5, 21, (md5_uint32) 0xfc93a039);
|
|
|
|
OP (A, B, C, D, 12, 6, (md5_uint32) 0x655b59c3);
|
|
|
|
OP (D, A, B, C, 3, 10, (md5_uint32) 0x8f0ccc92);
|
|
|
|
OP (C, D, A, B, 10, 15, (md5_uint32) 0xffeff47d);
|
|
|
|
OP (B, C, D, A, 1, 21, (md5_uint32) 0x85845dd1);
|
|
|
|
OP (A, B, C, D, 8, 6, (md5_uint32) 0x6fa87e4f);
|
|
|
|
OP (D, A, B, C, 15, 10, (md5_uint32) 0xfe2ce6e0);
|
|
|
|
OP (C, D, A, B, 6, 15, (md5_uint32) 0xa3014314);
|
|
|
|
OP (B, C, D, A, 13, 21, (md5_uint32) 0x4e0811a1);
|
|
|
|
OP (A, B, C, D, 4, 6, (md5_uint32) 0xf7537e82);
|
|
|
|
OP (D, A, B, C, 11, 10, (md5_uint32) 0xbd3af235);
|
|
|
|
OP (C, D, A, B, 2, 15, (md5_uint32) 0x2ad7d2bb);
|
|
|
|
OP (B, C, D, A, 9, 21, (md5_uint32) 0xeb86d391);
|
2000-09-22 20:31:23 +02:00
|
|
|
|
|
|
|
/* Add the starting values of the context. */
|
|
|
|
A += A_save;
|
|
|
|
B += B_save;
|
|
|
|
C += C_save;
|
|
|
|
D += D_save;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Put checksum in context given as argument. */
|
|
|
|
ctx->A = A;
|
|
|
|
ctx->B = B;
|
|
|
|
ctx->C = C;
|
|
|
|
ctx->D = D;
|
|
|
|
}
|