r9221: Try to merge Heimdal across from lorikeet-heimdal to samba4.

This is my first attempt at this, so there may be a few rough edges.

Andrew Bartlett
(This used to be commit 9a1d2f2fec67930975da856a2d365345cec46216)

1 files changed, 91 insertions, 40 deletions

diff --git a/source4/heimdal/lib/asn1/der_length.c b/source4/heimdal/lib/asn1/der_length.c
index cb07254a67..e818267bf4 100644
--- a/source4/heimdal/lib/asn1/der_length.c
+++ b/source4/heimdal/lib/asn1/der_length.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2003 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -33,17 +33,23 @@
 
 #include "der_locl.h"
 
-RCSID("$Id: der_length.c,v 1.16 2004/02/07 14:27:59 lha Exp $");
+RCSID("$Id: der_length.c,v 1.17 2005/07/12 06:27:22 lha Exp $");
 
 size_t
 _heim_len_unsigned (unsigned val)
 {
     size_t ret = 0;
-
+    int last_val_gt_128;
+    
     do {
 	++ret;
+	last_val_gt_128 = (val >= 128);
 	val /= 256;
     } while (val);
+
+    if(last_val_gt_128)
+	ret++;
+
     return ret;
 }
 
@@ -83,12 +89,10 @@ len_oid (const heim_oid *oid)
     for (n = 2; n < oid->length; ++n) {
 	unsigned u = oid->components[n];
 
-	++ret;
-	u /= 128;
-	while (u > 0) {
+	do {
 	    ++ret;
 	    u /= 128;
-	}
+	} while(u > 0);
     }
     return ret;
 }
@@ -98,68 +102,91 @@ length_len (size_t len)
 {
     if (len < 128)
 	return 1;
-    else
-	return _heim_len_unsigned (len) + 1;
+    else {
+	int ret = 0;
+	do {
+	    ++ret;
+	    len /= 256;
+	} while (len);
+	return ret + 1;
+    }
 }
 
 size_t
-length_boolean (const int *data)
+length_integer (const int *data)
 {
-  return 1 + length_len(1) + 1;
+    return _heim_len_int (*data);
 }
 
 size_t
-length_integer (const int *data)
+length_unsigned (const unsigned *data)
 {
-    size_t len = _heim_len_int (*data);
+    return _heim_len_unsigned(*data);
+}
 
-    return 1 + length_len(len) + len;
+size_t
+length_enumerated (const unsigned *data)
+{
+  return _heim_len_int (*data);
 }
 
 size_t
-length_unsigned (const unsigned *data)
+length_general_string (const heim_general_string *data)
 {
-    unsigned val = *data;
-    size_t len = 0;
- 
-    while (val > 255) {
-	++len;
-	val /= 256;
-    }
-    len++;
-    if (val >= 128)
-	len++;
-    return 1 + length_len(len) + len;
+    return strlen(*data);
 }
 
 size_t
-length_enumerated (const unsigned *data)
+length_utf8string (const heim_utf8_string *data)
 {
-    size_t len = _heim_len_int (*data);
+    return strlen(*data);
+}
 
-    return 1 + length_len(len) + len;
+size_t
+length_printable_string (const heim_printable_string *data)
+{
+    return strlen(*data);
 }
 
 size_t
-length_general_string (const heim_general_string *data)
+length_ia5_string (const heim_ia5_string *data)
+{
+    return strlen(*data);
+}
+
+size_t
+length_bmp_string (const heim_bmp_string *data)
 {
-    char *str = *data;
-    size_t len = strlen(str);
-    return 1 + length_len(len) + len;
+    return data->length * 2;
+}
+
+size_t
+length_universal_string (const heim_universal_string *data)
+{
+    return data->length * 4;
 }
 
 size_t
 length_octet_string (const heim_octet_string *k)
 {
-    return 1 + length_len(k->length) + k->length;
+    return k->length;
 }
 
 size_t
-length_oid (const heim_oid *k)
+length_heim_integer (const heim_integer *k)
 {
-    size_t len = len_oid (k);
+    if (k->length == 0)
+	return 1;
+    if (k->negative)
+	return k->length + ((((unsigned char *)k->data)[0] & 0x80) ? 0 : 1);
+    else
+	return k->length + ((((unsigned char *)k->data)[0] & 0x80) ? 1 : 0);
+}
 
-    return 1 + length_len(len) + len;
+size_t
+length_oid (const heim_oid *k)
+{
+    return len_oid (k);
 }
 
 size_t
@@ -168,8 +195,32 @@ length_generalized_time (const time_t *t)
     heim_octet_string k;
     size_t ret;
 
-    time2generalizedtime (*t, &k);
-    ret = 1 + length_len(k.length) + k.length;
-    free (k.data);
+    _heim_time2generalizedtime (*t, &k, 1);
+    ret = k.length;
+    free(k.data);
+    return ret;
+}
+
+size_t
+length_utctime (const time_t *t)
+{
+    heim_octet_string k;
+    size_t ret;
+
+    _heim_time2generalizedtime (*t, &k, 0);
+    ret = k.length;
+    free(k.data);
     return ret;
 }
+
+size_t
+length_boolean (const int *k)
+{
+    return 1;
+}
+
+size_t
+length_bit_string (const heim_bit_string *k)
+{
+    return (k->length + 7) / 8 + 1;
+}