* afsstring2key.c (krb5_afs_encrypt): Drop EDFLAG as an argument, make it local

instead, since we always pass 0.
(afs_crypt): Call changed.
(krb5_afs_crypt_setkey, krb5_afs_encrypt): Use memcpy.

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

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index e537e3c26c6b460a63f7c965e74d3f69c130e83a..ae28fa253c86ca0ea824ef8ba75b87647e27f137 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * afsstring2key.c (krb5_afs_encrypt): Drop EDFLAG as an argument,
+       make it local instead, since we always pass 0.
+       (afs_crypt): Call changed.
+       (krb5_afs_crypt_setkey, krb5_afs_encrypt): Use memcpy.
+
 2003-12-19  Ken Raeburn  <raeburn@mit.edu>
 
        * f_cbc.c (mit_des_zeroblock): Define, as a single cblock, not the

diff --git a/src/lib/crypto/des/afsstring2key.c b/src/lib/crypto/des/afsstring2key.c
index 0fe65ba01e3b2b34d910d791c9fcc0f7dcbfac23..264414b760e114e5d5764047191daa6a9ea4fbc1 100644 (file)
--- a/src/lib/crypto/des/afsstring2key.c
+++ b/src/lib/crypto/des/afsstring2key.c
@@ -188,7 +188,7 @@ mit_afs_string_to_key (keyblock, data, salt)
  */
 
 static void krb5_afs_crypt_setkey (char*, char*, char(*)[48]);
-static void krb5_afs_encrypt (char*,long,char*,char (*)[48]);
+static void krb5_afs_encrypt (char*,char*,char (*)[48]);
 
 /*
  * Initial permutation,
@@ -382,7 +382,7 @@ char *afs_crypt(pw, salt, iobuf)
                }
        
        for(i=0; i<25; i++)
-               krb5_afs_encrypt(block,0,E,KS);
+               krb5_afs_encrypt(block,E,KS);
        
        for(i=0; i<11; i++){
                c = 0;
@@ -454,20 +454,24 @@ static void krb5_afs_crypt_setkey(key, E, KS)
                }
        }
  
+#if 0
        for(i=0;i<48;i++) {
                E[i] = e[i];
        }
+#else
+       memcpy(E, e, 48);
+#endif
 }
  
 /*
  * The payoff: encrypt a block.
  */
  
-static void krb5_afs_encrypt(block, edflag, E, KS)
+static void krb5_afs_encrypt(block, E, KS)
      char *block;
-     long edflag;
      char *E, (*KS)[48];
 {
+       const long edflag = 0;
        int i, ii;
        int t, j, k;
        char tempL[32];
@@ -502,8 +506,12 @@ static void krb5_afs_encrypt(block, edflag, E, KS)
                 * Save the R array,
                 * which will be the new L.
                 */
+#if 0
                for (j=0; j<32; j++)
                        tempL[j] = R[j];
+#else
+               memcpy(tempL, R, 32);
+#endif
                /*
                 * Expand R to 48 bits using the E selector;
                 * exclusive-or with the current key bits.
@@ -545,8 +553,12 @@ static void krb5_afs_encrypt(block, edflag, E, KS)
                 * Finally, the new L (the original R)
                 * is copied back.
                 */
+#if 0
                for (j=0; j<32; j++)
                        L[j] = tempL[j];
+#else
+               memcpy(L, tempL, 32);
+#endif
        }
        /*
         * The output L and R are reversed.