diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 18:26:36 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 18:26:36 +0000 |
| commit | 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (patch) | |
| tree | 2ea1f8305970753e4a657acb2ccc15ca3eec8e2c /crypt | |
| parent | 7d58530341304d403a6626d7f7a1913165fe2f32 (diff) | |
2.5-18.1
Diffstat (limited to 'crypt')
| -rw-r--r-- | crypt/Makefile | 8 | ||||
| -rw-r--r-- | crypt/crypt_util.c | 2 | ||||
| -rw-r--r-- | crypt/md5.c | 5 | ||||
| -rw-r--r-- | crypt/md5.h | 6 |
4 files changed, 12 insertions, 9 deletions
diff --git a/crypt/Makefile b/crypt/Makefile index af088f1e6c..575221a1c5 100644 --- a/crypt/Makefile +++ b/crypt/Makefile @@ -23,17 +23,15 @@ subdir := crypt headers := crypt.h -distribute := md5.h - extra-libs := libcrypt extra-libs-others := $(extra-libs) libcrypt-routines := crypt-entry md5-crypt md5 crypt crypt_util -tests = cert md5test md5c-test +tests := cert md5test md5c-test -distribute = ufc-crypt.h crypt-private.h ufc.c speeds.c README.ufc-crypt \ - Banner md5.h +distribute := ufc-crypt.h crypt-private.h ufc.c speeds.c README.ufc-crypt \ + Banner md5.h include ../Makeconfig diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c index 5467a97b8a..0db5be7b0f 100644 --- a/crypt/crypt_util.c +++ b/crypt/crypt_util.c @@ -902,7 +902,7 @@ __setkey_r(__key, __data) c = c << 1 | *__key++; ktab[i] = c >> 1; } - _ufc_mk_keytab_r(ktab, __data); + _ufc_mk_keytab_r((char *) ktab, __data); } weak_alias (__setkey_r, setkey_r) diff --git a/crypt/md5.c b/crypt/md5.c index 04bce5ab37..922e7cc7e9 100644 --- a/crypt/md5.c +++ b/crypt/md5.c @@ -1,6 +1,7 @@ /* Functions to compute MD5 message digest of files or memory blocks. according to the definition of MD5 in RFC 1321 from April 1992. - Copyright (C) 1995,1996,1997,1999,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1999,2000,2001,2005 + 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 @@ -31,7 +32,7 @@ # include <string.h> #else # ifndef HAVE_MEMCPY -# define memcpy(d, s, n) bcopy ((s), (d), (n)) +# define memcpy(d, s, n) (bcopy ((s), (d), (n)), (d)) # endif #endif diff --git a/crypt/md5.h b/crypt/md5.h index 35088f29fe..b474a84b8b 100644 --- a/crypt/md5.h +++ b/crypt/md5.h @@ -1,6 +1,7 @@ /* Declaration of functions and data types used for MD5 sum computing library functions. - Copyright (C) 1995-1997,1999,2000,2001,2004 Free Software Foundation, Inc. + Copyright (C) 1995-1997,1999,2000,2001,2004,2005 + 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 @@ -27,6 +28,9 @@ # include <limits.h> #endif +#define MD5_DIGEST_SIZE 16 +#define MD5_BLOCK_SIZE 64 + /* The following contortions are an attempt to use the C preprocessor to determine an unsigned integral type that is 32 bits wide. An alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but |