RFC draft protocol changes and related cleanups

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

5 files changed, 14 insertions, 20 deletions

diff --git a/src/lib/crypto/crc32/crc.c b/src/lib/crypto/crc32/crc.c
index be63e0066..d55301927 100644
--- a/src/lib/crypto/crc32/crc.c
+++ b/src/lib/crypto/crc32/crc.c
@@ -149,13 +149,6 @@ krb5_checksum *outcksum;
     register int idx;
     int i;
 
-    data = (u_char *)seed;
-    for (i=0; i<seed_length;i++) {
-	idx = (data[i] ^ c);
-	idx &= 0xff;
-	c >>= 8;
-	c ^= crc_table[idx];
-    }
     data = (u_char *)in;
     for (i=0; i<in_length;i++) {
 	idx = (data[i] ^ c);
@@ -177,4 +170,6 @@ krb5_checksum *outcksum;
 krb5_checksum_entry crc32_cksumtable_entry = {
     crc32_sum_func,
     CRC32_CKSUM_LENGTH, /* CRC-32 is 4 octets */
+    0,					/* not collision proof */
+    0,					/* doesn't use key */
 };
diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h
index 09fb53a7f..911ca2957 100644
--- a/src/lib/crypto/des/des_int.h
+++ b/src/lib/crypto/des/des_int.h
@@ -160,7 +160,7 @@ extern krb5_error_code mit_des_random_key
 /* string2key.c */
 extern krb5_error_code mit_des_string_to_key
     PROTOTYPE((const krb5_keytype, krb5_keyblock *, const krb5_data *,
-	       krb5_const_principal ));
+	       const krb5_data *));
 
 /* weak_key.c */
 extern int mit_des_is_weak_key PROTOTYPE((mit_des_cblock ));
diff --git a/src/lib/crypto/des/new_rn_key.c b/src/lib/crypto/des/new_rn_key.c
index 3e72740a3..e0fd7b9af 100644
--- a/src/lib/crypto/des/new_rn_key.c
+++ b/src/lib/crypto/des/new_rn_key.c
@@ -78,7 +78,6 @@ void mit_des_init_random_number_generator(key,p_seed)
 	krb5_int32 seconds;
 	krb5_int32 microseconds;
     } timenow;
-    krb5_ui_2 msec;
     mit_des_cblock new_key;
 
     krb5_address **addrs;
@@ -120,8 +119,8 @@ void mit_des_init_random_number_generator(key,p_seed)
      * use a time stamp to ensure that a server started later does not reuse
      * an old stream:
      */
-    (void) krb5_ms_timeofday(&timenow.seconds, &msec); /* XXX return value */
-    timenow.microseconds = msec * 1000;
+    (void) krb5_us_timeofday(&timenow.seconds,
+			     &timenow.microseconds); /* XXX return value */
     mit_des_set_sequence_number((unsigned char *)&timenow, p_seed);
 
     /*
diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c
index d505aedda..d21443ab4 100644
--- a/src/lib/crypto/des/string2key.c
+++ b/src/lib/crypto/des/string2key.c
@@ -34,7 +34,7 @@ extern int des_debug;
 	It is the responsibility of the caller to release this storage
 	when the generated key no longer needed.
 
-	The routine may use "princ" to seed or alter the conversion
+	The routine may use "salt" to seed or alter the conversion
 	algorithm.
 
 	If the particular function called does not know how to make a
@@ -46,11 +46,11 @@ extern int des_debug;
 krb5_error_code mit_des_string_to_key (DECLARG(const krb5_keytype, keytype),
 				       DECLARG(krb5_keyblock *,keyblock),
 				       DECLARG(const krb5_data *,data),
-				       DECLARG(krb5_const_principal, princ))
+				       DECLARG(const krb5_data *, salt))
 OLDDECLARG(const krb5_keytype, keytype)
 OLDDECLARG(krb5_keyblock *,keyblock)
 OLDDECLARG(const krb5_data *,data)
-OLDDECLARG(krb5_const_principal, princ)
+OLDDECLARG(const krb5_data *, salt)
 {
     char copystr[512];
 
@@ -81,15 +81,13 @@ OLDDECLARG(krb5_const_principal, princ)
     keyblock->length = sizeof(mit_des_cblock);
     key = keyblock->contents;
 
+    /* XXX todo: make it work in face of embedded NUL's */
     memset(copystr, 0, sizeof(copystr));
     j = min(data->length, 511);
     (void) strncpy(copystr, data->data, j);
-    if ( princ != 0 )
-	for (i=0; princ[i] != 0 && j < 511; i++) {
-	    (void) strncpy(copystr+j, princ[i]->data, 
-			   min(princ[i]->length, 511-j));
-	    j += min(princ[i]->length, 511-j);
-	}
+    if (salt) {
+	strncpy (copystr + j, salt->data, min(salt->length, 511-j));
+    }
 
     /* convert copystr to des key */
     forward = 1;
diff --git a/src/lib/crypto/md4/md4glue.c b/src/lib/crypto/md4/md4glue.c
index 5104d50d2..51f2a2977 100644
--- a/src/lib/crypto/md4/md4glue.c
+++ b/src/lib/crypto/md4/md4glue.c
@@ -58,4 +58,6 @@ krb5_checksum *outcksum;
 krb5_checksum_entry crc32_cksumtable_entry = {
     md4_sum_func,
     RSA_MD4_CKSUM_LENGTH, /* CRC-32 is 4 octets */
+    1,					/* is collision proof */
+    0,					/* doesn't use key */
 };