diff --git a/ChangeLog b/ChangeLog
index 8b325c51c..d38d667a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Nov 16 00:32:48 1997  Johan Danielsson  <joda@emma.pdc.kth.se>
+
+	* lib/asn1/{der_get,gen_decode}.c: Allow passing NULL size.
+
 Wed Nov 12 02:35:57 1997  Assar Westerlund  <assar@sics.se>
 
 	* lib/krb5/get_for_creds.c (krb5_get_forwarded_creds):
diff --git a/lib/hdb/common.c b/lib/hdb/common.c
index 11e03620c..a2a2c27dc 100644
--- a/lib/hdb/common.c
+++ b/lib/hdb/common.c
@@ -73,8 +73,7 @@ out:
 int
 hdb_key2principal(krb5_context context, krb5_data *key, krb5_principal p)
 {
-    size_t len;
-    return decode_Principal(key->data, key->length, p, &len);
+    return decode_Principal(key->data, key->length, p, NULL);
 }
 
 int
@@ -101,8 +100,7 @@ hdb_entry2value(krb5_context context, hdb_entry *ent, krb5_data *value)
 int
 hdb_value2entry(krb5_context context, krb5_data *value, hdb_entry *ent)
 {
-    size_t len;
-    return decode_hdb_entry(value->data, value->length, ent, &len);
+    return decode_hdb_entry(value->data, value->length, ent, NULL);
 }
 
 krb5_error_code