projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Improve wording in relocatable-maint.texi.
[gnulib.git]
/
lib
/
md4.c
diff --git
a/lib/md4.c
b/lib/md4.c
index
aaa82e2
..
e1079b6
100644
(file)
--- a/
lib/md4.c
+++ b/
lib/md4.c
@@
-1,6
+1,6
@@
/* Functions to compute MD4 message digest of files or memory blocks.
according to the definition of MD4 in RFC 1320 from April 1992.
/* Functions to compute MD4 message digest of files or memory blocks.
according to the definition of MD4 in RFC 1320 from April 1992.
- Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-201
1
Free Software
+ Copyright (C) 1995-1997, 1999-2003, 2005-2006, 2008-201
3
Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
@@
-14,8
+14,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* Adapted by Simon Josefsson from gnulib md5.? and Libgcrypt
cipher/md4.c . */
/* Adapted by Simon Josefsson from gnulib md5.? and Libgcrypt
cipher/md4.c . */
@@
-24,8
+23,8
@@
#include "md4.h"
#include "md4.h"
-#include <std
def
.h>
-#include <std
lib
.h>
+#include <std
align
.h>
+#include <std
int
.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
@@
-68,7
+67,7
@@
md4_init_ctx (struct md4_ctx *ctx)
/* Copy the 4 byte value from v into the memory location pointed to by *cp,
If your architecture allows unaligned access this is equivalent to
* (uint32_t *) cp = v */
/* Copy the 4 byte value from v into the memory location pointed to by *cp,
If your architecture allows unaligned access this is equivalent to
* (uint32_t *) cp = v */
-static
inline
void
+static void
set_uint32 (char *cp, uint32_t v)
{
memcpy (cp, &v, sizeof v);
set_uint32 (char *cp, uint32_t v)
{
memcpy (cp, &v, sizeof v);
@@
-239,14
+238,7
@@
md4_process_bytes (const void *buffer, size_t len, struct md4_ctx *ctx)
if (len >= 64)
{
#if !_STRING_ARCH_unaligned
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 alignof(type) offsetof (struct { char c; type x; }, x)
-# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
-# endif
+# define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0)
if (UNALIGNED_P (buffer))
while (len > 64)
{
if (UNALIGNED_P (buffer))
while (len > 64)
{
@@
-309,13
+301,13
@@
md4_process_block (const void *buffer, size_t len, struct md4_ctx *ctx)
uint32_t B = ctx->B;
uint32_t C = ctx->C;
uint32_t D = ctx->D;
uint32_t B = ctx->B;
uint32_t C = ctx->C;
uint32_t D = ctx->D;
+ uint32_t lolen = len;
/* First increment the byte count. RFC 1320 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. */
/* First increment the byte count. RFC 1320 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;
- if (ctx->total[0] < len)
- ++ctx->total[1];
+ ctx->total[0] += lolen;
+ ctx->total[1] += (len >> 31 >> 1) + (ctx->total[0] < lolen);
/* Process all bytes in the buffer with 64 bytes in each round of
the loop. */
/* Process all bytes in the buffer with 64 bytes in each round of
the loop. */