Fix Windows lint flames. (16bit vs. 32bit issues)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7687 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index d9910561e85992d937ea7d492ca630ebfdd93be9..cbfdcf37ee86d95bd5ba20fde8491018b8eb06ba 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 20 22:33:40 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+       * u_nfold.c (mit_des_n_fold): 
+       * d3_str2ky.c (mit_des3_string_to_key): Fix Windows lint flames.
+
 Mon Mar 11 11:03:23 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * new_rn_key.c (mit_des_generate_random_block): Add const keywrod

diff --git a/src/lib/crypto/des/d3_str2ky.c b/src/lib/crypto/des/d3_str2ky.c
index 8e64ad4d9e76cba3b129ee22f3d96d1916627f0a..c2a27901b3ed60dd6c1cdacf65f748517275ab7b 100644 (file)
--- a/src/lib/crypto/des/d3_str2ky.c
+++ b/src/lib/crypto/des/d3_str2ky.c
@@ -43,11 +43,11 @@ krb5_keyblock FAR * keyblock;
 const krb5_data FAR * data;
 const krb5_data FAR * salt;
 {
-    register char *str, *copystr;
-    register mit_des_cblock *key;
-    register int j;
+    char *copystr;
+    mit_des_cblock *key;
+    unsigned int j;
 
-    register long length;
+    int length;
     mit_des3_key_schedule ks;
     krb5_enctype enctype = eblock->crypto_entry->proto_enctype;
 

diff --git a/src/lib/crypto/des/u_nfold.c b/src/lib/crypto/des/u_nfold.c
index 63eb0e29a715ffddbaff099c42bcbb5c48a53f7d..38829e0ed00be188e0fd54de8a24813942b172a2 100644 (file)
--- a/src/lib/crypto/des/u_nfold.c
+++ b/src/lib/crypto/des/u_nfold.c
@@ -66,8 +66,7 @@ mit_des_n_fold(inbuf, inlen, outbuf, outlen)
 #endif
 
     do {
-       int j;
-       register unsigned int k;
+       unsigned int j, k;
 
        /* Rotate input */
        k = ((bytes/inlen) * ROTATE_VALUE) % (inlen*8);
@@ -84,8 +83,9 @@ mit_des_n_fold(inbuf, inlen, outbuf, outlen)
        }
        j = bytes % outlen;
        while (k) {
-           if (j-- == 0)
-               j += outlen;
+           if (j == 0)
+               j = outlen;
+           j--;
            k += outbuf[j];
            outbuf[j] = k & 0xff;
            k >>= 8;