diff options
| author | John Gilmore <gnu@toad.com> | 1995-03-28 23:42:20 +0000 |
|---|---|---|
| committer | John Gilmore <gnu@toad.com> | 1995-03-28 23:42:20 +0000 |
| commit | 40192fcec11733256786840895c56d46d65cd268 (patch) | |
| tree | 5abda6e987355dba30859436420ca7db57c3f7ce /src/lib/crypto/des/f_cksum.c | |
| parent | aafb84055ee571f734b71fd66b683ec36f746b4a (diff) | |
| download | krb5-40192fcec11733256786840895c56d46d65cd268.tar.gz krb5-40192fcec11733256786840895c56d46d65cd268.tar.xz krb5-40192fcec11733256786840895c56d46d65cd268.zip | |
Bring in portability fixes from Cygnus K4 release
* f_cbc.c, f_cksum.c, f_pcbc.c: Replace individual casts with
simpler solution.
* f_tables.h: Insert debugging code, and circumvention for MPW
compiler bug.
* key_sched.c: Remove ancient (microvax??!) comments, and dup
prototype.
* verify.c: Small hack for MS-Windows scrolling. Fix spelling.
"register x" -> "register int x".
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5288 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/des/f_cksum.c')
| -rw-r--r-- | src/lib/crypto/des/f_cksum.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/crypto/des/f_cksum.c b/src/lib/crypto/des/f_cksum.c index 2514a0f9e1..05c94c5372 100644 --- a/src/lib/crypto/des/f_cksum.c +++ b/src/lib/crypto/des/f_cksum.c @@ -63,14 +63,14 @@ mit_des_cbc_cksum(in, out, length, schedule, ivec) * forward. Otherwise we have to fart around. */ if (len >= 8) { - left ^= ((unsigned KRB_INT32) ((*ip++) & 0xff)) << 24; - left ^= ((unsigned KRB_INT32) ((*ip++) & 0xff)) << 16; - left ^= ((unsigned KRB_INT32) ((*ip++) & 0xff)) << 8; - left ^= ((unsigned KRB_INT32) ((*ip++) & 0xff)); - right ^= ((unsigned KRB_INT32) ((*ip++) & 0xff)) << 24; - right ^= ((unsigned KRB_INT32) ((*ip++) & 0xff)) << 16; - right ^= ((unsigned KRB_INT32) ((*ip++) & 0xff)) << 8; - right ^= ((unsigned KRB_INT32) ((*ip++) & 0xff)); + left ^= ((*ip++) & FF_UINT32) << 24; + left ^= ((*ip++) & FF_UINT32) << 16; + left ^= ((*ip++) & FF_UINT32) << 8; + left ^= (*ip++) & FF_UINT32; + right ^= ((*ip++) & FF_UINT32) << 24; + right ^= ((*ip++) & FF_UINT32) << 16; + right ^= ((*ip++) & FF_UINT32) << 8; + right ^= (*ip++) & FF_UINT32; len -= 8; } else { /* @@ -81,19 +81,19 @@ mit_des_cbc_cksum(in, out, length, schedule, ivec) ip += (int) len; switch(len) { case 7: - right ^= ((unsigned KRB_INT32) (*(--ip) & 0xff)) << 8; + right ^= (*(--ip) & FF_UINT32) << 8; case 6: - right ^= ((unsigned KRB_INT32) (*(--ip) & 0xff)) << 16; + right ^= (*(--ip) & FF_UINT32) << 16; case 5: - right ^= ((unsigned KRB_INT32) (*(--ip) & 0xff)) << 24; + right ^= (*(--ip) & FF_UINT32) << 24; case 4: - left ^= ((unsigned KRB_INT32) (*(--ip) & 0xff)); + left ^= *(--ip) & FF_UINT32; case 3: - left ^= ((unsigned KRB_INT32) (*(--ip) & 0xff)) << 8; + left ^= (*(--ip) & FF_UINT32) << 8; case 2: - left ^= ((unsigned KRB_INT32) (*(--ip) & 0xff)) << 16; + left ^= (*(--ip) & FF_UINT32) << 16; case 1: - left ^= ((unsigned KRB_INT32) (*(--ip) & 0xff)) << 24; + left ^= (*(--ip) & FF_UINT32) << 24; break; } len = 0; |