diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-01-22 03:49:56 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-01-22 03:49:56 +0000 |
| commit | 41ff7485d2775407c85fb2b90b26c3170b2ad4b5 (patch) | |
| tree | 7df399eaecf500c53aa731a454f0d7892672aed5 /src/lib/crypto/md5 | |
| parent | 914f75cb840b0282bb73d821e7c9c81d05cada29 (diff) | |
| download | krb5-41ff7485d2775407c85fb2b90b26c3170b2ad4b5.tar.gz krb5-41ff7485d2775407c85fb2b90b26c3170b2ad4b5.tar.xz krb5-41ff7485d2775407c85fb2b90b26c3170b2ad4b5.zip | |
Various changes to:
* make most non-changing data const
* silence "gcc -Wall -Werror" complaints on sparc-solaris2.6
** delete unused functions and variables
** change if(a=b) ... to if((a=b)) or if((a=b)!=0) [yeah, kinda gratuitous]
** insert extra braces for 2-D arrays
* some basic thread safety checks
Not changing afsstring2key.c until I make sure I've got some tests for it.
Currently, prng.c and afsstring2key.c, at least, still aren't thread-safe.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11959 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/md5')
| -rw-r--r-- | src/lib/crypto/md5/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/crypto/md5/md5.c | 6 | ||||
| -rw-r--r-- | src/lib/crypto/md5/rsa-md5.h | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index 6d421ac83..a812839f7 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,10 @@ +2000-01-21 Ken Raeburn <raeburn@mit.edu> + + * md5.c (PADDING): Now const. + (krb5_MD5Update): Argument inBuf now points to const. + (ROTATE_LEFT): Change (a&b|c) construct to silence gcc warning. + * rsa-md5.h (krb5_MD5Update): Update decl. + 1999-10-26 Tom Yu <tlyu@mit.edu> * Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES, diff --git a/src/lib/crypto/md5/md5.c b/src/lib/crypto/md5/md5.c index 95efb77e4..d480d7e09 100644 --- a/src/lib/crypto/md5/md5.c +++ b/src/lib/crypto/md5/md5.c @@ -58,7 +58,7 @@ /* forward declaration */ static void Transform KRB5_PROTOTYPE((krb5_ui_4 FAR *buf, krb5_ui_4 FAR *in)); -static unsigned char PADDING[64] = { +static const unsigned char PADDING[64] = { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -76,7 +76,7 @@ static unsigned char PADDING[64] = { #define I(x, y, z) ((y) ^ ((x) | (~z))) /* ROTATE_LEFT rotates x left n bits */ -#define ROTATE_LEFT(x, n) (((x) << (n)) & 0xffffffff | ((x) >> (32-(n)))) +#define ROTATE_LEFT(x, n) ((((x) << (n)) & 0xffffffff) | ((x) >> (32-(n)))) /* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */ /* Rotation is separate from addition to prevent recomputation */ @@ -133,7 +133,7 @@ krb5_MD5_CTX FAR *mdContext; void krb5_MD5Update (mdContext, inBuf, inLen) krb5_MD5_CTX FAR *mdContext; -unsigned char FAR *inBuf; +const unsigned char FAR *inBuf; unsigned int inLen; { krb5_ui_4 in[16]; diff --git a/src/lib/crypto/md5/rsa-md5.h b/src/lib/crypto/md5/rsa-md5.h index 9c799da32..484830c55 100644 --- a/src/lib/crypto/md5/rsa-md5.h +++ b/src/lib/crypto/md5/rsa-md5.h @@ -50,7 +50,7 @@ typedef struct { #if (defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)) && !defined(KRB5_NO_PROTOTYPES) extern void krb5_MD5Init(krb5_MD5_CTX FAR *); -extern void krb5_MD5Update(krb5_MD5_CTX FAR *,unsigned char FAR *,unsigned int); +extern void krb5_MD5Update(krb5_MD5_CTX FAR *,const unsigned char FAR *,unsigned int); extern void krb5_MD5Final(krb5_MD5_CTX FAR *); #else extern void krb5_MD5Init(); |