int len -> size_t len

fixed calls to `krb5_{en,de}crypt'


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2023 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/krb5/get_in_tkt.c

@@ -15,6 +15,7 @@ decrypt_tkt (krb5_context context,
     ret = krb5_decrypt (context,
 			dec_rep->part1.enc_part.cipher.data,
 			dec_rep->part1.enc_part.cipher.length,
+			dec_rep->part1.enc_part.etype,
 			key,
 			&data);
     if (ret)
@@ -52,7 +53,7 @@ extract_ticket(krb5_context context,
     /*     krb5_principal_free (rep.part1.cname);*/
     {
 	char buf[1024];
-	int len;
+	size_t len;
 	encode_Ticket(buf + sizeof(buf) - 1, sizeof(buf), 
 			    &rep->part1.ticket, &len);
 	creds->ticket.data = malloc(len);
@@ -250,6 +251,7 @@ krb5_get_in_tkt(krb5_context context,
 	ret = krb5_encrypt (context,
 			    buf + sizeof(buf) - len,
 			    len,
+			    encdata.etype,
 			    key,
 			    &encdata.cipher);
 	if (ret)

lib/krb5/mk_safe.c

@@ -1,5 +1,4 @@
 #include <krb5_locl.h>
-#include "md4.h"
 
 RCSID("$Id$");
 
@@ -16,7 +15,7 @@ krb5_mk_safe(krb5_context context,
   unsigned usec;
   krb5_addresses addr;
   u_char buf[1024];
-  int len;
+  size_t len;
 
   r = krb5_create_checksum (context,
 			    CKSUMTYPE_RSA_MD4,

lib/krb5/rd_rep.c

@@ -10,10 +10,9 @@ krb5_rd_rep(krb5_context context,
 {
   krb5_error_code ret;
   AP_REP ap_rep;
-  int len;
+  size_t len;
   des_key_schedule schedule;
   char *buf;
-  int i;
   krb5_data data;
 
   ret = decode_AP_REP(inbuf->data, inbuf->length, &ap_rep, &len);
@@ -27,6 +26,7 @@ krb5_rd_rep(krb5_context context,
   ret = krb5_decrypt (context,
 		      ap_rep.enc_part.cipher.data,
 		      ap_rep.enc_part.cipher.length,
+		      ap_rep.enc_part.etype,
 		      &auth_context->key,
 		      &data);
   if (ret)
@@ -38,7 +38,7 @@ krb5_rd_rep(krb5_context context,
   ret = decode_EncAPRepPart(data.data,
 			    data.length,
 			    *repl, 
-			    &i);
+			    &len);
   if (ret)
       return ret;
   if ((*repl)->ctime != auth_context->authenticator->ctime ||

lib/krb5/rd_req.c

@@ -10,9 +10,13 @@ decrypt_tkt_enc_part (krb5_context context,
 {
     krb5_error_code ret;
     krb5_data plain;
-    int len;
+    size_t len;
 
-    ret = krb5_decrypt (context, enc_part->cipher.data, enc_part->cipher.length, key, &plain);
+    ret = krb5_decrypt (context,
+			enc_part->cipher.data,
+			enc_part->cipher.length,
+			enc_part->etype,
+			key, &plain);
     if (ret)
 	return ret;
 
@@ -33,7 +37,11 @@ decrypt_authenticator (krb5_context context,
     krb5_data plain;
     size_t len;
 
-    ret = krb5_decrypt (context, enc_part->cipher.data, enc_part->cipher.length, key, &plain);
+    ret = krb5_decrypt (context,
+			enc_part->cipher.data,
+			enc_part->cipher.length,
+			enc_part->etype,
+			key, &plain);
     if (ret)
 	return ret;
 
@@ -55,7 +63,7 @@ krb5_rd_req_with_keyblock(krb5_context context,
 {
   krb5_error_code ret;
   AP_REQ ap_req;
-  int len;
+  size_t len;
   struct timeval now;
 
   if (*auth_context == NULL) {