const and char cleanup

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

lib/krb5/build_ap_req.c

@@ -71,7 +71,8 @@ krb5_build_ap_req (krb5_context context,
 
   ret->length = length_AP_REQ(&ap);
   ret->data = malloc(ret->length);
-  encode_AP_REQ((char *)ret->data + ret->length - 1, ret->length, &ap, &len);
+  encode_AP_REQ((unsigned char *)ret->data + ret->length - 1,
+		ret->length, &ap, &len);
   free_AP_REQ(&ap);
   
   return 0;

lib/krb5/build_auth.c

@@ -49,7 +49,7 @@ krb5_build_authenticator (krb5_context context,
 			  krb5_data *result)
 {
   Authenticator *auth;
-  char buf[1024];
+  unsigned char buf[1024];
   size_t len;
   krb5_error_code ret;
   krb5_enctype enctype;

lib/krb5/get_in_tkt.c

@@ -145,7 +145,7 @@ _krb5_extract_ticket(krb5_context context,
     
     /* extract ticket */
     {
-	char buf[1024];
+	unsigned char buf[1024];
 	size_t len;
 	encode_Ticket(buf + sizeof(buf) - 1, sizeof(buf), 
 			    &rep->part1.ticket, &len);

lib/krb5/store.c

@@ -170,7 +170,8 @@ krb5_ret_data(krb5_storage *sp,
 	      krb5_data *data)
 {
     int ret;
-    int size;
+    int32_t size;
+
     ret = krb5_ret_int32(sp, &size);
     if(ret)
 	return ret;

lib/krb5/store_emem.c

@@ -72,7 +72,7 @@ emem_store(krb5_storage *sp, void *data, size_t size)
 	    return 0;
 	s->size = sz;
 	s->base = base;
-	s->ptr = (char*)base + off;
+	s->ptr = (unsigned char*)base + off;
     }
     memmove(s->ptr, data, size);
     sp->seek(sp, size, SEEK_CUR);

lib/krb5/str2key.c

@@ -128,7 +128,7 @@ init (unsigned char *a, unsigned char *b)
 }
 
 static void
-DES_string_to_key(char *str, size_t len, des_cblock *key)
+DES_string_to_key(const unsigned char *str, size_t len, des_cblock *key)
 {
     int odd, i;
     des_key_schedule sched;
@@ -224,12 +224,13 @@ fold(const unsigned char *str, size_t len, unsigned char *out)
 }
 
 static void
-DES3_string_to_key(char *str, size_t len, des_cblock *keys)
+DES3_string_to_key(const unsigned char *str, size_t len, des_cblock *keys)
 {
     unsigned char tmp[24];
     des_cblock ivec;
     des_key_schedule s[3];
     int i;
+
     fold(str, len, tmp);
     for(i = 0; i < 3; i++){
 	memcpy(keys + i, tmp + 8 * i, 8);
@@ -253,14 +254,14 @@ DES3_string_to_key(char *str, size_t len, des_cblock *keys)
 
 
 static krb5_error_code
-string_to_key_internal (char *str,
+string_to_key_internal (const unsigned char *str,
 			size_t str_len,
 			krb5_data *salt,
 			krb5_keytype ktype,
 			krb5_keyblock *key)
 {
      size_t len;
-     char *s, *p;
+     unsigned char *s, *p;
      krb5_error_code ret;
 
      len = str_len + salt->length;
@@ -271,7 +272,7 @@ string_to_key_internal (char *str,
      if (p == NULL)
 	  return ENOMEM;
      memset (s, 0, len);
-     strncpy (p, str, str_len);
+     strncpy ((char *)p, (char *)str, str_len);
      p += str_len;
      memcpy (p, salt->data, salt->length);
 
@@ -308,7 +309,8 @@ krb5_string_to_key (char *str,
 		    krb5_keytype ktype,
 		    krb5_keyblock *key)
 {
-    return string_to_key_internal (str, strlen(str), salt, ktype, key);
+    return string_to_key_internal ((const unsigned char *)str,
+				   strlen(str), salt, ktype, key);
 }
 
 krb5_error_code