Rename crypt-xxx to xxx
[obnox/wireshark/wip.git] / epan / dissectors / packet-kerberos.c
index 8f683ad9739cb3e0389a165783ee2598266251df..41a0e14574c77059e594692c29f1a39cc287977d 100644 (file)
  * See RFC 1510, and various I-Ds and other documents showing additions,
  * e.g. ones listed under
  *
- *     http://www.isi.edu/people/bcn/krb-revisions/
+ *      http://www.isi.edu/people/bcn/krb-revisions/
  *
  * and
  *
- *     http://www.ietf.org/internet-drafts/draft-ietf-krb-wg-kerberos-clarifications-07.txt
+ *      http://www.ietf.org/internet-drafts/draft-ietf-krb-wg-kerberos-clarifications-07.txt
  *
  * and
  *
@@ -24,9 +24,9 @@
  * Some structures from RFC2630
  *
  * Ted Percival ted[AT]midg3t.net
- *     Support for PA-S4U2Self Kerberos packet type based on ASN.1 description
- *     in Heimdal:
- *     http://loka.it.su.se/source/xref/heimdal/heimdal/lib/asn1/k5.asn1
+ *      Support for PA-S4U2Self Kerberos packet type based on ASN.1 description
+ *      in Heimdal:
+ *      http://loka.it.su.se/source/xref/heimdal/heimdal/lib/asn1/k5.asn1
  *
  * $Id$
  *
@@ -77,8 +77,8 @@
 #include <nettle/des.h>
 #include <nettle/cbc.h>
 #endif
-#include <epan/crypt/crypt-md5.h>
-#include <sys/stat.h>  /* For keyfile manipulation */
+#include <epan/crypt/md5.h>
+#include <sys/stat.h>   /* For keyfile manipulation */
 #endif
 
 #include <epan/packet.h>
@@ -88,6 +88,7 @@
 #include <epan/conversation.h>
 #include <epan/emem.h>
 #include <epan/asn1.h>
+#include <epan/expert.h>
 #include <epan/dissectors/packet-kerberos.h>
 #include <epan/dissectors/packet-netbios.h>
 #include <epan/dissectors/packet-tcp.h>
 
 #include <wsutil/file_util.h>
 
-#define UDP_PORT_KERBEROS              88
-#define TCP_PORT_KERBEROS              88
+#define UDP_PORT_KERBEROS               88
+#define TCP_PORT_KERBEROS               88
 
 static dissector_handle_t kerberos_handle_udp;
 
@@ -149,7 +150,7 @@ static gint hf_krb_PAC_CREDENTIAL_TYPE = -1;
 static gint hf_krb_PAC_SERVER_CHECKSUM = -1;
 static gint hf_krb_PAC_PRIVSVR_CHECKSUM = -1;
 static gint hf_krb_PAC_CLIENT_INFO_TYPE = -1;
-static gint hf_krb_PAC_CONSTRAINED_DELEGATION = -1;
+static gint hf_krb_PAC_S4U_DELEGATION_INFO = -1;
 static gint hf_krb_PAC_UPN_DNS_INFO = -1;
 static gint hf_krb_encrypted_PA_ENC_TIMESTAMP = -1;
 static gint hf_krb_encrypted_enc_authorization_data = -1;
@@ -238,12 +239,13 @@ static gint hf_krb_KrbCredInfo = -1;
 static gint hf_krb_HostAddress = -1;
 static gint hf_krb_HostAddresses = -1;
 static gint hf_krb_APOptions = -1;
+static gint hf_krb_APOptions_reserved = -1;
 static gint hf_krb_APOptions_use_session_key = -1;
 static gint hf_krb_APOptions_mutual_required = -1;
 static gint hf_krb_TicketFlags = -1;
 static gint hf_krb_TicketFlags_forwardable = -1;
 static gint hf_krb_TicketFlags_forwarded = -1;
-static gint hf_krb_TicketFlags_proxyable = -1;
+static gint hf_krb_TicketFlags_proxiable = -1;
 static gint hf_krb_TicketFlags_proxy = -1;
 static gint hf_krb_TicketFlags_allow_postdate = -1;
 static gint hf_krb_TicketFlags_postdated = -1;
@@ -257,7 +259,7 @@ static gint hf_krb_TicketFlags_ok_as_delegate = -1;
 static gint hf_krb_KDCOptions = -1;
 static gint hf_krb_KDCOptions_forwardable = -1;
 static gint hf_krb_KDCOptions_forwarded = -1;
-static gint hf_krb_KDCOptions_proxyable = -1;
+static gint hf_krb_KDCOptions_proxiable = -1;
 static gint hf_krb_KDCOptions_proxy = -1;
 static gint hf_krb_KDCOptions_allow_postdate = -1;
 static gint hf_krb_KDCOptions_postdated = -1;
@@ -299,11 +301,10 @@ static gint hf_krb_midl_hdr_len = -1;
 static gint ett_krb_kerberos = -1;
 static gint ett_krb_TransitedEncoding = -1;
 static gint ett_krb_PAC_LOGON_INFO = -1;
-static gint ett_krb_PAC_CREDENTIAL_TYPE = -1;
 static gint ett_krb_PAC_SERVER_CHECKSUM = -1;
 static gint ett_krb_PAC_PRIVSVR_CHECKSUM = -1;
 static gint ett_krb_PAC_CLIENT_INFO_TYPE = -1;
-static gint ett_krb_PAC_CONSTRAINED_DELEGATION = -1;
+static gint ett_krb_PAC_S4U_DELEGATION_INFO = -1;
 static gint ett_krb_KDC_REP_enc = -1;
 static gint ett_krb_EncTicketPart = -1;
 static gint ett_krb_EncAPRepPart = -1;
@@ -350,31 +351,31 @@ static gint ett_krb_PAC_MIDL_BLOB = -1;
 static gint ett_krb_PAC_DREP = -1;
 static gint ett_krb_PAC_UPN_DNS_INFO = -1;
 
-guint32 krb5_errorcode;
+static guint32 krb5_errorcode;
 
 
 static dissector_handle_t krb4_handle=NULL;
 
-static gboolean do_col_info;
+static gboolean gbl_do_col_info;
 
 
 static void
 call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int tag)
 {
-       kerberos_callbacks *cb=(kerberos_callbacks *)pinfo->private_data;
+    kerberos_callbacks *cb=(kerberos_callbacks *)pinfo->private_data;
 
-       if(!cb){
-               return;
-       }
+    if(!cb){
+        return;
+    }
 
-       while(cb->tag){
-               if(cb->tag==tag){
-                       cb->callback(pinfo, tvb, tree);
-                       return;
-               }
-               cb++;
-       }
-       return;
+    while(cb->tag){
+        if(cb->tag==tag){
+            cb->callback(pinfo, tvb, tree);
+            return;
+        }
+        cb++;
+    }
+    return;
 }
 
 
@@ -387,6 +388,44 @@ gboolean krb_decrypt = FALSE;
 /* keytab filename */
 static const char *keytab_filename = "insert filename here";
 
+void read_keytab_file(const char *);
+
+void
+read_keytab_file_from_preferences(void)
+{
+    static char *last_keytab = NULL;
+
+    if (!krb_decrypt) {
+        return;
+    }
+
+    if (keytab_filename == NULL) {
+        return;
+    }
+
+    if (last_keytab && !strcmp(last_keytab, keytab_filename)) {
+        return;
+    }
+
+    if (last_keytab != NULL) {
+        g_free(last_keytab);
+        last_keytab = NULL;
+    }
+    last_keytab = g_strdup(keytab_filename);
+
+    read_keytab_file(last_keytab);
+}
+
+#elif defined(_WIN32)
+
+/*  Dummy version to allow us to put this function in libwireshark.def--even
+ *  on systems without KERBEROS.
+ */
+void
+read_keytab_file_from_preferences(void)
+{
+}
+
 #endif
 
 #if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS)
@@ -401,24 +440,30 @@ enc_key_t *enc_key_list=NULL;
 static void
 add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *keyvalue, const char *origin)
 {
-       enc_key_t *new_key;
+    enc_key_t *new_key;
 
-       if(pinfo->fd->flags.visited){
-               return;
-       }
+    if(pinfo->fd->flags.visited){
+        return;
+    }
 printf("added key in %u    keytype:%d len:%d\n",pinfo->fd->num, keytype, keylength);
 
-       new_key=g_malloc(sizeof(enc_key_t));
-       g_snprintf(new_key->key_origin, KRB_MAX_ORIG_LEN, "%s learnt from frame %u",origin,pinfo->fd->num);
-       new_key->next=enc_key_list;
-       enc_key_list=new_key;
-       new_key->keytype=keytype;
-       new_key->keylength=keylength;
-       /*XXX this needs to be freed later */
-       new_key->keyvalue=g_memdup(keyvalue, keylength);
+    new_key=g_malloc(sizeof(enc_key_t));
+    g_snprintf(new_key->key_origin, KRB_MAX_ORIG_LEN, "%s learnt from frame %u",origin,pinfo->fd->num);
+    new_key->next=enc_key_list;
+    enc_key_list=new_key;
+    new_key->keytype=keytype;
+    new_key->keylength=keylength;
+    /*XXX this needs to be freed later */
+    new_key->keyvalue=g_memdup(keyvalue, keylength);
 }
 #endif /* HAVE_HEIMDAL_KERBEROS || HAVE_MIT_KERBEROS */
 
+#if defined(_WIN32) && !defined(HAVE_HEIMDAL_KERBEROS) && !defined(HAVE_MIT_KERBEROS) && !defined(HAVE_LIBNETTLE)
+void
+read_keytab_file(const char *filename _U_)
+{
+}
+#endif
 
 #ifdef HAVE_MIT_KERBEROS
 
@@ -427,137 +472,134 @@ static krb5_context krb5_ctx;
 void
 read_keytab_file(const char *filename)
 {
-       krb5_keytab keytab;
-       krb5_error_code ret;
-       krb5_keytab_entry key;
-       krb5_kt_cursor cursor;
-       enc_key_t *new_key;
-       static int first_time=1;
+    krb5_keytab keytab;
+    krb5_error_code ret;
+    krb5_keytab_entry key;
+    krb5_kt_cursor cursor;
+    enc_key_t *new_key;
+    static gboolean first_time=TRUE;
 
 printf("read keytab file %s\n", filename);
-       if(first_time){
-               first_time=0;
-               ret = krb5_init_context(&krb5_ctx);
-               if(ret){
-                       return;
-               }
-       }
-
-       /* should use a file in the wireshark users dir */
-       ret = krb5_kt_resolve(krb5_ctx, filename, &keytab);
-       if(ret){
-               fprintf(stderr, "KERBEROS ERROR: Could not open keytab file :%s\n",filename);
-
-               return;
-       }
-
-       ret = krb5_kt_start_seq_get(krb5_ctx, keytab, &cursor);
-       if(ret){
-               fprintf(stderr, "KERBEROS ERROR: Could not read from keytab file :%s\n",filename);
-               return;
-       }
-
-       do{
-               new_key=g_malloc(sizeof(enc_key_t));
-               new_key->next=enc_key_list;
-               ret = krb5_kt_next_entry(krb5_ctx, keytab, &key, &cursor);
-               if(ret==0){
-                       int i;
-                       char *pos;
-
-                       /* generate origin string, describing where this key came from */
-                       pos=new_key->key_origin;
-                       pos+=MIN(KRB_MAX_ORIG_LEN,
-                                g_snprintf(pos, KRB_MAX_ORIG_LEN, "keytab principal "));
-                       for(i=0;i<key.principal->length;i++){
-                               pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
-                                        g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "%s%s",(i?"/":""),(key.principal->data[i]).data));
-                       }
-                       pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
-                                g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "@%s",key.principal->realm.data));
-                       *pos=0;
+    if(first_time){
+        first_time=FALSE;
+        ret = krb5_init_context(&krb5_ctx);
+        if(ret && ret != KRB5_CONFIG_CANTOPEN){
+            return;
+        }
+    }
+
+    /* should use a file in the wireshark users dir */
+    ret = krb5_kt_resolve(krb5_ctx, filename, &keytab);
+    if(ret){
+        fprintf(stderr, "KERBEROS ERROR: Badly formatted keytab filename :%s\n",filename);
+
+        return;
+    }
+
+    ret = krb5_kt_start_seq_get(krb5_ctx, keytab, &cursor);
+    if(ret){
+        fprintf(stderr, "KERBEROS ERROR: Could not open or could not read from keytab file :%s\n",filename);
+        return;
+    }
+
+    do{
+        new_key=g_malloc(sizeof(enc_key_t));
+        new_key->next=enc_key_list;
+        ret = krb5_kt_next_entry(krb5_ctx, keytab, &key, &cursor);
+        if(ret==0){
+            int i;
+            char *pos;
+
+            /* generate origin string, describing where this key came from */
+            pos=new_key->key_origin;
+            pos+=MIN(KRB_MAX_ORIG_LEN,
+                     g_snprintf(pos, KRB_MAX_ORIG_LEN, "keytab principal "));
+            for(i=0;i<key.principal->length;i++){
+                pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
+                         g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "%s%s",(i?"/":""),(key.principal->data[i]).data));
+            }
+            pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
+                     g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "@%s",key.principal->realm.data));
+            *pos=0;
 /*printf("added key for principal :%s\n", new_key->key_origin);*/
-                       new_key->keytype=key.key.enctype;
-                       new_key->keylength=key.key.length;
-                       new_key->keyvalue=g_memdup(key.key.contents, key.key.length);
-                       enc_key_list=new_key;
-               }
-       }while(ret==0);
+            new_key->keytype=key.key.enctype;
+            new_key->keylength=key.key.length;
+            new_key->keyvalue=g_memdup(key.key.contents, key.key.length);
+            enc_key_list=new_key;
+        }
+    }while(ret==0);
 
-       ret = krb5_kt_end_seq_get(krb5_ctx, keytab, &cursor);
-       if(ret){
-               krb5_kt_close(krb5_ctx, keytab);
-       }
+    ret = krb5_kt_end_seq_get(krb5_ctx, keytab, &cursor);
+    if(ret){
+        krb5_kt_close(krb5_ctx, keytab);
+    }
 
 }
 
 
 guint8 *
 decrypt_krb5_data(proto_tree *tree, packet_info *pinfo,
-                       int usage,
-                       int length,
-                       const guint8 *cryptotext,
-                       int keytype,
-                       int *datalen)
-{
-       static int first_time=1;
-       krb5_error_code ret;
-       enc_key_t *ek;
-       static krb5_data data = {0,0,NULL};
-       krb5_keytab_entry key;
-
-       /* dont do anything if we are not attempting to decrypt data */
-       if(!krb_decrypt){
-               return NULL;
-       }
-
-       /* XXX we should only do this for first time, then store somewhere */
-       /* XXX We also need to re-read the keytab when the preference changes */
-
-       /* should this have a destroy context ?  MIT people would know */
-       if(first_time){
-               first_time=0;
-               read_keytab_file(keytab_filename);
-       }
-
-       for(ek=enc_key_list;ek;ek=ek->next){
-               krb5_enc_data input;
-
-               /* shortcircuit and bail out if enctypes are not matching */
-               if((keytype != -1) && (ek->keytype != keytype)) {
-                       continue;
-               }
-
-               input.enctype = ek->keytype;
-               input.ciphertext.length = length;
-               input.ciphertext.data = (guint8 *)cryptotext;
-
-               data.length = length;
-               if(data.data){
-                       g_free(data.data);
-               }
-               data.data = g_malloc(length);
-
-               key.key.enctype=ek->keytype;
-               key.key.length=ek->keylength;
-               key.key.contents=ek->keyvalue;
-               ret = krb5_c_decrypt(krb5_ctx, &(key.key), usage, 0, &input, &data);
-               if((ret == 0) && (length>0)){
-                       char *user_data;
+                  int usage,
+                  tvbuff_t *cryptotvb,
+                  int keytype,
+                  int *datalen)
+{
+    krb5_error_code ret;
+    enc_key_t *ek;
+    krb5_data data = {0,0,NULL};
+    krb5_keytab_entry key;
+    int length = tvb_length(cryptotvb);
+    const guint8 *cryptotext = tvb_get_ptr(cryptotvb, 0, length);
+
+    /* don't do anything if we are not attempting to decrypt data */
+    if(!krb_decrypt || length < 1){
+        return NULL;
+    }
 
-printf("woohoo decrypted keytype:%d in frame:%u\n", ek->keytype, pinfo->fd->num);
-                       proto_tree_add_text(tree, NULL, 0, 0, "[Decrypted using: %s]", ek->key_origin);
-                       /* return a private g_malloced blob to the caller */
-                       user_data=g_malloc(data.length);
-                       memcpy(user_data, data.data, data.length);
-                       if (datalen) {
-                               *datalen = data.length;
-                       }
-                       return user_data;
-               }
-       }
+    /* make sure we have all the data we need */
+    if (tvb_length(cryptotvb) < tvb_reported_length(cryptotvb)) {
+        return NULL;
+    }
+
+    read_keytab_file_from_preferences();
+    data.data = g_malloc(length);
+    data.length = length;
+
+    for(ek=enc_key_list;ek;ek=ek->next){
+        krb5_enc_data input;
+
+        /* shortcircuit and bail out if enctypes are not matching */
+        if((keytype != -1) && (ek->keytype != keytype)) {
+            continue;
+        }
+
+        input.enctype = ek->keytype;
+        input.ciphertext.length = length;
+        input.ciphertext.data = (guint8 *)cryptotext;
+
+        key.key.enctype=ek->keytype;
+        key.key.length=ek->keylength;
+        key.key.contents=ek->keyvalue;
+        ret = krb5_c_decrypt(krb5_ctx, &(key.key), usage, 0, &input, &data);
+        if(ret == 0){
+            char *user_data;
+
+            expert_add_info_format(pinfo, NULL, PI_SECURITY, PI_CHAT,
+                                   "Decrypted keytype %d in frame %u using %s",
+                                   ek->keytype, pinfo->fd->num, ek->key_origin);
+
+            proto_tree_add_text(tree, NULL, 0, 0, "[Decrypted using: %s]", ek->key_origin);
+            /* return a private g_malloced blob to the caller */
+            user_data=data.data;
+            if (datalen) {
+                *datalen = data.length;
+            }
+            return user_data;
+        }
+    }
+    g_free(data.data);
 
-       return NULL;
+    return NULL;
 }
 
 #elif defined(HAVE_HEIMDAL_KERBEROS)
@@ -566,150 +608,146 @@ static krb5_context krb5_ctx;
 void
 read_keytab_file(const char *filename)
 {
-       krb5_keytab keytab;
-       krb5_error_code ret;
-       krb5_keytab_entry key;
-       krb5_kt_cursor cursor;
-       enc_key_t *new_key;
-       static int first_time=1;
-
-       if(first_time){
-               first_time=0;
-               ret = krb5_init_context(&krb5_ctx);
-               if(ret){
-                       return;
-               }
-       }
-
-       /* should use a file in the wireshark users dir */
-       ret = krb5_kt_resolve(krb5_ctx, filename, &keytab);
-       if(ret){
-               fprintf(stderr, "KERBEROS ERROR: Could not open keytab file :%s\n",filename);
-
-               return;
-       }
-
-       ret = krb5_kt_start_seq_get(krb5_ctx, keytab, &cursor);
-       if(ret){
-               fprintf(stderr, "KERBEROS ERROR: Could not read from keytab file :%s\n",filename);
-               return;
-       }
-
-       do{
-               new_key=g_malloc(sizeof(enc_key_t));
-               new_key->next=enc_key_list;
-               ret = krb5_kt_next_entry(krb5_ctx, keytab, &key, &cursor);
-               if(ret==0){
-                       unsigned int i;
-                       char *pos;
-
-                       /* generate origin string, describing where this key came from */
-                       pos=new_key->key_origin;
-                       pos+=MIN(KRB_MAX_ORIG_LEN,
-                                g_snprintf(pos, KRB_MAX_ORIG_LEN, "keytab principal "));
-                       for(i=0;i<key.principal->name.name_string.len;i++){
-                               pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
-                                        g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "%s%s",(i?"/":""),key.principal->name.name_string.val[i]));
-                       }
-                       pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
-                                g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "@%s",key.principal->realm));
-                       *pos=0;
-                       new_key->keytype=key.keyblock.keytype;
-                       new_key->keylength=key.keyblock.keyvalue.length;
-                       new_key->keyvalue=g_memdup(key.keyblock.keyvalue.data, key.keyblock.keyvalue.length);
-                       enc_key_list=new_key;
-               }
-       }while(ret==0);
-
-       ret = krb5_kt_end_seq_get(krb5_ctx, keytab, &cursor);
-       if(ret){
-               krb5_kt_close(krb5_ctx, keytab);
-       }
+    krb5_keytab keytab;
+    krb5_error_code ret;
+    krb5_keytab_entry key;
+    krb5_kt_cursor cursor;
+    enc_key_t *new_key;
+    static gboolean first_time=TRUE;
+
+    if(first_time){
+        first_time=FALSE;
+        ret = krb5_init_context(&krb5_ctx);
+        if(ret){
+            return;
+        }
+    }
+
+    /* should use a file in the wireshark users dir */
+    ret = krb5_kt_resolve(krb5_ctx, filename, &keytab);
+    if(ret){
+        fprintf(stderr, "KERBEROS ERROR: Could not open keytab file :%s\n",filename);
+
+        return;
+    }
+
+    ret = krb5_kt_start_seq_get(krb5_ctx, keytab, &cursor);
+    if(ret){
+        fprintf(stderr, "KERBEROS ERROR: Could not read from keytab file :%s\n",filename);
+        return;
+    }
+
+    do{
+        new_key=g_malloc(sizeof(enc_key_t));
+        new_key->next=enc_key_list;
+        ret = krb5_kt_next_entry(krb5_ctx, keytab, &key, &cursor);
+        if(ret==0){
+            unsigned int i;
+            char *pos;
+
+            /* generate origin string, describing where this key came from */
+            pos=new_key->key_origin;
+            pos+=MIN(KRB_MAX_ORIG_LEN,
+                     g_snprintf(pos, KRB_MAX_ORIG_LEN, "keytab principal "));
+            for(i=0;i<key.principal->name.name_string.len;i++){
+                pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
+                         g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "%s%s",(i?"/":""),key.principal->name.name_string.val[i]));
+            }
+            pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
+                     g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "@%s",key.principal->realm));
+            *pos=0;
+            new_key->keytype=key.keyblock.keytype;
+            new_key->keylength=key.keyblock.keyvalue.length;
+            new_key->keyvalue=g_memdup(key.keyblock.keyvalue.data, key.keyblock.keyvalue.length);
+            enc_key_list=new_key;
+        }
+    }while(ret==0);
+
+    ret = krb5_kt_end_seq_get(krb5_ctx, keytab, &cursor);
+    if(ret){
+        krb5_kt_close(krb5_ctx, keytab);
+    }
 
 }
 
 
 guint8 *
 decrypt_krb5_data(proto_tree *tree, packet_info *pinfo,
-                       int usage,
-                       int length,
-                       const guint8 *cryptotext,
-                       int keytype,
-                       int *datalen)
-{
-       static int first_time=1;
-       krb5_error_code ret;
-       krb5_data data;
-       enc_key_t *ek;
-
-       /* dont do anything if we are not attempting to decrypt data */
-       if(!krb_decrypt){
-               return NULL;
-       }
-
-       /* XXX we should only do this for first time, then store somewhere */
-       /* XXX We also need to re-read the keytab when the preference changes */
-
-       /* should this have a destroy context ?  Heimdal people would know */
-       if(first_time){
-               first_time=0;
-               read_keytab_file(keytab_filename);
-       }
-
-       for(ek=enc_key_list;ek;ek=ek->next){
-               krb5_keytab_entry key;
-               krb5_crypto crypto;
-               guint8 *cryptocopy; /* workaround for pre-0.6.1 heimdal bug */
-
-               /* shortcircuit and bail out if enctypes are not matching */
-               if((keytype != -1) && (ek->keytype != keytype)) {
-                       continue;
-               }
-
-               key.keyblock.keytype=ek->keytype;
-               key.keyblock.keyvalue.length=ek->keylength;
-               key.keyblock.keyvalue.data=ek->keyvalue;
-               ret = krb5_crypto_init(krb5_ctx, &(key.keyblock), 0, &crypto);
-               if(ret){
-                       return NULL;
-               }
-
-               /* pre-0.6.1 versions of Heimdal would sometimes change
-                 the cryptotext data even when the decryption failed.
-                 This would obviously not work since we iterate over the
-                 keys. So just give it a copy of the crypto data instead.
-                 This has been seen for RC4-HMAC blobs.
-               */
-               cryptocopy=g_malloc(length);
-               memcpy(cryptocopy, cryptotext, length);
-               ret = krb5_decrypt_ivec(krb5_ctx, crypto, usage,
-                               cryptocopy, length,
-                               &data,
-                               NULL);
-               g_free(cryptocopy);
-               if((ret == 0) && (length>0)){
-                       char *user_data;
+                  int usage,
+                  tvbuff_t *cryptotvb,
+                  int keytype,
+                  int *datalen)
+{
+    krb5_error_code ret;
+    krb5_data data;
+    enc_key_t *ek;
+    int length = tvb_length(cryptotvb);
+    const guint8 *cryptotext = tvb_get_ptr(cryptotvb, 0, length);
+
+    /* don't do anything if we are not attempting to decrypt data */
+    if(!krb_decrypt){
+        return NULL;
+    }
+
+    /* make sure we have all the data we need */
+    if (tvb_length(cryptotvb) < tvb_reported_length(cryptotvb)) {
+        return NULL;
+    }
+
+    read_keytab_file_from_preferences();
+
+    for(ek=enc_key_list;ek;ek=ek->next){
+        krb5_keytab_entry key;
+        krb5_crypto crypto;
+        guint8 *cryptocopy; /* workaround for pre-0.6.1 heimdal bug */
+
+        /* shortcircuit and bail out if enctypes are not matching */
+        if((keytype != -1) && (ek->keytype != keytype)) {
+            continue;
+        }
+
+        key.keyblock.keytype=ek->keytype;
+        key.keyblock.keyvalue.length=ek->keylength;
+        key.keyblock.keyvalue.data=ek->keyvalue;
+        ret = krb5_crypto_init(krb5_ctx, &(key.keyblock), 0, &crypto);
+        if(ret){
+            return NULL;
+        }
+
+        /* pre-0.6.1 versions of Heimdal would sometimes change
+           the cryptotext data even when the decryption failed.
+           This would obviously not work since we iterate over the
+           keys. So just give it a copy of the crypto data instead.
+           This has been seen for RC4-HMAC blobs.
+        */
+        cryptocopy=g_memdup(cryptotext, length);
+        ret = krb5_decrypt_ivec(krb5_ctx, crypto, usage,
+                                cryptocopy, length,
+                                &data,
+                                NULL);
+        g_free(cryptocopy);
+        if((ret == 0) && (length>0)){
+            char *user_data;
 
 printf("woohoo decrypted keytype:%d in frame:%u\n", ek->keytype, pinfo->fd->num);
-                       proto_tree_add_text(tree, NULL, 0, 0, "[Decrypted using: %s]", ek->key_origin);
-                       krb5_crypto_destroy(krb5_ctx, crypto);
-                       /* return a private g_malloced blob to the caller */
-                       user_data=g_malloc(data.length);
-                       memcpy(user_data, data.data, data.length);
-                       if (datalen) {
-                               *datalen = data.length;
-                       }
-                       return user_data;
-               }
-               krb5_crypto_destroy(krb5_ctx, crypto);
-       }
-       return NULL;
+            proto_tree_add_text(tree, NULL, 0, 0, "[Decrypted using: %s]", ek->key_origin);
+            krb5_crypto_destroy(krb5_ctx, crypto);
+            /* return a private g_malloced blob to the caller */
+            user_data=g_memdup(data.data, data.length);
+            if (datalen) {
+                *datalen = data.length;
+            }
+            return user_data;
+        }
+        krb5_crypto_destroy(krb5_ctx, crypto);
+    }
+    return NULL;
 }
 
 #elif defined (HAVE_LIBNETTLE)
 
 #define SERVICE_KEY_SIZE (DES3_KEY_SIZE + 2)
-#define KEYTYPE_DES3_CBC_MD5 5 /* Currently the only one supported */
+#define KEYTYPE_DES3_CBC_MD5 5  /* Currently the only one supported */
 
 typedef struct _service_key_t {
     guint16 kvno;
@@ -724,212 +762,219 @@ GSList *service_key_list = NULL;
 static void
 add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *keyvalue, const char *origin)
 {
-       service_key_t *new_key;
+    service_key_t *new_key;
 
-       if(pinfo->fd->flags.visited){
-               return;
-       }
+    if(pinfo->fd->flags.visited){
+        return;
+    }
 printf("added key in %u\n",pinfo->fd->num);
 
-       new_key = g_malloc(sizeof(service_key_t));
-       new_key->kvno = 0;
-       new_key->keytype = keytype;
-       new_key->length = keylength;
-       new_key->contents = g_malloc(keylength);
-       memcpy(new_key->contents, keyvalue, keylength);
-       g_snprintf(new_key->origin, KRB_MAX_ORIG_LEN, "%s learnt from frame %u", origin, pinfo->fd->num);
-       service_key_list = g_slist_append(service_key_list, (gpointer) new_key);
+    new_key = g_malloc(sizeof(service_key_t));
+    new_key->kvno = 0;
+    new_key->keytype = keytype;
+    new_key->length = keylength;
+    new_key->contents = g_memdup(keyvalue, keylength);
+    g_snprintf(new_key->origin, KRB_MAX_ORIG_LEN, "%s learnt from frame %u", origin, pinfo->fd->num);
+    service_key_list = g_slist_append(service_key_list, (gpointer) new_key);
 }
 
 static void
 clear_keytab(void) {
-       GSList *ske;
-       service_key_t *sk;
-
-       for(ske = service_key_list; ske != NULL; ske = g_slist_next(ske)){
-               sk = (service_key_t *) ske->data;
-               if (sk && sk->contents) g_free(sk->contents);
-               if (sk) g_free(sk);
-       }
-       g_slist_free(service_key_list);
-       service_key_list = NULL;
+    GSList *ske;
+    service_key_t *sk;
+
+    for(ske = service_key_list; ske != NULL; ske = g_slist_next(ske)){
+        sk = (service_key_t *) ske->data;
+        if (sk) {
+            g_free(sk->contents);
+            g_free(sk);
+        }
+    }
+    g_slist_free(service_key_list);
+    service_key_list = NULL;
 }
 
 static void
 read_keytab_file(const char *service_key_file)
 {
-       FILE *skf;
-       struct stat st;
-       service_key_t *sk;
-       unsigned char buf[SERVICE_KEY_SIZE];
-       int newline_skip = 0, count = 0;
-
-       if (service_key_file != NULL && ws_stat (service_key_file, &st) == 0) {
-
-               /* The service key file contains raw 192-bit (24 byte) 3DES keys.
-                * There can be zero, one (\n), or two (\r\n) characters between
-                * keys.  Trailing characters are ignored.
-                */
-
-               /* XXX We should support the standard keytab format instead */
-               if (st.st_size > SERVICE_KEY_SIZE) {
-                       if ( (st.st_size % (SERVICE_KEY_SIZE + 1) == 0) ||
-                            (st.st_size % (SERVICE_KEY_SIZE + 1) == SERVICE_KEY_SIZE) ) {
-                           newline_skip = 1;
-                       } else if ( (st.st_size % (SERVICE_KEY_SIZE + 2) == 0) ||
-                            (st.st_size % (SERVICE_KEY_SIZE + 2) == SERVICE_KEY_SIZE) ) {
-                           newline_skip = 2;
-                       }
-               }
-
-               skf = ws_fopen(service_key_file, "rb");
-               if (! skf) return;
-
-               while (fread(buf, SERVICE_KEY_SIZE, 1, skf) == 1) {
-                       sk = g_malloc(sizeof(service_key_t));
-                       sk->kvno = buf[0] << 8 | buf[1];
-                       sk->keytype = KEYTYPE_DES3_CBC_MD5;
-                       sk->length = DES3_KEY_SIZE;
-                       sk->contents = g_malloc(DES3_KEY_SIZE);
-                       memcpy(sk->contents, buf + 2, DES3_KEY_SIZE);
-                       g_snprintf(sk->origin, KRB_MAX_ORIG_LEN, "3DES service key file, key #%d, offset %ld", count, ftell(skf));
-                       service_key_list = g_slist_append(service_key_list, (gpointer) sk);
-                       fseek(skf, newline_skip, SEEK_CUR);
-                       count++;
+    FILE *skf;
+    ws_statb64 st;
+    service_key_t *sk;
+    unsigned char buf[SERVICE_KEY_SIZE];
+    int newline_skip = 0, count = 0;
+
+    if (service_key_file != NULL && ws_stat64 (service_key_file, &st) == 0) {
+
+        /* The service key file contains raw 192-bit (24 byte) 3DES keys.
+         * There can be zero, one (\n), or two (\r\n) characters between
+         * keys.  Trailing characters are ignored.
+         */
+
+        /* XXX We should support the standard keytab format instead */
+        if (st.st_size > SERVICE_KEY_SIZE) {
+            if ( (st.st_size % (SERVICE_KEY_SIZE + 1) == 0) ||
+                 (st.st_size % (SERVICE_KEY_SIZE + 1) == SERVICE_KEY_SIZE) ) {
+                newline_skip = 1;
+            } else if ( (st.st_size % (SERVICE_KEY_SIZE + 2) == 0) ||
+                        (st.st_size % (SERVICE_KEY_SIZE + 2) == SERVICE_KEY_SIZE) ) {
+                newline_skip = 2;
+            }
+        }
+
+        skf = ws_fopen(service_key_file, "rb");
+        if (! skf) return;
+
+        while (fread(buf, SERVICE_KEY_SIZE, 1, skf) == 1) {
+            sk = g_malloc(sizeof(service_key_t));
+            sk->kvno = buf[0] << 8 | buf[1];
+            sk->keytype = KEYTYPE_DES3_CBC_MD5;
+            sk->length = DES3_KEY_SIZE;
+            sk->contents = g_memdup(buf + 2, DES3_KEY_SIZE);
+            g_snprintf(sk->origin, KRB_MAX_ORIG_LEN, "3DES service key file, key #%d, offset %ld", count, ftell(skf));
+            service_key_list = g_slist_append(service_key_list, (gpointer) sk);
+            fseek(skf, newline_skip, SEEK_CUR);
+            count++;
 g_warning("added key: %s", sk->origin);
-               }
-               fclose(skf);
-       }
+        }
+        fclose(skf);
+    }
 }
 
 #define CONFOUNDER_PLUS_CHECKSUM 24
 
 guint8 *
 decrypt_krb5_data(proto_tree *tree, packet_info *pinfo,
-                       int _U_ usage,
-                       int length,
-                       const guint8 *cryptotext,
-                       int keytype,
-                       int *datalen)
-{
-       tvbuff_t *encr_tvb;
-       guint8 *decrypted_data = NULL, *plaintext = NULL;
-       int res;
-       guint8 cls;
-       gboolean pc;
-       guint32 tag, item_len, data_len;
-       int id_offset, offset;
-       guint8 key[DES3_KEY_SIZE];
-       guint8 initial_vector[DES_BLOCK_SIZE];
-       md5_state_t md5s;
-       md5_byte_t digest[16];
-       md5_byte_t zero_fill[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-       md5_byte_t confounder[8];
-       gboolean ind;
-       GSList *ske;
-       service_key_t *sk;
-       struct des3_ctx ctx;
-
-
-       /* dont do anything if we are not attempting to decrypt data */
-       if(!krb_decrypt){
-               return NULL;
-       }
-
-       if (keytype != KEYTYPE_DES3_CBC_MD5 || service_key_list == NULL) {
-               return NULL;
-       }
-
-       decrypted_data = g_malloc(length);
-       for(ske = service_key_list; ske != NULL; ske = g_slist_next(ske)){
-               gboolean do_continue = FALSE;
-               sk = (service_key_t *) ske->data;
-
-               des_fix_parity(DES3_KEY_SIZE, key, sk->contents);
-
-               md5_init(&md5s);
-               memset(initial_vector, 0, DES_BLOCK_SIZE);
-               res = des3_set_key(&ctx, key);
-               cbc_decrypt(&ctx, des3_decrypt, DES_BLOCK_SIZE, initial_vector,
-                   length, decrypted_data, cryptotext);
-               encr_tvb = tvb_new_real_data(decrypted_data, length, length);
-
-               tvb_memcpy(encr_tvb, confounder, 0, 8);
-
-               /* We have to pull the decrypted data length from the decrypted
-                * content.  If the key doesn't match or we otherwise get garbage,
-                * an exception may get thrown while decoding the ASN.1 header.
-                * Catch it, just in case.
-                */
-               TRY {
-                       id_offset = get_ber_identifier(encr_tvb, CONFOUNDER_PLUS_CHECKSUM, &cls, &pc, &tag);
-                       offset = get_ber_length(encr_tvb, id_offset, &item_len, &ind);
-               }
-               CATCH (BoundsError) {
-                       tvb_free(encr_tvb);
-                       do_continue = TRUE;
-               }
-               ENDTRY;
-
-               if (do_continue) continue;
-
-               data_len = item_len + offset - CONFOUNDER_PLUS_CHECKSUM;
-               if ((int) item_len + offset > length) {
-                       tvb_free(encr_tvb);
-                       continue;
-               }
-
-               md5_append(&md5s, confounder, 8);
-               md5_append(&md5s, zero_fill, 16);
-               md5_append(&md5s, decrypted_data + CONFOUNDER_PLUS_CHECKSUM, data_len);
-               md5_finish(&md5s, digest);
-
-               if (tvb_memeql (encr_tvb, 8, digest, 16) == 0) {
+                  int _U_ usage,
+                  tvbuff_t *cryptotvb,
+                  int keytype,
+                  int *datalen)
+{
+    tvbuff_t *encr_tvb;
+    guint8 *decrypted_data = NULL, *plaintext = NULL;
+    int res;
+    guint8 cls;
+    gboolean pc;
+    guint32 tag, item_len, data_len;
+    int id_offset, offset;
+    guint8 key[DES3_KEY_SIZE];
+    guint8 initial_vector[DES_BLOCK_SIZE];
+    md5_state_t md5s;
+    md5_byte_t digest[16];
+    md5_byte_t zero_fill[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    md5_byte_t confounder[8];
+    gboolean ind;
+    GSList *ske;
+    service_key_t *sk;
+    struct des3_ctx ctx;
+    int length = tvb_length(cryptotvb);
+    const guint8 *cryptotext = tvb_get_ptr(cryptotvb, 0, length);
+
+
+    /* don't do anything if we are not attempting to decrypt data */
+    if(!krb_decrypt){
+        return NULL;
+    }
+
+    /* make sure we have all the data we need */
+    if (tvb_length(cryptotvb) < tvb_reported_length(cryptotvb)) {
+        return NULL;
+    }
+
+    if (keytype != KEYTYPE_DES3_CBC_MD5 || service_key_list == NULL) {
+        return NULL;
+    }
+
+    decrypted_data = g_malloc(length);
+    for(ske = service_key_list; ske != NULL; ske = g_slist_next(ske)){
+        gboolean do_continue = FALSE;
+        sk = (service_key_t *) ske->data;
+
+        des_fix_parity(DES3_KEY_SIZE, key, sk->contents);
+
+        md5_init(&md5s);
+        memset(initial_vector, 0, DES_BLOCK_SIZE);
+        res = des3_set_key(&ctx, key);
+        cbc_decrypt(&ctx, des3_decrypt, DES_BLOCK_SIZE, initial_vector,
+                    length, decrypted_data, cryptotext);
+        encr_tvb = tvb_new_real_data(decrypted_data, length, length);
+
+        tvb_memcpy(encr_tvb, confounder, 0, 8);
+
+        /* We have to pull the decrypted data length from the decrypted
+         * content.  If the key doesn't match or we otherwise get garbage,
+         * an exception may get thrown while decoding the ASN.1 header.
+         * Catch it, just in case.
+         */
+        TRY {
+            id_offset = get_ber_identifier(encr_tvb, CONFOUNDER_PLUS_CHECKSUM, &cls, &pc, &tag);
+            offset = get_ber_length(encr_tvb, id_offset, &item_len, &ind);
+        }
+        CATCH (BoundsError) {
+            tvb_free(encr_tvb);
+            do_continue = TRUE;
+        }
+        ENDTRY;
+
+        if (do_continue) continue;
+
+        data_len = item_len + offset - CONFOUNDER_PLUS_CHECKSUM;
+        if ((int) item_len + offset > length) {
+            tvb_free(encr_tvb);
+            continue;
+        }
+
+        md5_append(&md5s, confounder, 8);
+        md5_append(&md5s, zero_fill, 16);
+        md5_append(&md5s, decrypted_data + CONFOUNDER_PLUS_CHECKSUM, data_len);
+        md5_finish(&md5s, digest);
+
+        if (tvb_memeql (encr_tvb, 8, digest, 16) == 0) {
 g_warning("woohoo decrypted keytype:%d in frame:%u\n", keytype, pinfo->fd->num);
-                       plaintext = g_malloc(data_len);
-                       tvb_memcpy(encr_tvb, plaintext, CONFOUNDER_PLUS_CHECKSUM, data_len);
-                       tvb_free(encr_tvb);
+            plaintext = g_malloc(data_len);
+            tvb_memcpy(encr_tvb, plaintext, CONFOUNDER_PLUS_CHECKSUM, data_len);
+            tvb_free(encr_tvb);
 
-                       if (datalen) {
-                               *datalen = data_len;
-                       }
-                       g_free(decrypted_data);
-                       return(plaintext);
-               }
-       }
+            if (datalen) {
+                *datalen = data_len;
+            }
+            g_free(decrypted_data);
+            return(plaintext);
+        }
+        tvb_free(encr_tvb);
+    }
 
-       g_free(decrypted_data);
-       return NULL;
+    g_free(decrypted_data);
+    return NULL;
 }
 
 
-#endif /* HAVE_MIT_KERBEROS / HAVE_HEIMDAL_KERBEROS / HAVE_LIBNETTLE */
+#endif  /* HAVE_MIT_KERBEROS / HAVE_HEIMDAL_KERBEROS / HAVE_LIBNETTLE */
 
-#define        INET6_ADDRLEN   16
+#define INET6_ADDRLEN   16
 
 /* TCP Record Mark */
-#define        KRB_RM_RESERVED 0x80000000L
-#define        KRB_RM_RECLEN   0x7fffffffL
-
-#define KRB5_MSG_TICKET                        1       /* Ticket */
-#define KRB5_MSG_AUTHENTICATOR               /* Authenticator */
-#define KRB5_MSG_ENC_TICKET_PART             /* EncTicketPart */
-#define KRB5_MSG_AS_REQ                10      /* AS-REQ type */
-#define KRB5_MSG_AS_REP                11      /* AS-REP type */
-#define KRB5_MSG_TGS_REQ               12      /* TGS-REQ type */
-#define KRB5_MSG_TGS_REP               13      /* TGS-REP type */
-#define KRB5_MSG_AP_REQ                14      /* AP-REQ type */
-#define KRB5_MSG_AP_REP                15      /* AP-REP type */
-
-#define KRB5_MSG_SAFE                  20      /* KRB-SAFE type */
-#define KRB5_MSG_PRIV                  21      /* KRB-PRIV type */
-#define KRB5_MSG_CRED                  22      /* KRB-CRED type */
-#define KRB5_MSG_ENC_AS_REP_PART       25      /* EncASRepPart */
-#define KRB5_MSG_ENC_TGS_REP_PART      26      /* EncTGSRepPart */
-#define KRB5_MSG_ENC_AP_REP_PART       27      /* EncAPRepPart */
-#define KRB5_MSG_ENC_KRB_PRIV_PART             28      /* EncKrbPrivPart */
-#define KRB5_MSG_ENC_KRB_CRED_PART             29      /* EncKrbCredPart */
-#define KRB5_MSG_ERROR                 30      /* KRB-ERROR type */
+#define KRB_RM_RESERVED 0x80000000L
+#define KRB_RM_RECLEN   0x7fffffffL
+
+#define KRB5_MSG_TICKET                  1      /* Ticket */
+#define KRB5_MSG_AUTHENTICATOR           2      /* Authenticator */
+#define KRB5_MSG_ENC_TICKET_PART         3      /* EncTicketPart */
+#define KRB5_MSG_AS_REQ                 10      /* AS-REQ type */
+#define KRB5_MSG_AS_REP                 11      /* AS-REP type */
+#define KRB5_MSG_TGS_REQ                12      /* TGS-REQ type */
+#define KRB5_MSG_TGS_REP                13      /* TGS-REP type */
+#define KRB5_MSG_AP_REQ                 14      /* AP-REQ type */
+#define KRB5_MSG_AP_REP                 15      /* AP-REP type */
+
+#define KRB5_MSG_SAFE                   20      /* KRB-SAFE type */
+#define KRB5_MSG_PRIV                   21      /* KRB-PRIV type */
+#define KRB5_MSG_CRED                   22      /* KRB-CRED type */
+#define KRB5_MSG_ENC_AS_REP_PART        25      /* EncASRepPart */
+#define KRB5_MSG_ENC_TGS_REP_PART       26      /* EncTGSRepPart */
+#define KRB5_MSG_ENC_AP_REP_PART        27      /* EncAPRepPart */
+#define KRB5_MSG_ENC_KRB_PRIV_PART      28      /* EncKrbPrivPart */
+#define KRB5_MSG_ENC_KRB_CRED_PART      29      /* EncKrbCredPart */
+#define KRB5_MSG_ERROR                  30      /* KRB-ERROR type */
 
 /* address type constants */
 #define KRB5_ADDR_IPv4       0x02
@@ -942,54 +987,54 @@ g_warning("woohoo decrypted keytype:%d in frame:%u\n", keytype, pinfo->fd->num);
 #define KRB5_ADDR_IPv6       0x18
 
 /* encryption type constants */
-#define KRB5_ENCTYPE_NULL                0
-#define KRB5_ENCTYPE_DES_CBC_CRC         1
-#define KRB5_ENCTYPE_DES_CBC_MD4         2
-#define KRB5_ENCTYPE_DES_CBC_MD5         3
-#define KRB5_ENCTYPE_DES_CBC_RAW         4
-#define KRB5_ENCTYPE_DES3_CBC_SHA        5
-#define KRB5_ENCTYPE_DES3_CBC_RAW        6
-#define KRB5_ENCTYPE_DES_HMAC_SHA1       8
-#define KRB5_ENCTYPE_DSA_SHA1_CMS        9
-#define KRB5_ENCTYPE_RSA_MD5_CMS         10
-#define KRB5_ENCTYPE_RSA_SHA1_CMS        11
-#define KRB5_ENCTYPE_RC2_CBC_ENV         12
-#define KRB5_ENCTYPE_RSA_ENV             13
-#define KRB5_ENCTYPE_RSA_ES_OEAP_ENV     14
-#define KRB5_ENCTYPE_DES_EDE3_CBC_ENV    15
-#define KRB5_ENCTYPE_DES3_CBC_SHA1       16
-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
-#define KRB5_ENCTYPE_DES_CBC_MD5_NT      20
-#define KERB_ENCTYPE_RC4_HMAC            23
-#define KERB_ENCTYPE_RC4_HMAC_EXP        24
-#define KRB5_ENCTYPE_UNKNOWN                0x1ff
-#define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1   0x7007
-#define KRB5_ENCTYPE_RC4_PLAIN_EXP     0xffffff73
-#define KRB5_ENCTYPE_RC4_PLAIN         0xffffff74
-#define KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP 0xffffff78
-#define KRB5_ENCTYPE_RC4_HMAC_OLD_EXP  0xffffff79
-#define KRB5_ENCTYPE_RC4_PLAIN_OLD     0xffffff7a
-#define KRB5_ENCTYPE_RC4_HMAC_OLD      0xffffff7b
-#define KRB5_ENCTYPE_DES_PLAIN         0xffffff7c
-#define KRB5_ENCTYPE_RC4_SHA           0xffffff7d
-#define KRB5_ENCTYPE_RC4_LM            0xffffff7e
-#define KRB5_ENCTYPE_RC4_PLAIN2                0xffffff7f
-#define KRB5_ENCTYPE_RC4_MD4           0xffffff80
+#define KRB5_ENCTYPE_NULL                          0
+#define KRB5_ENCTYPE_DES_CBC_CRC                   1
+#define KRB5_ENCTYPE_DES_CBC_MD4                   2
+#define KRB5_ENCTYPE_DES_CBC_MD5                   3
+#define KRB5_ENCTYPE_DES_CBC_RAW                   4
+#define KRB5_ENCTYPE_DES3_CBC_SHA                  5
+#define KRB5_ENCTYPE_DES3_CBC_RAW                  6
+#define KRB5_ENCTYPE_DES_HMAC_SHA1                 8
+#define KRB5_ENCTYPE_DSA_SHA1_CMS                  9
+#define KRB5_ENCTYPE_RSA_MD5_CMS                  10
+#define KRB5_ENCTYPE_RSA_SHA1_CMS                 11
+#define KRB5_ENCTYPE_RC2_CBC_ENV                  12
+#define KRB5_ENCTYPE_RSA_ENV                      13
+#define KRB5_ENCTYPE_RSA_ES_OEAP_ENV              14
+#define KRB5_ENCTYPE_DES_EDE3_CBC_ENV             15
+#define KRB5_ENCTYPE_DES3_CBC_SHA1                16
+#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96      17
+#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96      18
+#define KRB5_ENCTYPE_DES_CBC_MD5_NT               20
+#define KERB_ENCTYPE_RC4_HMAC                     23
+#define KERB_ENCTYPE_RC4_HMAC_EXP                 24
+#define KRB5_ENCTYPE_UNKNOWN                   0x1ff
+#define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1     0x7007
+#define KRB5_ENCTYPE_RC4_PLAIN_EXP        0xffffff73
+#define KRB5_ENCTYPE_RC4_PLAIN            0xffffff74
+#define KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP    0xffffff78
+#define KRB5_ENCTYPE_RC4_HMAC_OLD_EXP     0xffffff79
+#define KRB5_ENCTYPE_RC4_PLAIN_OLD        0xffffff7a
+#define KRB5_ENCTYPE_RC4_HMAC_OLD         0xffffff7b
+#define KRB5_ENCTYPE_DES_PLAIN            0xffffff7c
+#define KRB5_ENCTYPE_RC4_SHA              0xffffff7d
+#define KRB5_ENCTYPE_RC4_LM               0xffffff7e
+#define KRB5_ENCTYPE_RC4_PLAIN2           0xffffff7f
+#define KRB5_ENCTYPE_RC4_MD4              0xffffff80
 
 /* checksum types */
-#define KRB5_CHKSUM_NONE                0
-#define KRB5_CHKSUM_CRC32               1
-#define KRB5_CHKSUM_MD4                 2
-#define KRB5_CHKSUM_KRB_DES_MAC         4
-#define KRB5_CHKSUM_KRB_DES_MAC_K       5
-#define KRB5_CHKSUM_MD5                 7
-#define KRB5_CHKSUM_MD5_DES             8
-/* the following four comes from packetcable */
-#define KRB5_CHKSUM_MD5_DES3            9
-#define KRB5_CHKSUM_HMAC_SHA1_DES3_KD   12
-#define KRB5_CHKSUM_HMAC_SHA1_DES3      13
-#define KRB5_CHKSUM_SHA1_UNKEYED        14
+#define KRB5_CHKSUM_NONE                         0
+#define KRB5_CHKSUM_CRC32                        1
+#define KRB5_CHKSUM_MD4                          2
+#define KRB5_CHKSUM_KRB_DES_MAC                  4
+#define KRB5_CHKSUM_KRB_DES_MAC_K                5
+#define KRB5_CHKSUM_MD5                          7
+#define KRB5_CHKSUM_MD5_DES                      8
+/* the following four come from packetcable */
+#define KRB5_CHKSUM_MD5_DES3                     9
+#define KRB5_CHKSUM_HMAC_SHA1_DES3_KD           12
+#define KRB5_CHKSUM_HMAC_SHA1_DES3              13
+#define KRB5_CHKSUM_SHA1_UNKEYED                14
 #define KRB5_CHKSUM_HMAC_MD5            0xffffff76
 #define KRB5_CHKSUM_MD5_HMAC            0xffffff77
 #define KRB5_CHKSUM_RC4_MD5             0xffffff78
@@ -999,56 +1044,58 @@ g_warning("woohoo decrypted keytype:%d in frame:%u\n", keytype, pinfo->fd->num);
 #define KRB5_CHKSUM_REAL_CRC32          0xffffff7c
 #define KRB5_CHKSUM_SHA1                0xffffff7d
 #define KRB5_CHKSUM_LM                  0xffffff7e
-#define KRB5_CHKSUM_GSSAPI             0x8003
+#define KRB5_CHKSUM_GSSAPI                  0x8003
 
 /*
  * For KERB_ENCTYPE_RC4_HMAC and KERB_ENCTYPE_RC4_HMAC_EXP, see
  *
- *     http://www.ietf.org/internet-drafts/draft-brezak-win2k-krb-rc4-hmac-04.txt
+ *      http://www.ietf.org/internet-drafts/draft-brezak-win2k-krb-rc4-hmac-04.txt
  *
  * unless it's expired.
  */
 
 /* pre-authentication type constants */
-#define KRB5_PA_TGS_REQ                1
-#define KRB5_PA_ENC_TIMESTAMP          2
-#define KRB5_PA_PW_SALT                3
-#define KRB5_PA_ENC_ENCKEY             4
-#define KRB5_PA_ENC_UNIX_TIME          5
-#define KRB5_PA_ENC_SANDIA_SECURID     6
-#define KRB5_PA_SESAME                 7
-#define KRB5_PA_OSF_DCE                8
-#define KRB5_PA_CYBERSAFE_SECUREID     9
-#define KRB5_PA_AFS3_SALT              10
-#define KRB5_PA_ENCTYPE_INFO           11
-#define KRB5_PA_SAM_CHALLENGE          12
-#define KRB5_PA_SAM_RESPONSE           13
-#define KRB5_PA_PK_AS_REQ              14
-#define KRB5_PA_PK_AS_REP              15
-#define KRB5_PA_DASS                   16
-#define KRB5_PA_ENCTYPE_INFO2          19
-#define KRB5_PA_USE_SPECIFIED_KVNO     20
-#define KRB5_PA_SAM_REDIRECT           21
-#define KRB5_PA_GET_FROM_TYPED_DATA    22
-#define KRB5_PA_SAM_ETYPE_INFO         23
-#define KRB5_PA_ALT_PRINC              24
-#define KRB5_PA_SAM_CHALLENGE2         30
-#define KRB5_PA_SAM_RESPONSE2          31
+#define KRB5_PA_TGS_REQ                   1
+#define KRB5_PA_ENC_TIMESTAMP             2
+#define KRB5_PA_PW_SALT                   3
+#define KRB5_PA_ENC_ENCKEY                4
+#define KRB5_PA_ENC_UNIX_TIME             5
+#define KRB5_PA_ENC_SANDIA_SECURID        6
+#define KRB5_PA_SESAME                    7
+#define KRB5_PA_OSF_DCE                   8
+#define KRB5_PA_CYBERSAFE_SECUREID        9
+#define KRB5_PA_AFS3_SALT                10
+#define KRB5_PA_ENCTYPE_INFO             11
+#define KRB5_PA_SAM_CHALLENGE            12
+#define KRB5_PA_SAM_RESPONSE             13
+#define KRB5_PA_PK_AS_REQ                14
+#define KRB5_PA_PK_AS_REP                15
+#define KRB5_PA_DASS                     16
+#define KRB5_PA_ENCTYPE_INFO2            19
+#define KRB5_PA_USE_SPECIFIED_KVNO       20
+#define KRB5_PA_SAM_REDIRECT             21
+#define KRB5_PA_GET_FROM_TYPED_DATA      22
+#define KRB5_PA_SAM_ETYPE_INFO           23
+#define KRB5_PA_ALT_PRINC                24
+#define KRB5_PA_SAM_CHALLENGE2           30
+#define KRB5_PA_SAM_RESPONSE2            31
 #define KRB5_TD_PKINIT_CMS_CERTIFICATES 101
-#define KRB5_TD_KRB_PRINCIPAL          102
-#define KRB5_TD_KRB_REALM              103
-#define KRB5_TD_TRUSTED_CERTIFIERS     104
-#define KRB5_TD_CERTIFICATE_INDEX      105
-#define KRB5_TD_APP_DEFINED_ERROR      106
-#define KRB5_TD_REQ_NONCE              107
-#define KRB5_TD_REQ_SEQ                108
+#define KRB5_TD_KRB_PRINCIPAL           102
+#define KRB5_TD_KRB_REALM               103
+#define KRB5_TD_TRUSTED_CERTIFIERS      104
+#define KRB5_TD_CERTIFICATE_INDEX       105
+#define KRB5_TD_APP_DEFINED_ERROR       106
+#define KRB5_TD_REQ_NONCE               107
+#define KRB5_TD_REQ_SEQ                 108
+
 /* preauthentication types >127 (i.e. negative ones) are app specific.
-   hopefully there will be no collissions here or we will have to
-   come up with something better
+   however since Microsoft is the dominant(only?) user of types in this range
+   we also treat the type as unsigned.
 */
-#define KRB5_PA_PAC_REQUEST            128     /* MS extension */
-#define KRB5_PA_S4U2SELF               129     /* Impersonation (Microsoft extension) */
-#define KRB5_PA_PROV_SRV_LOCATION      255     /* packetcable stuff */
+#define KRB5_PA_PAC_REQUEST              128    /* (Microsoft extension) */
+#define KRB5_PA_FOR_USER                 129    /* Impersonation (Microsoft extension) See [MS-SFU] */
+
+#define KRB5_PA_PROV_SRV_LOCATION 0xffffffff    /* (gint32)0xFF) packetcable stuff */
 
 /* Principal name-type */
 #define KRB5_NT_UNKNOWN        0
@@ -1064,26 +1111,26 @@ g_warning("woohoo decrypted keytype:%d in frame:%u\n", keytype, pinfo->fd->num);
 /*
  * MS specific name types, from
  *
- *     http://msdn.microsoft.com/library/en-us/security/security/kerb_external_name.asp
+ *      http://msdn.microsoft.com/library/en-us/security/security/kerb_external_name.asp
  */
-#define KRB5_NT_MS_PRINCIPAL           -128
-#define KRB5_NT_MS_PRINCIPAL_AND_SID   -129
-#define KRB5_NT_ENT_PRINCIPAL_AND_SID  -130
-#define KRB5_NT_PRINCIPAL_AND_SID      -131
-#define KRB5_NT_SRV_INST_AND_SID       -132
+#define KRB5_NT_MS_PRINCIPAL            -128
+#define KRB5_NT_MS_PRINCIPAL_AND_SID    -129
+#define KRB5_NT_ENT_PRINCIPAL_AND_SID   -130
+#define KRB5_NT_PRINCIPAL_AND_SID       -131
+#define KRB5_NT_SRV_INST_AND_SID        -132
 
 /* error table constants */
 /* I prefixed the krb5_err.et constant names with KRB5_ET_ for these */
-#define KRB5_ET_KRB5KDC_ERR_NONE                         0
-#define KRB5_ET_KRB5KDC_ERR_NAME_EXP                     1
-#define KRB5_ET_KRB5KDC_ERR_SERVICE_EXP                  2
-#define KRB5_ET_KRB5KDC_ERR_BAD_PVNO                     3
-#define KRB5_ET_KRB5KDC_ERR_C_OLD_MAST_KVNO              4
-#define KRB5_ET_KRB5KDC_ERR_S_OLD_MAST_KVNO              5
-#define KRB5_ET_KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN          6
-#define KRB5_ET_KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN          7
-#define KRB5_ET_KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE         8
-#define KRB5_ET_KRB5KDC_ERR_NULL_KEY                     9
+#define KRB5_ET_KRB5KDC_ERR_NONE                          0
+#define KRB5_ET_KRB5KDC_ERR_NAME_EXP                      1
+#define KRB5_ET_KRB5KDC_ERR_SERVICE_EXP                   2
+#define KRB5_ET_KRB5KDC_ERR_BAD_PVNO                      3
+#define KRB5_ET_KRB5KDC_ERR_C_OLD_MAST_KVNO               4
+#define KRB5_ET_KRB5KDC_ERR_S_OLD_MAST_KVNO               5
+#define KRB5_ET_KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN           6
+#define KRB5_ET_KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN           7
+#define KRB5_ET_KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE          8
+#define KRB5_ET_KRB5KDC_ERR_NULL_KEY                      9
 #define KRB5_ET_KRB5KDC_ERR_CANNOT_POSTDATE              10
 #define KRB5_ET_KRB5KDC_ERR_NEVER_VALID                  11
 #define KRB5_ET_KRB5KDC_ERR_POLICY                       12
@@ -1145,94 +1192,95 @@ g_warning("woohoo decrypted keytype:%d in frame:%u\n", keytype, pinfo->fd->num);
 #define KRB5_ET_KDC_ERR_KDC_NAME_MISMATCH                76
 
 static const value_string krb5_error_codes[] = {
-       { KRB5_ET_KRB5KDC_ERR_NONE, "KRB5KDC_ERR_NONE" },
-       { KRB5_ET_KRB5KDC_ERR_NAME_EXP, "KRB5KDC_ERR_NAME_EXP" },
-       { KRB5_ET_KRB5KDC_ERR_SERVICE_EXP, "KRB5KDC_ERR_SERVICE_EXP" },
-       { KRB5_ET_KRB5KDC_ERR_BAD_PVNO, "KRB5KDC_ERR_BAD_PVNO" },
-       { KRB5_ET_KRB5KDC_ERR_C_OLD_MAST_KVNO, "KRB5KDC_ERR_C_OLD_MAST_KVNO" },
-       { KRB5_ET_KRB5KDC_ERR_S_OLD_MAST_KVNO, "KRB5KDC_ERR_S_OLD_MAST_KVNO" },
-       { KRB5_ET_KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, "KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN" },
-       { KRB5_ET_KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN, "KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN" },
-       { KRB5_ET_KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE, "KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE" },
-       { KRB5_ET_KRB5KDC_ERR_NULL_KEY, "KRB5KDC_ERR_NULL_KEY" },
-       { KRB5_ET_KRB5KDC_ERR_CANNOT_POSTDATE, "KRB5KDC_ERR_CANNOT_POSTDATE" },
-       { KRB5_ET_KRB5KDC_ERR_NEVER_VALID, "KRB5KDC_ERR_NEVER_VALID" },
-       { KRB5_ET_KRB5KDC_ERR_POLICY, "KRB5KDC_ERR_POLICY" },
-       { KRB5_ET_KRB5KDC_ERR_BADOPTION, "KRB5KDC_ERR_BADOPTION" },
-       { KRB5_ET_KRB5KDC_ERR_ETYPE_NOSUPP, "KRB5KDC_ERR_ETYPE_NOSUPP" },
-       { KRB5_ET_KRB5KDC_ERR_SUMTYPE_NOSUPP, "KRB5KDC_ERR_SUMTYPE_NOSUPP" },
-       { KRB5_ET_KRB5KDC_ERR_PADATA_TYPE_NOSUPP, "KRB5KDC_ERR_PADATA_TYPE_NOSUPP" },
-       { KRB5_ET_KRB5KDC_ERR_TRTYPE_NOSUPP, "KRB5KDC_ERR_TRTYPE_NOSUPP" },
-       { KRB5_ET_KRB5KDC_ERR_CLIENT_REVOKED, "KRB5KDC_ERR_CLIENT_REVOKED" },
-       { KRB5_ET_KRB5KDC_ERR_SERVICE_REVOKED, "KRB5KDC_ERR_SERVICE_REVOKED" },
-       { KRB5_ET_KRB5KDC_ERR_TGT_REVOKED, "KRB5KDC_ERR_TGT_REVOKED" },
-       { KRB5_ET_KRB5KDC_ERR_CLIENT_NOTYET, "KRB5KDC_ERR_CLIENT_NOTYET" },
-       { KRB5_ET_KRB5KDC_ERR_SERVICE_NOTYET, "KRB5KDC_ERR_SERVICE_NOTYET" },
-       { KRB5_ET_KRB5KDC_ERR_KEY_EXP, "KRB5KDC_ERR_KEY_EXP" },
-       { KRB5_ET_KRB5KDC_ERR_PREAUTH_FAILED, "KRB5KDC_ERR_PREAUTH_FAILED" },
-       { KRB5_ET_KRB5KDC_ERR_PREAUTH_REQUIRED, "KRB5KDC_ERR_PREAUTH_REQUIRED" },
-       { KRB5_ET_KRB5KDC_ERR_SERVER_NOMATCH, "KRB5KDC_ERR_SERVER_NOMATCH" },
-       { KRB5_ET_KRB5KDC_ERR_MUST_USE_USER2USER, "KRB5KDC_ERR_MUST_USE_USER2USER" },
-       { KRB5_ET_KRB5KDC_ERR_PATH_NOT_ACCEPTED, "KRB5KDC_ERR_PATH_NOT_ACCEPTED" },
-       { KRB5_ET_KRB5KDC_ERR_SVC_UNAVAILABLE, "KRB5KDC_ERR_SVC_UNAVAILABLE" },
-       { KRB5_ET_KRB5KRB_AP_ERR_BAD_INTEGRITY, "KRB5KRB_AP_ERR_BAD_INTEGRITY" },
-       { KRB5_ET_KRB5KRB_AP_ERR_TKT_EXPIRED, "KRB5KRB_AP_ERR_TKT_EXPIRED" },
-       { KRB5_ET_KRB5KRB_AP_ERR_TKT_NYV, "KRB5KRB_AP_ERR_TKT_NYV" },
-       { KRB5_ET_KRB5KRB_AP_ERR_REPEAT, "KRB5KRB_AP_ERR_REPEAT" },
-       { KRB5_ET_KRB5KRB_AP_ERR_NOT_US, "KRB5KRB_AP_ERR_NOT_US" },
-       { KRB5_ET_KRB5KRB_AP_ERR_BADMATCH, "KRB5KRB_AP_ERR_BADMATCH" },
-       { KRB5_ET_KRB5KRB_AP_ERR_SKEW, "KRB5KRB_AP_ERR_SKEW" },
-       { KRB5_ET_KRB5KRB_AP_ERR_BADADDR, "KRB5KRB_AP_ERR_BADADDR" },
-       { KRB5_ET_KRB5KRB_AP_ERR_BADVERSION, "KRB5KRB_AP_ERR_BADVERSION" },
-       { KRB5_ET_KRB5KRB_AP_ERR_MSG_TYPE, "KRB5KRB_AP_ERR_MSG_TYPE" },
-       { KRB5_ET_KRB5KRB_AP_ERR_MODIFIED, "KRB5KRB_AP_ERR_MODIFIED" },
-       { KRB5_ET_KRB5KRB_AP_ERR_BADORDER, "KRB5KRB_AP_ERR_BADORDER" },
-       { KRB5_ET_KRB5KRB_AP_ERR_ILL_CR_TKT, "KRB5KRB_AP_ERR_ILL_CR_TKT" },
-       { KRB5_ET_KRB5KRB_AP_ERR_BADKEYVER, "KRB5KRB_AP_ERR_BADKEYVER" },
-       { KRB5_ET_KRB5KRB_AP_ERR_NOKEY, "KRB5KRB_AP_ERR_NOKEY" },
-       { KRB5_ET_KRB5KRB_AP_ERR_MUT_FAIL, "KRB5KRB_AP_ERR_MUT_FAIL" },
-       { KRB5_ET_KRB5KRB_AP_ERR_BADDIRECTION, "KRB5KRB_AP_ERR_BADDIRECTION" },
-       { KRB5_ET_KRB5KRB_AP_ERR_METHOD, "KRB5KRB_AP_ERR_METHOD" },
-       { KRB5_ET_KRB5KRB_AP_ERR_BADSEQ, "KRB5KRB_AP_ERR_BADSEQ" },
-       { KRB5_ET_KRB5KRB_AP_ERR_INAPP_CKSUM, "KRB5KRB_AP_ERR_INAPP_CKSUM" },
-       { KRB5_ET_KRB5KDC_AP_PATH_NOT_ACCEPTED, "KRB5KDC_AP_PATH_NOT_ACCEPTED" },
-       { KRB5_ET_KRB5KRB_ERR_RESPONSE_TOO_BIG, "KRB5KRB_ERR_RESPONSE_TOO_BIG"},
-       { KRB5_ET_KRB5KRB_ERR_GENERIC, "KRB5KRB_ERR_GENERIC" },
-       { KRB5_ET_KRB5KRB_ERR_FIELD_TOOLONG, "KRB5KRB_ERR_FIELD_TOOLONG" },
-       { KRB5_ET_KDC_ERROR_CLIENT_NOT_TRUSTED, "KDC_ERROR_CLIENT_NOT_TRUSTED" },
-       { KRB5_ET_KDC_ERROR_KDC_NOT_TRUSTED, "KDC_ERROR_KDC_NOT_TRUSTED" },
-       { KRB5_ET_KDC_ERROR_INVALID_SIG, "KDC_ERROR_INVALID_SIG" },
-       { KRB5_ET_KDC_ERR_KEY_TOO_WEAK, "KDC_ERR_KEY_TOO_WEAK" },
-       { KRB5_ET_KDC_ERR_CERTIFICATE_MISMATCH, "KDC_ERR_CERTIFICATE_MISMATCH" },
-       { KRB5_ET_KRB_AP_ERR_NO_TGT, "KRB_AP_ERR_NO_TGT" },
-       { KRB5_ET_KDC_ERR_WRONG_REALM, "KDC_ERR_WRONG_REALM" },
-       { KRB5_ET_KRB_AP_ERR_USER_TO_USER_REQUIRED, "KRB_AP_ERR_USER_TO_USER_REQUIRED" },
-       { KRB5_ET_KDC_ERR_CANT_VERIFY_CERTIFICATE, "KDC_ERR_CANT_VERIFY_CERTIFICATE" },
-       { KRB5_ET_KDC_ERR_INVALID_CERTIFICATE, "KDC_ERR_INVALID_CERTIFICATE" },
-       { KRB5_ET_KDC_ERR_REVOKED_CERTIFICATE, "KDC_ERR_REVOKED_CERTIFICATE" },
-       { KRB5_ET_KDC_ERR_REVOCATION_STATUS_UNKNOWN, "KDC_ERR_REVOCATION_STATUS_UNKNOWN" },
-       { KRB5_ET_KDC_ERR_REVOCATION_STATUS_UNAVAILABLE, "KDC_ERR_REVOCATION_STATUS_UNAVAILABLE" },
-       { KRB5_ET_KDC_ERR_CLIENT_NAME_MISMATCH, "KDC_ERR_CLIENT_NAME_MISMATCH" },
-       { KRB5_ET_KDC_ERR_KDC_NAME_MISMATCH, "KDC_ERR_KDC_NAME_MISMATCH" },
-       { 0, NULL }
+    { KRB5_ET_KRB5KDC_ERR_NONE, "KRB5KDC_ERR_NONE" },
+    { KRB5_ET_KRB5KDC_ERR_NAME_EXP, "KRB5KDC_ERR_NAME_EXP" },
+    { KRB5_ET_KRB5KDC_ERR_SERVICE_EXP, "KRB5KDC_ERR_SERVICE_EXP" },
+    { KRB5_ET_KRB5KDC_ERR_BAD_PVNO, "KRB5KDC_ERR_BAD_PVNO" },
+    { KRB5_ET_KRB5KDC_ERR_C_OLD_MAST_KVNO, "KRB5KDC_ERR_C_OLD_MAST_KVNO" },
+    { KRB5_ET_KRB5KDC_ERR_S_OLD_MAST_KVNO, "KRB5KDC_ERR_S_OLD_MAST_KVNO" },
+    { KRB5_ET_KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, "KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN" },
+    { KRB5_ET_KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN, "KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN" },
+    { KRB5_ET_KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE, "KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE" },
+    { KRB5_ET_KRB5KDC_ERR_NULL_KEY, "KRB5KDC_ERR_NULL_KEY" },
+    { KRB5_ET_KRB5KDC_ERR_CANNOT_POSTDATE, "KRB5KDC_ERR_CANNOT_POSTDATE" },
+    { KRB5_ET_KRB5KDC_ERR_NEVER_VALID, "KRB5KDC_ERR_NEVER_VALID" },
+    { KRB5_ET_KRB5KDC_ERR_POLICY, "KRB5KDC_ERR_POLICY" },
+    { KRB5_ET_KRB5KDC_ERR_BADOPTION, "KRB5KDC_ERR_BADOPTION" },
+    { KRB5_ET_KRB5KDC_ERR_ETYPE_NOSUPP, "KRB5KDC_ERR_ETYPE_NOSUPP" },
+    { KRB5_ET_KRB5KDC_ERR_SUMTYPE_NOSUPP, "KRB5KDC_ERR_SUMTYPE_NOSUPP" },
+    { KRB5_ET_KRB5KDC_ERR_PADATA_TYPE_NOSUPP, "KRB5KDC_ERR_PADATA_TYPE_NOSUPP" },
+    { KRB5_ET_KRB5KDC_ERR_TRTYPE_NOSUPP, "KRB5KDC_ERR_TRTYPE_NOSUPP" },
+    { KRB5_ET_KRB5KDC_ERR_CLIENT_REVOKED, "KRB5KDC_ERR_CLIENT_REVOKED" },
+    { KRB5_ET_KRB5KDC_ERR_SERVICE_REVOKED, "KRB5KDC_ERR_SERVICE_REVOKED" },
+    { KRB5_ET_KRB5KDC_ERR_TGT_REVOKED, "KRB5KDC_ERR_TGT_REVOKED" },
+    { KRB5_ET_KRB5KDC_ERR_CLIENT_NOTYET, "KRB5KDC_ERR_CLIENT_NOTYET" },
+    { KRB5_ET_KRB5KDC_ERR_SERVICE_NOTYET, "KRB5KDC_ERR_SERVICE_NOTYET" },
+    { KRB5_ET_KRB5KDC_ERR_KEY_EXP, "KRB5KDC_ERR_KEY_EXP" },
+    { KRB5_ET_KRB5KDC_ERR_PREAUTH_FAILED, "KRB5KDC_ERR_PREAUTH_FAILED" },
+    { KRB5_ET_KRB5KDC_ERR_PREAUTH_REQUIRED, "KRB5KDC_ERR_PREAUTH_REQUIRED" },
+    { KRB5_ET_KRB5KDC_ERR_SERVER_NOMATCH, "KRB5KDC_ERR_SERVER_NOMATCH" },
+    { KRB5_ET_KRB5KDC_ERR_MUST_USE_USER2USER, "KRB5KDC_ERR_MUST_USE_USER2USER" },
+    { KRB5_ET_KRB5KDC_ERR_PATH_NOT_ACCEPTED, "KRB5KDC_ERR_PATH_NOT_ACCEPTED" },
+    { KRB5_ET_KRB5KDC_ERR_SVC_UNAVAILABLE, "KRB5KDC_ERR_SVC_UNAVAILABLE" },
+    { KRB5_ET_KRB5KRB_AP_ERR_BAD_INTEGRITY, "KRB5KRB_AP_ERR_BAD_INTEGRITY" },
+    { KRB5_ET_KRB5KRB_AP_ERR_TKT_EXPIRED, "KRB5KRB_AP_ERR_TKT_EXPIRED" },
+    { KRB5_ET_KRB5KRB_AP_ERR_TKT_NYV, "KRB5KRB_AP_ERR_TKT_NYV" },
+    { KRB5_ET_KRB5KRB_AP_ERR_REPEAT, "KRB5KRB_AP_ERR_REPEAT" },
+    { KRB5_ET_KRB5KRB_AP_ERR_NOT_US, "KRB5KRB_AP_ERR_NOT_US" },
+    { KRB5_ET_KRB5KRB_AP_ERR_BADMATCH, "KRB5KRB_AP_ERR_BADMATCH" },
+    { KRB5_ET_KRB5KRB_AP_ERR_SKEW, "KRB5KRB_AP_ERR_SKEW" },
+    { KRB5_ET_KRB5KRB_AP_ERR_BADADDR, "KRB5KRB_AP_ERR_BADADDR" },
+    { KRB5_ET_KRB5KRB_AP_ERR_BADVERSION, "KRB5KRB_AP_ERR_BADVERSION" },
+    { KRB5_ET_KRB5KRB_AP_ERR_MSG_TYPE, "KRB5KRB_AP_ERR_MSG_TYPE" },
+    { KRB5_ET_KRB5KRB_AP_ERR_MODIFIED, "KRB5KRB_AP_ERR_MODIFIED" },
+    { KRB5_ET_KRB5KRB_AP_ERR_BADORDER, "KRB5KRB_AP_ERR_BADORDER" },
+    { KRB5_ET_KRB5KRB_AP_ERR_ILL_CR_TKT, "KRB5KRB_AP_ERR_ILL_CR_TKT" },
+    { KRB5_ET_KRB5KRB_AP_ERR_BADKEYVER, "KRB5KRB_AP_ERR_BADKEYVER" },
+    { KRB5_ET_KRB5KRB_AP_ERR_NOKEY, "KRB5KRB_AP_ERR_NOKEY" },
+    { KRB5_ET_KRB5KRB_AP_ERR_MUT_FAIL, "KRB5KRB_AP_ERR_MUT_FAIL" },
+    { KRB5_ET_KRB5KRB_AP_ERR_BADDIRECTION, "KRB5KRB_AP_ERR_BADDIRECTION" },
+    { KRB5_ET_KRB5KRB_AP_ERR_METHOD, "KRB5KRB_AP_ERR_METHOD" },
+    { KRB5_ET_KRB5KRB_AP_ERR_BADSEQ, "KRB5KRB_AP_ERR_BADSEQ" },
+    { KRB5_ET_KRB5KRB_AP_ERR_INAPP_CKSUM, "KRB5KRB_AP_ERR_INAPP_CKSUM" },
+    { KRB5_ET_KRB5KDC_AP_PATH_NOT_ACCEPTED, "KRB5KDC_AP_PATH_NOT_ACCEPTED" },
+    { KRB5_ET_KRB5KRB_ERR_RESPONSE_TOO_BIG, "KRB5KRB_ERR_RESPONSE_TOO_BIG"},
+    { KRB5_ET_KRB5KRB_ERR_GENERIC, "KRB5KRB_ERR_GENERIC" },
+    { KRB5_ET_KRB5KRB_ERR_FIELD_TOOLONG, "KRB5KRB_ERR_FIELD_TOOLONG" },
+    { KRB5_ET_KDC_ERROR_CLIENT_NOT_TRUSTED, "KDC_ERROR_CLIENT_NOT_TRUSTED" },
+    { KRB5_ET_KDC_ERROR_KDC_NOT_TRUSTED, "KDC_ERROR_KDC_NOT_TRUSTED" },
+    { KRB5_ET_KDC_ERROR_INVALID_SIG, "KDC_ERROR_INVALID_SIG" },
+    { KRB5_ET_KDC_ERR_KEY_TOO_WEAK, "KDC_ERR_KEY_TOO_WEAK" },
+    { KRB5_ET_KDC_ERR_CERTIFICATE_MISMATCH, "KDC_ERR_CERTIFICATE_MISMATCH" },
+    { KRB5_ET_KRB_AP_ERR_NO_TGT, "KRB_AP_ERR_NO_TGT" },
+    { KRB5_ET_KDC_ERR_WRONG_REALM, "KDC_ERR_WRONG_REALM" },
+    { KRB5_ET_KRB_AP_ERR_USER_TO_USER_REQUIRED, "KRB_AP_ERR_USER_TO_USER_REQUIRED" },
+    { KRB5_ET_KDC_ERR_CANT_VERIFY_CERTIFICATE, "KDC_ERR_CANT_VERIFY_CERTIFICATE" },
+    { KRB5_ET_KDC_ERR_INVALID_CERTIFICATE, "KDC_ERR_INVALID_CERTIFICATE" },
+    { KRB5_ET_KDC_ERR_REVOKED_CERTIFICATE, "KDC_ERR_REVOKED_CERTIFICATE" },
+    { KRB5_ET_KDC_ERR_REVOCATION_STATUS_UNKNOWN, "KDC_ERR_REVOCATION_STATUS_UNKNOWN" },
+    { KRB5_ET_KDC_ERR_REVOCATION_STATUS_UNAVAILABLE, "KDC_ERR_REVOCATION_STATUS_UNAVAILABLE" },
+    { KRB5_ET_KDC_ERR_CLIENT_NAME_MISMATCH, "KDC_ERR_CLIENT_NAME_MISMATCH" },
+    { KRB5_ET_KDC_ERR_KDC_NAME_MISMATCH, "KDC_ERR_KDC_NAME_MISMATCH" },
+    { 0, NULL }
 };
 
 
-#define PAC_LOGON_INFO         1
-#define PAC_CREDENTIAL_TYPE    2
-#define PAC_SERVER_CHECKSUM    6
-#define PAC_PRIVSVR_CHECKSUM   7
-#define PAC_CLIENT_INFO_TYPE   10
-#define PAC_CONSTRAINED_DELEGATION 11
-#define PAC_UPN_DNS_INFO        12
+#define PAC_LOGON_INFO              1
+#define PAC_CREDENTIAL_TYPE         2
+#define PAC_SERVER_CHECKSUM         6
+#define PAC_PRIVSVR_CHECKSUM        7
+#define PAC_CLIENT_INFO_TYPE       10
+#define PAC_S4U_DELEGATION_INFO    11
+#define PAC_UPN_DNS_INFO           12
+
 static const value_string w2k_pac_types[] = {
-    { PAC_LOGON_INFO           , "Logon Info" },
-    { PAC_CREDENTIAL_TYPE      , "Credential Type" },
-    { PAC_SERVER_CHECKSUM      , "Server Checksum" },
-    { PAC_PRIVSVR_CHECKSUM     , "Privsvr Checksum" },
-    { PAC_CLIENT_INFO_TYPE     , "Client Info Type" },
-    { PAC_CONSTRAINED_DELEGATION, "Constrained Delegation" },
-    { PAC_UPN_DNS_INFO         , "UPN DNS Info" },
+    { PAC_LOGON_INFO            , "Logon Info" },
+    { PAC_CREDENTIAL_TYPE       , "Credential Type" },
+    { PAC_SERVER_CHECKSUM       , "Server Checksum" },
+    { PAC_PRIVSVR_CHECKSUM      , "Privsvr Checksum" },
+    { PAC_CLIENT_INFO_TYPE      , "Client Info Type" },
+    { PAC_S4U_DELEGATION_INFO   , "S4U Delegation Info" },
+    { PAC_UPN_DNS_INFO          , "UPN DNS Info" },
     { 0, NULL },
 };
 
@@ -1290,7 +1338,7 @@ static const value_string krb5_preauthentication_types[] = {
     { KRB5_TD_REQ_NONCE            , "TD-REQ-NONCE" },
     { KRB5_TD_REQ_SEQ              , "TD-REQ-SEQ" },
     { KRB5_PA_PAC_REQUEST          , "PA-PAC-REQUEST" },
-    { KRB5_PA_S4U2SELF             , "PA-S4U2SELF" },
+    { KRB5_PA_FOR_USER             , "PA-FOR-USER" },
     { KRB5_PA_PROV_SRV_LOCATION    , "PA-PROV-SRV-LOCATION" },
     { 0                            , NULL },
 };
@@ -1354,38 +1402,39 @@ static const value_string krb5_checksum_types[] = {
     { KRB5_CHKSUM_REAL_CRC32      , "real-crc32" },
     { KRB5_CHKSUM_SHA1            , "sha1" },
     { KRB5_CHKSUM_LM              , "lm" },
-    { KRB5_CHKSUM_GSSAPI         , "gssapi-8003" },
+    { KRB5_CHKSUM_GSSAPI          , "gssapi-8003" },
     { 0                           , NULL },
 };
 
-#define KRB5_AD_IF_RELEVANT                    1
-#define KRB5_AD_INTENDED_FOR_SERVER            2
-#define KRB5_AD_INTENDED_FOR_APPLICATION_CLASS 3
-#define KRB5_AD_KDC_ISSUED                     4
-#define KRB5_AD_OR                             5
-#define KRB5_AD_MANDATORY_TICKET_EXTENSIONS    6
-#define KRB5_AD_IN_TICKET_EXTENSIONS           7
-#define KRB5_AD_MANDATORY_FOR_KDC              8
-#define KRB5_AD_OSF_DCE                                64
-#define KRB5_AD_SESAME                         65
-#define KRB5_AD_OSF_DCE_PKI_CERTID             66
-#define KRB5_AD_WIN2K_PAC                              128
-#define KRB5_AD_SIGNTICKET                     0xffffffef
+#define KRB5_AD_IF_RELEVANT                              1
+#define KRB5_AD_INTENDED_FOR_SERVER                      2
+#define KRB5_AD_INTENDED_FOR_APPLICATION_CLASS           3
+#define KRB5_AD_KDC_ISSUED                               4
+#define KRB5_AD_OR                                       5
+#define KRB5_AD_MANDATORY_TICKET_EXTENSIONS              6
+#define KRB5_AD_IN_TICKET_EXTENSIONS                     7
+#define KRB5_AD_MANDATORY_FOR_KDC                        8
+#define KRB5_AD_OSF_DCE                                 64
+#define KRB5_AD_SESAME                                  65
+#define KRB5_AD_OSF_DCE_PKI_CERTID                      66
+#define KRB5_AD_WIN2K_PAC                              128
+#define KRB5_AD_SIGNTICKET                      0xffffffef
+
 static const value_string krb5_ad_types[] = {
-    { KRB5_AD_IF_RELEVANT                      , "AD-IF-RELEVANT" },
-    { KRB5_AD_INTENDED_FOR_SERVER              , "AD-Intended-For-Server" },
-    { KRB5_AD_INTENDED_FOR_APPLICATION_CLASS   , "AD-Intended-For-Application-Class" },
-    { KRB5_AD_KDC_ISSUED                       , "AD-KDCIssued" },
-    { KRB5_AD_OR                               , "AD-AND-OR" },
-    { KRB5_AD_MANDATORY_TICKET_EXTENSIONS      , "AD-Mandatory-Ticket-Extensions" },
-    { KRB5_AD_IN_TICKET_EXTENSIONS             , "AD-IN-Ticket-Extensions" },
-    { KRB5_AD_MANDATORY_FOR_KDC                        , "AD-MANDATORY-FOR-KDC" },
-    { KRB5_AD_OSF_DCE                          , "AD-OSF-DCE" },
-    { KRB5_AD_SESAME                           , "AD-SESAME" },
-    { KRB5_AD_OSF_DCE_PKI_CERTID               , "AD-OSF-DCE-PKI-CertID" },
-    { KRB5_AD_WIN2K_PAC                                , "AD-Win2k-PAC" },
-    { KRB5_AD_SIGNTICKET                       , "AD-SignTicket" },
-    { 0        , NULL },
+    { KRB5_AD_IF_RELEVANT                       , "AD-IF-RELEVANT" },
+    { KRB5_AD_INTENDED_FOR_SERVER               , "AD-Intended-For-Server" },
+    { KRB5_AD_INTENDED_FOR_APPLICATION_CLASS    , "AD-Intended-For-Application-Class" },
+    { KRB5_AD_KDC_ISSUED                        , "AD-KDCIssued" },
+    { KRB5_AD_OR                                , "AD-AND-OR" },
+    { KRB5_AD_MANDATORY_TICKET_EXTENSIONS       , "AD-Mandatory-Ticket-Extensions" },
+    { KRB5_AD_IN_TICKET_EXTENSIONS              , "AD-IN-Ticket-Extensions" },
+    { KRB5_AD_MANDATORY_FOR_KDC                 , "AD-MANDATORY-FOR-KDC" },
+    { KRB5_AD_OSF_DCE                           , "AD-OSF-DCE" },
+    { KRB5_AD_SESAME                            , "AD-SESAME" },
+    { KRB5_AD_OSF_DCE_PKI_CERTID                , "AD-OSF-DCE-PKI-CertID" },
+    { KRB5_AD_WIN2K_PAC                         , "AD-Win2k-PAC" },
+    { KRB5_AD_SIGNTICKET                        , "AD-SignTicket" },
+    { 0 , NULL },
 };
 
 static const value_string krb5_transited_types[] = {
@@ -1394,37 +1443,37 @@ static const value_string krb5_transited_types[] = {
 };
 
 static const value_string krb5_address_types[] = {
-    { KRB5_ADDR_IPv4,          "IPv4"},
-    { KRB5_ADDR_CHAOS,         "CHAOS"},
-    { KRB5_ADDR_XEROX,         "XEROX"},
-    { KRB5_ADDR_ISO,           "ISO"},
-    { KRB5_ADDR_DECNET,                "DECNET"},
-    { KRB5_ADDR_APPLETALK,     "APPLETALK"},
-    { KRB5_ADDR_NETBIOS,       "NETBIOS"},
-    { KRB5_ADDR_IPv6,          "IPv6"},
+    { KRB5_ADDR_IPv4,           "IPv4"},
+    { KRB5_ADDR_CHAOS,          "CHAOS"},
+    { KRB5_ADDR_XEROX,          "XEROX"},
+    { KRB5_ADDR_ISO,            "ISO"},
+    { KRB5_ADDR_DECNET,         "DECNET"},
+    { KRB5_ADDR_APPLETALK,      "APPLETALK"},
+    { KRB5_ADDR_NETBIOS,        "NETBIOS"},
+    { KRB5_ADDR_IPv6,           "IPv6"},
     { 0,                        NULL },
 };
 
 static const value_string krb5_msg_types[] = {
-       { KRB5_MSG_TICKET,              "Ticket" },
-       { KRB5_MSG_AUTHENTICATOR,       "Authenticator" },
-       { KRB5_MSG_ENC_TICKET_PART,     "EncTicketPart" },
-       { KRB5_MSG_TGS_REQ,             "TGS-REQ" },
-       { KRB5_MSG_TGS_REP,             "TGS-REP" },
-       { KRB5_MSG_AS_REQ,              "AS-REQ" },
-       { KRB5_MSG_AS_REP,              "AS-REP" },
-       { KRB5_MSG_AP_REQ,              "AP-REQ" },
-       { KRB5_MSG_AP_REP,              "AP-REP" },
-       { KRB5_MSG_SAFE,                "KRB-SAFE" },
-       { KRB5_MSG_PRIV,                "KRB-PRIV" },
-       { KRB5_MSG_CRED,                "KRB-CRED" },
-       { KRB5_MSG_ENC_AS_REP_PART,     "EncASRepPart" },
-       { KRB5_MSG_ENC_TGS_REP_PART,    "EncTGSRepPart" },
-       { KRB5_MSG_ENC_AP_REP_PART,     "EncAPRepPart" },
-       { KRB5_MSG_ENC_KRB_PRIV_PART,   "EncKrbPrivPart" },
-       { KRB5_MSG_ENC_KRB_CRED_PART,   "EncKrbCredPart" },
-       { KRB5_MSG_ERROR,               "KRB-ERROR" },
-        { 0, NULL },
+    { KRB5_MSG_TICKET,            "Ticket" },
+    { KRB5_MSG_AUTHENTICATOR,     "Authenticator" },
+    { KRB5_MSG_ENC_TICKET_PART,   "EncTicketPart" },
+    { KRB5_MSG_TGS_REQ,           "TGS-REQ" },
+    { KRB5_MSG_TGS_REP,           "TGS-REP" },
+    { KRB5_MSG_AS_REQ,            "AS-REQ" },
+    { KRB5_MSG_AS_REP,            "AS-REP" },
+    { KRB5_MSG_AP_REQ,            "AP-REQ" },
+    { KRB5_MSG_AP_REP,            "AP-REP" },
+    { KRB5_MSG_SAFE,              "KRB-SAFE" },
+    { KRB5_MSG_PRIV,              "KRB-PRIV" },
+    { KRB5_MSG_CRED,              "KRB-CRED" },
+    { KRB5_MSG_ENC_AS_REP_PART,   "EncASRepPart" },
+    { KRB5_MSG_ENC_TGS_REP_PART,  "EncTGSRepPart" },
+    { KRB5_MSG_ENC_AP_REP_PART,   "EncAPRepPart" },
+    { KRB5_MSG_ENC_KRB_PRIV_PART, "EncKrbPrivPart" },
+    { KRB5_MSG_ENC_KRB_CRED_PART, "EncKrbCredPart" },
+    { KRB5_MSG_ERROR,             "KRB-ERROR" },
+    { 0, NULL },
 };
 
 
@@ -1448,202 +1497,206 @@ static int dissect_krb5_CRED(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_c
 static int dissect_krb5_ERROR(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_);
 
 static const ber_old_choice_t kerberos_applications_choice[] = {
-       { KRB5_MSG_TICKET,      BER_CLASS_APP,  KRB5_MSG_TICKET,        0, dissect_krb5_Application_1 },
-       { KRB5_MSG_AUTHENTICATOR,       BER_CLASS_APP,  KRB5_MSG_AUTHENTICATOR, 0, dissect_krb5_Authenticator },
-       { KRB5_MSG_ENC_TICKET_PART, BER_CLASS_APP,      KRB5_MSG_ENC_TICKET_PART, 0, dissect_krb5_EncTicketPart },
-       { KRB5_MSG_AS_REQ,      BER_CLASS_APP,  KRB5_MSG_AS_REQ,        0,      dissect_krb5_KDC_REQ },
-       { KRB5_MSG_AS_REP,      BER_CLASS_APP,  KRB5_MSG_AS_REP,        0,      dissect_krb5_KDC_REP },
-       { KRB5_MSG_TGS_REQ,     BER_CLASS_APP,  KRB5_MSG_TGS_REQ,       0,      dissect_krb5_KDC_REQ },
-       { KRB5_MSG_TGS_REP,     BER_CLASS_APP,  KRB5_MSG_TGS_REP,       0,      dissect_krb5_KDC_REP },
-       { KRB5_MSG_AP_REQ,      BER_CLASS_APP,  KRB5_MSG_AP_REQ,        0,      dissect_krb5_AP_REQ },
-       { KRB5_MSG_AP_REP,      BER_CLASS_APP,  KRB5_MSG_AP_REP,        0,      dissect_krb5_AP_REP },
-       { KRB5_MSG_ENC_AS_REP_PART, BER_CLASS_APP, KRB5_MSG_ENC_AS_REP_PART, 0, dissect_krb5_EncKDCRepPart },
-       { KRB5_MSG_ENC_TGS_REP_PART, BER_CLASS_APP, KRB5_MSG_ENC_TGS_REP_PART, 0, dissect_krb5_EncKDCRepPart },
-       { KRB5_MSG_ENC_AP_REP_PART, BER_CLASS_APP, KRB5_MSG_ENC_AP_REP_PART, 0, dissect_krb5_EncAPRepPart },
-       { KRB5_MSG_ENC_KRB_PRIV_PART, BER_CLASS_APP, KRB5_MSG_ENC_KRB_PRIV_PART, 0, dissect_krb5_EncKrbPrivPart },
-       { KRB5_MSG_ENC_KRB_CRED_PART, BER_CLASS_APP, KRB5_MSG_ENC_KRB_CRED_PART, 0, dissect_krb5_EncKrbCredPart },
-       { KRB5_MSG_SAFE,        BER_CLASS_APP,  KRB5_MSG_SAFE,          0,      dissect_krb5_SAFE },
-       { KRB5_MSG_PRIV,        BER_CLASS_APP,  KRB5_MSG_PRIV,          0,      dissect_krb5_PRIV },
-       { KRB5_MSG_CRED,        BER_CLASS_APP,  KRB5_MSG_CRED,          0,      dissect_krb5_CRED },
-       { KRB5_MSG_ERROR,       BER_CLASS_APP,  KRB5_MSG_ERROR,         0,      dissect_krb5_ERROR },
-       { 0, 0, 0, 0, NULL }
+    { KRB5_MSG_TICKET,  BER_CLASS_APP,  KRB5_MSG_TICKET,        0, dissect_krb5_Application_1 },
+    { KRB5_MSG_AUTHENTICATOR,   BER_CLASS_APP,  KRB5_MSG_AUTHENTICATOR,   0, dissect_krb5_Authenticator },
+    { KRB5_MSG_ENC_TICKET_PART, BER_CLASS_APP,  KRB5_MSG_ENC_TICKET_PART, 0, dissect_krb5_EncTicketPart },
+    { KRB5_MSG_AS_REQ,  BER_CLASS_APP,  KRB5_MSG_AS_REQ,        0,      dissect_krb5_KDC_REQ },
+    { KRB5_MSG_AS_REP,  BER_CLASS_APP,  KRB5_MSG_AS_REP,        0,      dissect_krb5_KDC_REP },
+    { KRB5_MSG_TGS_REQ, BER_CLASS_APP,  KRB5_MSG_TGS_REQ,       0,      dissect_krb5_KDC_REQ },
+    { KRB5_MSG_TGS_REP, BER_CLASS_APP,  KRB5_MSG_TGS_REP,       0,      dissect_krb5_KDC_REP },
+    { KRB5_MSG_AP_REQ,  BER_CLASS_APP,  KRB5_MSG_AP_REQ,        0,      dissect_krb5_AP_REQ },
+    { KRB5_MSG_AP_REP,  BER_CLASS_APP,  KRB5_MSG_AP_REP,        0,      dissect_krb5_AP_REP },
+    { KRB5_MSG_ENC_AS_REP_PART,   BER_CLASS_APP, KRB5_MSG_ENC_AS_REP_PART,   0, dissect_krb5_EncKDCRepPart },
+    { KRB5_MSG_ENC_TGS_REP_PART,  BER_CLASS_APP, KRB5_MSG_ENC_TGS_REP_PART,  0, dissect_krb5_EncKDCRepPart },
+    { KRB5_MSG_ENC_AP_REP_PART,   BER_CLASS_APP, KRB5_MSG_ENC_AP_REP_PART,   0, dissect_krb5_EncAPRepPart },
+    { KRB5_MSG_ENC_KRB_PRIV_PART, BER_CLASS_APP, KRB5_MSG_ENC_KRB_PRIV_PART, 0, dissect_krb5_EncKrbPrivPart },
+    { KRB5_MSG_ENC_KRB_CRED_PART, BER_CLASS_APP, KRB5_MSG_ENC_KRB_CRED_PART, 0, dissect_krb5_EncKrbCredPart },
+    { KRB5_MSG_SAFE,    BER_CLASS_APP,  KRB5_MSG_SAFE,          0,      dissect_krb5_SAFE },
+    { KRB5_MSG_PRIV,    BER_CLASS_APP,  KRB5_MSG_PRIV,          0,      dissect_krb5_PRIV },
+    { KRB5_MSG_CRED,    BER_CLASS_APP,  KRB5_MSG_CRED,          0,      dissect_krb5_CRED },
+    { KRB5_MSG_ERROR,   BER_CLASS_APP,  KRB5_MSG_ERROR,         0,      dissect_krb5_ERROR },
+    { 0, 0, 0, 0, NULL }
 };
 
 
 static int
 dissect_krb5_application_choice(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_choice(actx, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
-       return offset;
+    offset=dissect_ber_old_choice(actx, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
+    return offset;
 }
 
-
+static const true_false_string krb5_apoptions_reserved = {
+    "RESERVED bit on",
+    "RESERVED bit off"
+};
 static const true_false_string krb5_apoptions_use_session_key = {
-       "USE SESSION KEY to encrypt the ticket",
-       "Do NOT use the session key to encrypt the ticket"
+    "USE SESSION KEY to encrypt the ticket",
+    "Do NOT use the session key to encrypt the ticket"
 };
 static const true_false_string krb5_apoptions_mutual_required = {
-       "MUTUAL authentication is REQUIRED",
-       "Mutual authentication is NOT required"
+    "MUTUAL authentication is REQUIRED",
+    "Mutual authentication is NOT required"
 };
 
 static int *APOptions_bits[] = {
-  &hf_krb_APOptions_use_session_key,
-  &hf_krb_APOptions_mutual_required,
-  NULL
+    &hf_krb_APOptions_reserved,
+    &hf_krb_APOptions_use_session_key,
+    &hf_krb_APOptions_mutual_required,
+    NULL
 };
 static int
 dissect_krb5_APOptions(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_bitstring32(FALSE, actx, tree, tvb, offset, APOptions_bits, hf_krb_APOptions, ett_krb_AP_Options, NULL);
-       return offset;
+    offset=dissect_ber_bitstring32(FALSE, actx, tree, tvb, offset, APOptions_bits, hf_krb_APOptions, ett_krb_AP_Options, NULL);
+    return offset;
 }
 
 
 
 static const true_false_string krb5_kdcoptions_forwardable = {
-       "FORWARDABLE tickets are allowed/requested",
-       "Do NOT use forwardable tickets"
+    "FORWARDABLE tickets are allowed/requested",
+    "Do NOT use forwardable tickets"
 };
 static const true_false_string krb5_kdcoptions_forwarded = {
-       "This ticket has been FORWARDED",
-       "This is NOT a forwarded ticket"
+    "This ticket has been FORWARDED",
+    "This is NOT a forwarded ticket"
 };
-static const true_false_string krb5_kdcoptions_proxyable = {
-       "PROXIABLE tickets are allowed/requested",
-       "Do NOT use proxiable tickets"
+static const true_false_string krb5_kdcoptions_proxiable = {
+    "PROXIABLE tickets are allowed/requested",
+    "Do NOT use proxiable tickets"
 };
 static const true_false_string krb5_kdcoptions_proxy = {
-       "This is a PROXY ticket",
-       "This ticket has NOT been proxied"
+    "This is a PROXY ticket",
+    "This ticket has NOT been proxied"
 };
 static const true_false_string krb5_kdcoptions_allow_postdate = {
-       "We allow the ticket to be POSTDATED",
-       "We do NOT allow the ticket to be postdated"
+    "We allow the ticket to be POSTDATED",
+    "We do NOT allow the ticket to be postdated"
 };
 static const true_false_string krb5_kdcoptions_postdated = {
-       "This ticket is POSTDATED",
-       "This ticket is NOT postdated"
+    "This ticket is POSTDATED",
+    "This ticket is NOT postdated"
 };
 static const true_false_string krb5_kdcoptions_renewable = {
-       "This ticket is RENEWABLE",
-       "This ticket is NOT renewable"
+    "This ticket is RENEWABLE",
+    "This ticket is NOT renewable"
 };
 static const true_false_string krb5_kdcoptions_constrained_delegation = {
-       "This is a request for a CONSTRAINED DELEGATION PAC",
-       "This is a normal request (no constrained delegation)"
+    "This is a request for a CONSTRAINED DELEGATION PAC",
+    "This is a normal request (no constrained delegation)"
 };
 static const true_false_string krb5_kdcoptions_canonicalize = {
-       "This is a request for a CANONICALIZED ticket",
-       "This is NOT a canonicalized ticket request"
+    "This is a request for a CANONICALIZED ticket",
+    "This is NOT a canonicalized ticket request"
 };
 static const true_false_string krb5_kdcoptions_disable_transited_check = {
-       "Transited checking is DISABLED",
-       "Transited checking is NOT disabled"
+    "Transited checking is DISABLED",
+    "Transited checking is NOT disabled"
 };
 static const true_false_string krb5_kdcoptions_renewable_ok = {
-       "We accept RENEWED tickets",
-       "We do NOT accept renewed tickets"
+    "We accept RENEWED tickets",
+    "We do NOT accept renewed tickets"
 };
 static const true_false_string krb5_kdcoptions_enc_tkt_in_skey = {
-       "ENCrypt TKT in SKEY",
-       "Do NOT encrypt the tkt inside the skey"
+    "ENCrypt TKT in SKEY",
+    "Do NOT encrypt the tkt inside the skey"
 };
 static const true_false_string krb5_kdcoptions_renew = {
-       "This is a request to RENEW a ticket",
-       "This is NOT a request to renew a ticket"
+    "This is a request to RENEW a ticket",
+    "This is NOT a request to renew a ticket"
 };
 static const true_false_string krb5_kdcoptions_validate = {
-       "This is a request to VALIDATE a postdated ticket",
-       "This is NOT a request to validate a postdated ticket"
+    "This is a request to VALIDATE a postdated ticket",
+    "This is NOT a request to validate a postdated ticket"
 };
 
 static int* KDCOptions_bits[] = {
-  &hf_krb_KDCOptions_forwardable,
-  &hf_krb_KDCOptions_forwarded,
-  &hf_krb_KDCOptions_proxyable,
-  &hf_krb_KDCOptions_proxy,
-  &hf_krb_KDCOptions_allow_postdate,
-  &hf_krb_KDCOptions_postdated,
-  &hf_krb_KDCOptions_renewable,
-  &hf_krb_KDCOptions_opt_hardware_auth,
-  &hf_krb_KDCOptions_constrained_delegation,
-  &hf_krb_KDCOptions_canonicalize,
-  &hf_krb_KDCOptions_disable_transited_check,
-  &hf_krb_KDCOptions_renewable_ok,
-  &hf_krb_KDCOptions_enc_tkt_in_skey,
-  &hf_krb_KDCOptions_renew,
-  &hf_krb_KDCOptions_validate,
-  NULL
+    &hf_krb_KDCOptions_forwardable,
+    &hf_krb_KDCOptions_forwarded,
+    &hf_krb_KDCOptions_proxiable,
+    &hf_krb_KDCOptions_proxy,
+    &hf_krb_KDCOptions_allow_postdate,
+    &hf_krb_KDCOptions_postdated,
+    &hf_krb_KDCOptions_renewable,
+    &hf_krb_KDCOptions_opt_hardware_auth,
+    &hf_krb_KDCOptions_constrained_delegation,
+    &hf_krb_KDCOptions_canonicalize,
+    &hf_krb_KDCOptions_disable_transited_check,
+    &hf_krb_KDCOptions_renewable_ok,
+    &hf_krb_KDCOptions_enc_tkt_in_skey,
+    &hf_krb_KDCOptions_renew,
+    &hf_krb_KDCOptions_validate,
+    NULL
 };
 
 static int
 dissect_krb5_KDCOptions(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_bitstring32(FALSE, actx, tree, tvb, offset, KDCOptions_bits, hf_krb_KDCOptions, ett_krb_KDC_Options, NULL);
-       return offset;
+    offset=dissect_ber_bitstring32(FALSE, actx, tree, tvb, offset, KDCOptions_bits, hf_krb_KDCOptions, ett_krb_KDC_Options, NULL);
+    return offset;
 }
 
 static int
 dissect_krb5_rtime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_rtime);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_rtime);
+    return offset;
 }
 
 int
 dissect_krb5_ctime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_ctime);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_ctime);
+    return offset;
 }
 static int
 dissect_krb5_cusec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_cusec, NULL);
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_cusec, NULL);
+    return offset;
 }
 
 static int
 dissect_krb5_stime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_stime);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_stime);
+    return offset;
 }
 static int
 dissect_krb5_susec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_susec, NULL);
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_susec, NULL);
+    return offset;
 }
 
 
 static int
 dissect_krb5_error_code(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_error_code, &krb5_errorcode);
-       if(krb5_errorcode && check_col(actx->pinfo->cinfo, COL_INFO)) {
-               col_add_fstr(actx->pinfo->cinfo, COL_INFO,
-                       "KRB Error: %s",
-                       val_to_str(krb5_errorcode, krb5_error_codes,
-                       "Unknown error code %#x"));
-       }
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_error_code, &krb5_errorcode);
+    if(krb5_errorcode && check_col(actx->pinfo->cinfo, COL_INFO)) {
+        col_add_fstr(actx->pinfo->cinfo, COL_INFO,
+                     "KRB Error: %s",
+                     val_to_str(krb5_errorcode, krb5_error_codes,
+                                "Unknown error code %#x"));
+    }
 
-       return offset;
+    return offset;
 }
 
 
 static int
 dissect_krb5_till(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_till);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_till);
+    return offset;
 }
 static int
 dissect_krb5_from(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_from);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_from);
+    return offset;
 }
 
 
@@ -1651,8 +1704,8 @@ dissect_krb5_from(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
 static int
 dissect_krb5_nonce(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_nonce, NULL);
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_nonce, NULL);
+    return offset;
 }
 
 
@@ -1662,73 +1715,73 @@ dissect_krb5_nonce(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
 static int
 dissect_krb5_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint32 etype;
+    guint32 etype;
 
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &etype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(etype, krb5_encryption_types,
-                       "%d"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &etype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(etype, krb5_encryption_types,
+                                          "%d"));
+    }
+    return offset;
 }
 static ber_old_sequence_t etype_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_krb5_etype },
+    { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_krb5_etype },
 };
 static int
 dissect_krb5_etype_sequence_of(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, etype_sequence_of, hf_krb_etypes, ett_krb_etypes);
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, etype_sequence_of, hf_krb_etypes, ett_krb_etypes);
 
-       return offset;
+    return offset;
 }
 static guint32 authenticator_etype;
 static int
 dissect_krb5_authenticator_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &authenticator_etype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(authenticator_etype, krb5_encryption_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &authenticator_etype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(authenticator_etype, krb5_encryption_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 static guint32 Ticket_etype;
 static int
 dissect_krb5_Ticket_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &Ticket_etype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(Ticket_etype, krb5_encryption_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &Ticket_etype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(Ticket_etype, krb5_encryption_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 static guint32 AP_REP_etype;
 static int
 dissect_krb5_AP_REP_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &AP_REP_etype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(AP_REP_etype, krb5_encryption_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &AP_REP_etype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(AP_REP_etype, krb5_encryption_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 static guint32 PA_ENC_TIMESTAMP_etype;
 static int
 dissect_krb5_PA_ENC_TIMESTAMP_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &PA_ENC_TIMESTAMP_etype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(PA_ENC_TIMESTAMP_etype, krb5_encryption_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &PA_ENC_TIMESTAMP_etype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(PA_ENC_TIMESTAMP_etype, krb5_encryption_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 
 
@@ -1741,88 +1794,89 @@ dissect_krb5_PA_ENC_TIMESTAMP_etype(proto_tree *tree, tvbuff_t *tvb, int offset,
 static guint32 addr_type;
 static int dissect_krb5_addr_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_addr_type, &addr_type);
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_addr_type, &addr_type);
+    return offset;
 }
+
+#define ADDRESS_STR_BUFSIZ 256
 static int dissect_krb5_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       gint8 class;
-       gboolean pc;
-       gint32 tag;
-       guint32 len;
-       char *address_str;
-       proto_item *it=NULL;
-
-       /* read header and len for the octet string */
-       offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
-       offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL);
-
-       address_str=ep_alloc(256);
-       address_str[0]=0;
-       address_str[255]=0;
-       switch(addr_type){
-       case KRB5_ADDR_IPv4:
-               it=proto_tree_add_item(tree, hf_krb_address_ip, tvb, offset, 4, FALSE);
-               g_snprintf(address_str,256,"%d.%d.%d.%d",tvb_get_guint8(tvb, offset),tvb_get_guint8(tvb, offset+1),tvb_get_guint8(tvb, offset+2),tvb_get_guint8(tvb, offset+3));
-               break;
-       case KRB5_ADDR_NETBIOS:
-               {
-               char netbios_name[(NETBIOS_NAME_LEN - 1)*4 + 1];
-               int netbios_name_type;
-               int netbios_name_len = (NETBIOS_NAME_LEN - 1)*4 + 1;
-
-               netbios_name_type = process_netbios_name(tvb_get_ptr(tvb, offset, 16), netbios_name, netbios_name_len);
-               g_snprintf(address_str, 255, "%s<%02x>", netbios_name, netbios_name_type);
-               it=proto_tree_add_string_format(tree, hf_krb_address_netbios, tvb, offset, 16, netbios_name, "NetBIOS Name: %s (%s)", address_str, netbios_name_type_descr(netbios_name_type));
-               }
-               break;
-       case KRB5_ADDR_IPv6:
-               it=proto_tree_add_item(tree, hf_krb_address_ipv6, tvb, offset, INET6_ADDRLEN, FALSE);
-               g_snprintf(address_str, 256, "%s", ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset, INET6_ADDRLEN)));
-               break;
-       default:
-               proto_tree_add_text(tree, tvb, offset, len, "KRB Address: I dont know how to parse this type of address yet");
-
-       }
-
-       /* push it up two levels in the decode pane */
-       if(it){
-               proto_item_append_text(proto_item_get_parent(it), " %s",address_str);
-               proto_item_append_text(proto_item_get_parent_nth(it, 2), " %s",address_str);
-       }
-
-       offset+=len;
-       return offset;
+    gint8 class;
+    gboolean pc;
+    gint32 tag;
+    guint32 len;
+    char *address_str;
+    proto_item *it=NULL;
+
+    /* read header and len for the octet string */
+    offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
+    offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL);
+
+    address_str=ep_alloc(ADDRESS_STR_BUFSIZ);
+    address_str[0]='\0';
+    switch(addr_type){
+    case KRB5_ADDR_IPv4:
+        it=proto_tree_add_item(tree, hf_krb_address_ip, tvb, offset, 4, ENC_BIG_ENDIAN);
+        g_snprintf(address_str,ADDRESS_STR_BUFSIZ,"%d.%d.%d.%d",tvb_get_guint8(tvb, offset),tvb_get_guint8(tvb, offset+1),tvb_get_guint8(tvb, offset+2),tvb_get_guint8(tvb, offset+3));
+        break;
+    case KRB5_ADDR_NETBIOS:
+    {
+        char netbios_name[(NETBIOS_NAME_LEN - 1)*4 + 1];
+        int netbios_name_type;
+        int netbios_name_len = (NETBIOS_NAME_LEN - 1)*4 + 1;
+
+        netbios_name_type = process_netbios_name(tvb_get_ptr(tvb, offset, 16), netbios_name, netbios_name_len);
+        g_snprintf(address_str, ADDRESS_STR_BUFSIZ, "%s<%02x>", netbios_name, netbios_name_type);
+        it=proto_tree_add_string_format(tree, hf_krb_address_netbios, tvb, offset, 16, netbios_name, "NetBIOS Name: %s (%s)", address_str, netbios_name_type_descr(netbios_name_type));
+    }
+    break;
+    case KRB5_ADDR_IPv6:
+        it=proto_tree_add_item(tree, hf_krb_address_ipv6, tvb, offset, INET6_ADDRLEN, ENC_NA);
+        g_snprintf(address_str, ADDRESS_STR_BUFSIZ, "%s", tvb_ip6_to_str(tvb, offset));
+        break;
+    default:
+        proto_tree_add_text(tree, tvb, offset, len, "KRB Address: I don't know how to parse this type of address yet");
+
+    }
+
+    /* push it up two levels in the decode pane */
+    if(it){
+        proto_item_append_text(proto_item_get_parent(it), " %s",address_str);
+        proto_item_append_text(proto_item_get_parent_nth(it, 2), " %s",address_str);
+    }
+
+    offset+=len;
+    return offset;
 }
 static ber_old_sequence_t HostAddress_sequence[] = {
-       { BER_CLASS_CON, 0, 0, dissect_krb5_addr_type },
-       { BER_CLASS_CON, 1, 0, dissect_krb5_address },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0, dissect_krb5_addr_type },
+    { BER_CLASS_CON, 1, 0, dissect_krb5_address },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_HostAddress(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_HostAddress, ett_krb_HostAddress);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_HostAddress, ett_krb_HostAddress);
 
-       return offset;
+    return offset;
 }
 static int
 dissect_krb5_s_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_s_address, ett_krb_s_address);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_s_address, ett_krb_s_address);
 
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_r_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_r_address, ett_krb_r_address);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, HostAddress_sequence, hf_krb_r_address, ett_krb_r_address);
 
-       return offset;
+    return offset;
 }
 
 /*
@@ -1833,47 +1887,47 @@ dissect_krb5_r_address(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *
  *
  */
 static ber_old_sequence_t HostAddresses_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_HostAddress },
+    { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_HostAddress },
 };
 static int
 dissect_krb5_HostAddresses(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, HostAddresses_sequence_of, hf_krb_HostAddresses, ett_krb_HostAddresses);
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, HostAddresses_sequence_of, hf_krb_HostAddresses, ett_krb_HostAddresses);
 
-       return offset;
+    return offset;
 }
 
 
 /* sequence of tickets */
 static ber_old_sequence_t sequence_of_tickets[1] = {
-  { BER_CLASS_APP, 1, 0, dissect_krb5_Application_1},
+    { BER_CLASS_APP, 1, 0, dissect_krb5_Application_1},
 };
 static int
 dissect_krb5_sq_tickets(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, sequence_of_tickets, hf_krb_sq_tickets, ett_krb_sq_tickets);
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, sequence_of_tickets, hf_krb_sq_tickets, ett_krb_sq_tickets);
 
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_msg_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint32 msgtype;
+    guint32 msgtype;
 
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_msg_type, &msgtype);
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_msg_type, &msgtype);
 
-       if (do_col_info & check_col(actx->pinfo->cinfo, COL_INFO)) {
-               col_add_str(actx->pinfo->cinfo, COL_INFO,
-                       val_to_str(msgtype, krb5_msg_types,
-                       "Unknown msg type %#x"));
-       }
-       do_col_info=FALSE;
+    if (gbl_do_col_info & check_col(actx->pinfo->cinfo, COL_INFO)) {
+        col_add_str(actx->pinfo->cinfo, COL_INFO,
+                    val_to_str(msgtype, krb5_msg_types,
+                               "Unknown msg type %#x"));
+    }
+    gbl_do_col_info=FALSE;
 
-       /* append the application type to the subtree */
-       proto_item_append_text(tree, " %s", val_to_str(msgtype, krb5_msg_types, "Unknown:0x%x"));
+    /* append the application type to the subtree */
+    proto_item_append_text(tree, " %s", val_to_str(msgtype, krb5_msg_types, "Unknown:0x%x"));
 
-       return offset;
+    return offset;
 }
 
 
@@ -1881,9 +1935,9 @@ dissect_krb5_msg_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *a
 static int
 dissect_krb5_pvno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_pvno, NULL);
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_pvno, NULL);
 
-       return offset;
+    return offset;
 }
 
 
@@ -1893,101 +1947,100 @@ dissect_krb5_pvno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
  *                     name-string[1]   SEQUENCE OF GeneralString
  * }
  */
-guint32 name_type;
+static guint32 name_type;
 static int
 dissect_krb5_name_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_name_type, &name_type);
-       if(tree){
-               proto_item_append_text(tree, " (%s):",
-                       val_to_str(name_type, krb5_princ_types,
-                       "Unknown:%d"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_name_type, &name_type);
+    if(tree){
+        proto_item_append_text(tree, " (%s):",
+                               val_to_str(name_type, krb5_princ_types,
+                                          "Unknown:%d"));
+    }
+    return offset;
 }
 static char name_string_separator;
 static int
 dissect_krb5_name_string(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       char name_string[256];
+    char name_string[256];
 
-       offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_name_string, name_string, 255);
-       if(tree){
-               proto_item_append_text(tree, "%c%s", name_string_separator, name_string);
-               name_string_separator='/';
-       }
+    offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_name_string, name_string, 255);
+    if(tree){
+        proto_item_append_text(tree, "%c%s", name_string_separator, name_string);
+        name_string_separator='/';
+    }
 
-       return offset;
+    return offset;
 }
 static ber_old_sequence_t name_stringe_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_GeneralString, BER_FLAGS_NOOWNTAG, dissect_krb5_name_string },
+    { BER_CLASS_UNI, BER_UNI_TAG_GeneralString, BER_FLAGS_NOOWNTAG, dissect_krb5_name_string },
 };
 static int
 dissect_krb5_name_strings(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       name_string_separator=' ';
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, name_stringe_sequence_of, -1, -1);
+    name_string_separator=' ';
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, name_stringe_sequence_of, -1, -1);
 
-       return offset;
+    return offset;
 }
 static ber_old_sequence_t PrincipalName_sequence[] = {
-       { BER_CLASS_CON, 0, 0, dissect_krb5_name_type },
-       { BER_CLASS_CON, 1, 0, dissect_krb5_name_strings },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0, dissect_krb5_name_type },
+    { BER_CLASS_CON, 1, 0, dissect_krb5_name_strings },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_sname(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_sname, ett_krb_sname);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_sname, ett_krb_sname);
 
-       return offset;
+    return offset;
 }
 static int
 dissect_krb5_pname(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_pname, ett_krb_pname);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_pname, ett_krb_pname);
 
-       return offset;
+    return offset;
 }
 int
 dissect_krb5_cname(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_cname, ett_krb_cname);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PrincipalName_sequence, hf_krb_cname, ett_krb_cname);
 
-       return offset;
+    return offset;
 }
 
 
 int
 dissect_krb5_prealm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_prealm, NULL, 0);
-       return offset;
+    offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_prealm, NULL, 0);
+    return offset;
 }
 
 int
 dissect_krb5_srealm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_srealm, NULL, 0);
-       return offset;
+    offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_srealm, NULL, 0);
+    return offset;
 }
 
 int
 dissect_krb5_realm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_realm, NULL, 0);
-       return offset;
+    offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_realm, NULL, 0);
+    return offset;
 }
 
 static int
 dissect_krb5_crealm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_crealm, NULL, 0);
-       return offset;
+    offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_crealm, NULL, 0);
+    return offset;
 }
 
 
@@ -1995,53 +2048,53 @@ dissect_krb5_crealm(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *act
 static int
 dissect_krb5_PA_PAC_REQUEST_flag(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_boolean(FALSE, actx, tree, tvb, offset, hf_krb_PA_PAC_REQUEST_flag, NULL);
-       return offset;
+    offset=dissect_ber_boolean(FALSE, actx, tree, tvb, offset, hf_krb_PA_PAC_REQUEST_flag, NULL);
+    return offset;
 }
 
 
 static ber_old_sequence_t PA_PAC_REQUEST_sequence[] = {
-       { BER_CLASS_CON, 0, 0, dissect_krb5_PA_PAC_REQUEST_flag },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0, dissect_krb5_PA_PAC_REQUEST_flag },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_PA_PAC_REQUEST(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_PAC_REQUEST_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_PAC_REQUEST_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_s4u2self_auth(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_s4u2self_auth, NULL, 0);
-       return offset;
+    offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_s4u2self_auth, NULL, 0);
+    return offset;
 }
 
-static ber_old_sequence_t PA_S4U2SELF_sequence[] = {
-       { BER_CLASS_CON, 0, 0, dissect_krb5_cname },
-       { BER_CLASS_CON, 1, 0, dissect_krb5_realm },
-       { BER_CLASS_CON, 2, 0, dissect_krb5_Checksum },
-       { BER_CLASS_CON, 3, 0, dissect_krb5_s4u2self_auth },
-       { 0, 0, 0, NULL }
+static ber_old_sequence_t PA_FOR_USER_sequence[] = {
+    { BER_CLASS_CON, 0, 0, dissect_krb5_cname },
+    { BER_CLASS_CON, 1, 0, dissect_krb5_realm },
+    { BER_CLASS_CON, 2, 0, dissect_krb5_Checksum },
+    { BER_CLASS_CON, 3, 0, dissect_krb5_s4u2self_auth },
+    { 0, 0, 0, NULL }
 };
 
 static int
-dissect_krb5_PA_S4U2SELF(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
+dissect_krb5_PA_FOR_USER(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_S4U2SELF_sequence, -1, -1);
-       return offset;
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_FOR_USER_sequence, -1, -1);
+    return offset;
 }
 
 
 static int
 dissect_krb5_PA_PROV_SRV_LOCATION(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_provsrv_location, NULL, 0);
+    offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_provsrv_location, NULL, 0);
 
-       return offset;
+    return offset;
 }
 
 
@@ -2049,9 +2102,9 @@ dissect_krb5_PA_PROV_SRV_LOCATION(proto_tree *tree, tvbuff_t *tvb, int offset, a
 static int
 dissect_krb5_kvno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_kvno, NULL);
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_kvno, NULL);
 
-       return offset;
+    return offset;
 }
 
 
@@ -2059,9 +2112,9 @@ dissect_krb5_kvno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx
 static int
 dissect_krb5_seq_number(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_seq_number, NULL);
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_seq_number, NULL);
 
-       return offset;
+    return offset;
 }
 
 
@@ -2069,54 +2122,56 @@ dissect_krb5_seq_number(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t
 static int
 dissect_krb5_patimestamp(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_patimestamp);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_patimestamp);
+    return offset;
 }
 #ifdef HAVE_KERBEROS
 static int
 dissect_krb5_pausec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_pausec, NULL);
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_pausec, NULL);
+    return offset;
 }
 static const ber_old_sequence_t PA_ENC_TS_ENC_sequence[] = {
-       { BER_CLASS_CON, 0, 0, dissect_krb5_patimestamp },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_pausec },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0, dissect_krb5_patimestamp },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_pausec },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_decrypt_PA_ENC_TIMESTAMP (proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint8 *plaintext=NULL;
-       int length;
+    guint8 *plaintext=NULL;
+    int length;
 
-       length=tvb_length_remaining(tvb, offset);
+    length=tvb_length_remaining(tvb, offset);
 
-       /* draft-ietf-krb-wg-kerberos-clarifications-05.txt :
-        * 7.5.1
-        * AS-REQ PA_ENC_TIMESTAMP are encrypted with usage
-        * == 1
-        */
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 1, length, tvb_get_ptr(tvb, offset, length), PA_ENC_TIMESTAMP_etype, NULL);
-       }
+    /* draft-ietf-krb-wg-kerberos-clarifications-05.txt :
+     * 7.5.1
+     * AS-REQ PA_ENC_TIMESTAMP are encrypted with usage
+     * == 1
+     */
+    if(!plaintext){
+        tvbuff_t *next_tvb;
 
-       if(plaintext){
-               tvbuff_t *next_tvb;
-               next_tvb = tvb_new_real_data (plaintext,
-                                          length,
-                                          length);
-               tvb_set_free_cb(next_tvb, g_free);
-               tvb_set_child_real_data_tvbuff(tvb, next_tvb);
+        next_tvb=tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_reported_length_remaining(tvb, offset));
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 1, next_tvb, PA_ENC_TIMESTAMP_etype, NULL);
+    }
+
+    if(plaintext){
+        tvbuff_t *next_tvb;
+        next_tvb = tvb_new_child_real_data(tvb, plaintext,
+                                           length,
+                                           length);
+        tvb_set_free_cb(next_tvb, g_free);
 
-               /* Add the decrypted data to the data source list. */
-               add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
+        /* Add the decrypted data to the data source list. */
+        add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
 
 
-               offset=dissect_ber_old_sequence(FALSE, actx, tree, next_tvb, 0, PA_ENC_TS_ENC_sequence, -1, -1);
+        offset=dissect_ber_old_sequence(FALSE, actx, tree, next_tvb, 0, PA_ENC_TS_ENC_sequence, -1, -1);
 
-       }
-       return offset;
+    }
+    return offset;
 }
 #endif
 
@@ -2125,27 +2180,27 @@ static int
 dissect_krb5_encrypted_PA_ENC_TIMESTAMP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, dissect_krb5_decrypt_PA_ENC_TIMESTAMP);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, dissect_krb5_decrypt_PA_ENC_TIMESTAMP);
 #else
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, NULL);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PA_ENC_TIMESTAMP, NULL);
 #endif
-       return offset;
+    return offset;
 }
 static ber_old_sequence_t PA_ENC_TIMESTAMP_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_PA_ENC_TIMESTAMP_etype },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_kvno },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_encrypted_PA_ENC_TIMESTAMP },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_PA_ENC_TIMESTAMP_etype },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_kvno },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_encrypted_PA_ENC_TIMESTAMP },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_PA_ENC_TIMESTAMP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_ENC_TIMESTAMP_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_ENC_TIMESTAMP_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 
@@ -2153,112 +2208,109 @@ dissect_krb5_PA_ENC_TIMESTAMP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
 static int
 dissect_krb5_etype_info_salt(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_etype_info_salt, NULL);
-       return offset;
+    offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_etype_info_salt, NULL);
+    return offset;
 }
 
 static int
 dissect_krb5_etype_info2_salt(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_etype_info2_salt, NULL, 0);
-       return offset;
+    offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_etype_info2_salt, NULL, 0);
+    return offset;
 }
 
 static int
 dissect_krb5_etype_info2_s2kparams(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_etype_info2_s2kparams, NULL);
-       return offset;
+    offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_etype_info2_s2kparams, NULL);
+    return offset;
 }
 
 static ber_old_sequence_t PA_ENCTYPE_INFO_ENTRY_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_etype },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_etype_info_salt },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_etype },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_etype_info_salt },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_PA_ENCTYPE_INFO_ENTRY(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO_ENTRY_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO_ENTRY_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t PA_ENCTYPE_INFO_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_ENCTYPE_INFO_ENTRY },
+    { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_ENCTYPE_INFO_ENTRY },
 };
 static int
 dissect_krb5_PA_ENCTYPE_INFO(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO_sequence_of, -1, -1);
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO_sequence_of, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t PA_ENCTYPE_INFO2_ENTRY_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_etype },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_etype_info2_salt },
-       { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
-               dissect_krb5_etype_info2_s2kparams },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_etype },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_etype_info2_salt },
+    { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
+      dissect_krb5_etype_info2_s2kparams },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_PA_ENCTYPE_INFO2_ENTRY(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO2_ENTRY_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO2_ENTRY_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t PA_ENCTYPE_INFO2_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_ENCTYPE_INFO2_ENTRY },
+    { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_ENCTYPE_INFO2_ENTRY },
 };
 static int
 dissect_krb5_PA_ENCTYPE_INFO2(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO2_sequence_of, -1, -1);
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, PA_ENCTYPE_INFO2_sequence_of, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 
 static int
 dissect_krb5_PW_SALT(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint32 nt_status;
-
-       /* Microsoft stores a special 12 byte blob here
-        * guint32 NT_status
-        * guint32 unknown
-        * guint32 unknown
-        * decode everything as this blob for now until we see if anyone
-        * else ever uses it   or we learn how to tell wether this
-        * is such an MS blob or not.
-        */
-       proto_tree_add_item(tree, hf_krb_smb_nt_status, tvb, offset, 4,
-                       TRUE);
-       nt_status=tvb_get_letohl(tvb, offset);
-       if(nt_status && check_col(actx->pinfo->cinfo, COL_INFO)) {
-               col_append_fstr(actx->pinfo->cinfo, COL_INFO,
-                       " NT Status: %s",
-                       val_to_str(nt_status, NT_errors,
-                       "Unknown error code %#x"));
-       }
-       offset += 4;
-
-       proto_tree_add_item(tree, hf_krb_smb_unknown, tvb, offset, 4,
-                       TRUE);
-       offset += 4;
-
-       proto_tree_add_item(tree, hf_krb_smb_unknown, tvb, offset, 4,
-                       TRUE);
-       offset += 4;
-
-       return offset;
+    guint32 nt_status;
+
+    /* Microsoft stores a special 12 byte blob here
+     * guint32 NT_status
+     * guint32 unknown
+     * guint32 unknown
+     * decode everything as this blob for now until we see if anyone
+     * else ever uses it   or we learn how to tell whether this
+     * is such an MS blob or not.
+     */
+    proto_tree_add_item(tree, hf_krb_smb_nt_status, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    nt_status=tvb_get_letohl(tvb, offset);
+    if(nt_status && check_col(actx->pinfo->cinfo, COL_INFO)) {
+        col_append_fstr(actx->pinfo->cinfo, COL_INFO,
+                        " NT Status: %s",
+                        val_to_str(nt_status, NT_errors,
+                                   "Unknown error code %#x"));
+    }
+    offset += 4;
+
+    proto_tree_add_item(tree, hf_krb_smb_unknown, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    offset += 4;
+
+    proto_tree_add_item(tree, hf_krb_smb_unknown, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    offset += 4;
+
+    return offset;
 }
 
 /*
@@ -2268,79 +2320,78 @@ dissect_krb5_PW_SALT(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
  *                        -- might be encoded AP-REQ
  * }
  */
-guint32 krb_PA_DATA_type;
+static guint32 krb_PA_DATA_type;
 static int
 dissect_krb5_PA_DATA_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_PA_DATA_type, &krb_PA_DATA_type);
-       krb_PA_DATA_type&=0xff; /*this is really just one single byte */
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_PA_DATA_type, &krb_PA_DATA_type);
 
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(krb_PA_DATA_type, krb5_preauthentication_types,
-                       "Unknown:%d"));
-       }
-       return offset;
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(krb_PA_DATA_type, krb5_preauthentication_types,
+                                          "Unknown:%d"));
+    }
+    return offset;
 }
 static int
 dissect_krb5_PA_DATA_value(proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       proto_tree *tree=parent_tree;
-
-       if(actx->created_item){
-               tree=proto_item_add_subtree(actx->created_item, ett_krb_PA_DATA_tree);
-       }
-
-
-       switch(krb_PA_DATA_type){
-       case KRB5_PA_TGS_REQ:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_application_choice);
-               break;
-       case KRB5_PA_PK_AS_REQ:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REQ);
-               break;
-       case KRB5_PA_PK_AS_REP:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REP);
-               break;
-       case KRB5_PA_PAC_REQUEST:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PAC_REQUEST);
-               break;
-       case KRB5_PA_S4U2SELF:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_S4U2SELF);
-               break;
-       case KRB5_PA_PROV_SRV_LOCATION:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PROV_SRV_LOCATION);
-               break;
-       case KRB5_PA_ENC_TIMESTAMP:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENC_TIMESTAMP);
-               break;
-       case KRB5_PA_ENCTYPE_INFO:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO);
-               break;
-       case KRB5_PA_ENCTYPE_INFO2:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO2);
-               break;
-       case KRB5_PA_PW_SALT:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PW_SALT);
-               break;
-       default:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, NULL);
-       }
-       return offset;
+    proto_tree *tree=parent_tree;
+
+    if(actx->created_item){
+        tree=proto_item_add_subtree(actx->created_item, ett_krb_PA_DATA_tree);
+    }
+
+
+    switch(krb_PA_DATA_type){
+    case KRB5_PA_TGS_REQ:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_application_choice);
+        break;
+    case KRB5_PA_PK_AS_REQ:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REQ);
+        break;
+    case KRB5_PA_PK_AS_REP:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_pkinit_PA_PK_AS_REP);
+        break;
+    case KRB5_PA_PAC_REQUEST:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PAC_REQUEST);
+        break;
+    case KRB5_PA_FOR_USER:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_FOR_USER);
+        break;
+    case KRB5_PA_PROV_SRV_LOCATION:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_PROV_SRV_LOCATION);
+        break;
+    case KRB5_PA_ENC_TIMESTAMP:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENC_TIMESTAMP);
+        break;
+    case KRB5_PA_ENCTYPE_INFO:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO);
+        break;
+    case KRB5_PA_ENCTYPE_INFO2:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PA_ENCTYPE_INFO2);
+        break;
+    case KRB5_PA_PW_SALT:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, dissect_krb5_PW_SALT);
+        break;
+    default:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset,hf_krb_PA_DATA_value, NULL);
+    }
+    return offset;
 /*qqq*/
 }
 
 static ber_old_sequence_t PA_DATA_sequence[] = {
-       { BER_CLASS_CON, 1, 0, dissect_krb5_PA_DATA_type },
-       { BER_CLASS_CON, 2, 0, dissect_krb5_PA_DATA_value },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 1, 0, dissect_krb5_PA_DATA_type },
+    { BER_CLASS_CON, 2, 0, dissect_krb5_PA_DATA_value },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_PA_DATA(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_DATA_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PA_DATA_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 
@@ -2351,93 +2402,93 @@ dissect_krb5_PA_DATA(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
  *
  */
 static ber_old_sequence_t PA_DATA_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_DATA },
+    { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_DATA },
 };
 static int
 dissect_krb5_padata(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, PA_DATA_sequence_of, hf_krb_padata, ett_krb_padata);
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, PA_DATA_sequence_of, hf_krb_padata, ett_krb_padata);
 
-       return offset;
+    return offset;
 }
 
 
 
 static const true_false_string krb5_ticketflags_forwardable = {
-       "FORWARDABLE tickets are allowed/requested",
-       "Do NOT use forwardable tickets"
+    "FORWARDABLE tickets are allowed/requested",
+    "Do NOT use forwardable tickets"
 };
 static const true_false_string krb5_ticketflags_forwarded = {
-       "This ticket has been FORWARDED",
-       "This is NOT a forwarded ticket"
+    "This ticket has been FORWARDED",
+    "This is NOT a forwarded ticket"
 };
-static const true_false_string krb5_ticketflags_proxyable = {
-       "PROXIABLE tickets are allowed/requested",
-       "Do NOT use proxiable tickets"
+static const true_false_string krb5_ticketflags_proxiable = {
+    "PROXIABLE tickets are allowed/requested",
+    "Do NOT use proxiable tickets"
 };
 static const true_false_string krb5_ticketflags_proxy = {
-       "This is a PROXY ticket",
-       "This ticket has NOT been proxied"
+    "This is a PROXY ticket",
+    "This ticket has NOT been proxied"
 };
 static const true_false_string krb5_ticketflags_allow_postdate = {
-       "We allow the ticket to be POSTDATED",
-       "We do NOT allow the ticket to be postdated"
+    "We allow the ticket to be POSTDATED",
+    "We do NOT allow the ticket to be postdated"
 };
 static const true_false_string krb5_ticketflags_postdated = {
-       "This ticket is POSTDATED",
-       "This ticket is NOT postdated"
+    "This ticket is POSTDATED",
+    "This ticket is NOT postdated"
 };
 static const true_false_string krb5_ticketflags_invalid = {
-       "This ticket is INVALID",
-       "This ticket is NOT invalid"
+    "This ticket is INVALID",
+    "This ticket is NOT invalid"
 };
 static const true_false_string krb5_ticketflags_renewable = {
-       "This ticket is RENEWABLE",
-       "This ticket is NOT renewable"
+    "This ticket is RENEWABLE",
+    "This ticket is NOT renewable"
 };
 static const true_false_string krb5_ticketflags_initial = {
-       "This ticket was granted by AS and not TGT protocol",
-       "This ticket was granted by TGT and not as protocol"
+    "This ticket was granted by AS and not TGT protocol",
+    "This ticket was granted by TGT and not as protocol"
 };
 static const true_false_string krb5_ticketflags_pre_auth = {
-       "The client was PRE-AUTHenticated",
-       "The client was NOT pre-authenticated"
+    "The client was PRE-AUTHenticated",
+    "The client was NOT pre-authenticated"
 };
 static const true_false_string krb5_ticketflags_hw_auth = {
-       "The client was authenticated by HardWare",
-       "The client was NOT authenticated using hardware"
+    "The client was authenticated by HardWare",
+    "The client was NOT authenticated using hardware"
 };
 static const true_false_string krb5_ticketflags_transited_policy_checked = {
-       "Kdc has performed TRANSITED POLICY CHECKING",
-       "Kdc has NOT performed transited policy checking"
+    "Kdc has performed TRANSITED POLICY CHECKING",
+    "Kdc has NOT performed transited policy checking"
 };
 static const true_false_string krb5_ticketflags_ok_as_delegate = {
-       "This ticket is OK AS a DELEGATED ticket",
-       "This ticket is NOT ok as a delegated ticket"
+    "This ticket is OK AS a DELEGATED ticket",
+    "This ticket is NOT ok as a delegated ticket"
 };
 
 static int* TicketFlags_bits[] = {
-  &hf_krb_TicketFlags_forwardable,
-  &hf_krb_TicketFlags_forwarded,
-  &hf_krb_TicketFlags_proxyable,
-  &hf_krb_TicketFlags_proxy,
-  &hf_krb_TicketFlags_allow_postdate,
-  &hf_krb_TicketFlags_postdated,
-  &hf_krb_TicketFlags_invalid,
-  &hf_krb_TicketFlags_renewable,
-  &hf_krb_TicketFlags_initial,
-  &hf_krb_TicketFlags_pre_auth,
-  &hf_krb_TicketFlags_hw_auth,
-  &hf_krb_TicketFlags_transited_policy_checked,
-  &hf_krb_TicketFlags_ok_as_delegate,
-  NULL
+    &hf_krb_TicketFlags_forwardable,
+    &hf_krb_TicketFlags_forwarded,
+    &hf_krb_TicketFlags_proxiable,
+    &hf_krb_TicketFlags_proxy,
+    &hf_krb_TicketFlags_allow_postdate,
+    &hf_krb_TicketFlags_postdated,
+    &hf_krb_TicketFlags_invalid,
+    &hf_krb_TicketFlags_renewable,
+    &hf_krb_TicketFlags_initial,
+    &hf_krb_TicketFlags_pre_auth,
+    &hf_krb_TicketFlags_hw_auth,
+    &hf_krb_TicketFlags_transited_policy_checked,
+    &hf_krb_TicketFlags_ok_as_delegate,
+    NULL
 };
 
 static int
 dissect_krb5_TicketFlags(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_bitstring32(FALSE, actx, tree, tvb, offset, TicketFlags_bits, hf_krb_TicketFlags, ett_krb_Ticket_Flags, NULL);
-       return offset;
+    offset=dissect_ber_bitstring32(FALSE, actx, tree, tvb, offset, TicketFlags_bits, hf_krb_TicketFlags, ett_krb_Ticket_Flags, NULL);
+    return offset;
 }
 
 
@@ -2445,28 +2496,28 @@ static guint32 keytype;
 static int
 dissect_krb5_keytype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_keytype, &keytype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(keytype, krb5_encryption_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_keytype, &keytype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(keytype, krb5_encryption_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 static int keylength;
 static const guint8 *keyvalue;
 static int
 store_keyvalue(proto_tree *tree _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       keylength=tvb_length_remaining(tvb, offset);
-       keyvalue=tvb_get_ptr(tvb, offset, keylength);
-       return 0;
+    keylength=tvb_length_remaining(tvb, offset);
+    keyvalue=tvb_get_ptr(tvb, offset, keylength);
+    return 0;
 }
 static int
 dissect_krb5_keyvalue(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_keyvalue, store_keyvalue);
-       return offset;
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_keyvalue, store_keyvalue);
+    return offset;
 }
 
 
@@ -2476,54 +2527,54 @@ dissect_krb5_keyvalue(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *a
  *     keyvalue [1] octet string
  */
 static ber_old_sequence_t EncryptionKey_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_keytype },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_keyvalue },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_keytype },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_keyvalue },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_key(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncryptionKey_sequence, hf_krb_key, ett_krb_key);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncryptionKey_sequence, hf_krb_key, ett_krb_key);
 
 #ifdef HAVE_KERBEROS
-       add_encryption_key(actx->pinfo, keytype, keylength, keyvalue, "key");
+    add_encryption_key(actx->pinfo, keytype, keylength, keyvalue, "key");
 #endif
-       return offset;
+    return offset;
 }
 static int
 dissect_krb5_subkey(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncryptionKey_sequence, hf_krb_subkey, ett_krb_subkey);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncryptionKey_sequence, hf_krb_subkey, ett_krb_subkey);
 #ifdef HAVE_KERBEROS
-       add_encryption_key(actx->pinfo, keytype, keylength, keyvalue, "subkey");
+    add_encryption_key(actx->pinfo, keytype, keylength, keyvalue, "subkey");
 #endif
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_PAC_DREP(proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 *drep)
 {
-       proto_item *item=NULL;
-       proto_tree *tree=NULL;
-       guint8 val;
+    proto_item *item=NULL;
+    proto_tree *tree=NULL;
+    guint8 val;
 
-       if(parent_tree){
-               item=proto_tree_add_text(parent_tree, tvb, offset, 16, "DREP");
-               tree=proto_item_add_subtree(item, ett_krb_PAC_DREP);
-       }
+    if(parent_tree){
+        item=proto_tree_add_text(parent_tree, tvb, offset, 16, "DREP");
+        tree=proto_item_add_subtree(item, ett_krb_PAC_DREP);
+    }
 
-       val = tvb_get_guint8(tvb, offset);
-       proto_tree_add_uint(tree, hf_dcerpc_drep_byteorder, tvb, offset, 1, val>>4);
+    val = tvb_get_guint8(tvb, offset);
+    proto_tree_add_uint(tree, hf_dcerpc_drep_byteorder, tvb, offset, 1, val>>4);
 
-       offset++;
+    offset++;
 
-       if (drep) {
-               *drep = val;
-       }
+    if (drep) {
+        *drep = val;
+    }
 
-       return offset;
+    return offset;
 }
 
 /* This might be some sort of header that MIDL generates when creating
@@ -2534,429 +2585,425 @@ dissect_krb5_PAC_DREP(proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8
 static int
 dissect_krb5_PAC_NDRHEADERBLOB(proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 *drep, asn1_ctx_t *actx _U_)
 {
-       proto_item *item=NULL;
-       proto_tree *tree=NULL;
+    proto_item *item=NULL;
+    proto_tree *tree=NULL;
 
-       if(parent_tree){
-               item=proto_tree_add_text(parent_tree, tvb, offset, 16, "MES header");
-               tree=proto_item_add_subtree(item, ett_krb_PAC_MIDL_BLOB);
-       }
+    if(parent_tree){
+        item=proto_tree_add_text(parent_tree, tvb, offset, 16, "MES header");
+        tree=proto_item_add_subtree(item, ett_krb_PAC_MIDL_BLOB);
+    }
 
-       /* modified DREP field that is used for stuff that is transporetd ontop
-          of non dcerpc
-       */
-       proto_tree_add_item(tree, hf_krb_midl_version, tvb, offset, 1, TRUE);
-       offset++;
+    /* modified DREP field that is used for stuff that is transporetd ontop
+       of non dcerpc
+    */
+    proto_tree_add_item(tree, hf_krb_midl_version, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset++;
 
-       offset = dissect_krb5_PAC_DREP(tree, tvb, offset, drep);
+    offset = dissect_krb5_PAC_DREP(tree, tvb, offset, drep);
 
 
-       proto_tree_add_item(tree, hf_krb_midl_hdr_len, tvb, offset, 2, TRUE);
-       offset+=2;
+    proto_tree_add_item(tree, hf_krb_midl_hdr_len, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset+=2;
 
-       proto_tree_add_item(tree, hf_krb_midl_fill_bytes, tvb, offset, 4,
-                       TRUE);
-       offset += 4;
+    proto_tree_add_item(tree, hf_krb_midl_fill_bytes, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    offset += 4;
 
-       /* length of blob that follows */
-       proto_tree_add_item(tree, hf_krb_midl_blob_len, tvb, offset, 8,
-                       TRUE);
-       offset += 8;
+    /* length of blob that follows */
+    proto_tree_add_item(tree, hf_krb_midl_blob_len, tvb, offset, 8, ENC_LITTLE_ENDIAN);
+    offset += 8;
 
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_PAC_LOGON_INFO(proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       proto_item *item=NULL;
-       proto_tree *tree=NULL;
-       guint8 drep[4] = { 0x10, 0x00, 0x00, 0x00}; /* fake DREP struct */
-       dcerpc_info di; /* fake dcerpc_info struct */
-       void *old_private_data;
+    proto_item *item=NULL;
+    proto_tree *tree=NULL;
+    guint8 drep[4] = { 0x10, 0x00, 0x00, 0x00}; /* fake DREP struct */
+    static dcerpc_info di;      /* fake dcerpc_info struct */
+    static dcerpc_call_value call_data;
+    void *old_private_data;
 
-       item=proto_tree_add_item(parent_tree, hf_krb_PAC_LOGON_INFO, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
-       if(parent_tree){
-               tree=proto_item_add_subtree(item, ett_krb_PAC_LOGON_INFO);
-       }
-
-       /* skip the first 16 bytes, they are some magic created by the idl
-        * compiler   the first 4 bytes might be flags?
-        */
-       offset=dissect_krb5_PAC_NDRHEADERBLOB(tree, tvb, offset, &drep[0], actx);
+    item=proto_tree_add_item(parent_tree, hf_krb_PAC_LOGON_INFO, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
+    if(parent_tree){
+        tree=proto_item_add_subtree(item, ett_krb_PAC_LOGON_INFO);
+    }
 
-       /* the PAC_LOGON_INFO blob */
-       /* fake whatever state the dcerpc runtime support needs */
-       di.conformant_run=0;
-       di.call_data=NULL;
-       old_private_data=actx->pinfo->private_data;
-       actx->pinfo->private_data=&di;
-       init_ndr_pointer_list(actx->pinfo);
-       offset = dissect_ndr_pointer(tvb, offset, actx->pinfo, tree, drep,
-               netlogon_dissect_PAC_LOGON_INFO, NDR_POINTER_UNIQUE,
-               "PAC_LOGON_INFO:", -1);
-       actx->pinfo->private_data=old_private_data;
+    /* skip the first 16 bytes, they are some magic created by the idl
+     * compiler   the first 4 bytes might be flags?
+     */
+    offset=dissect_krb5_PAC_NDRHEADERBLOB(tree, tvb, offset, &drep[0], actx);
+
+    /* the PAC_LOGON_INFO blob */
+    /* fake whatever state the dcerpc runtime support needs */
+    di.conformant_run=0;
+    /* we need di->call_data->flags.NDR64 == 0 */
+    di.call_data=&call_data;
+    old_private_data=actx->pinfo->private_data;
+    actx->pinfo->private_data=&di;
+    init_ndr_pointer_list(actx->pinfo);
+    offset = dissect_ndr_pointer(tvb, offset, actx->pinfo, tree, drep,
+                                 netlogon_dissect_PAC_LOGON_INFO, NDR_POINTER_UNIQUE,
+                                 "PAC_LOGON_INFO:", -1);
+    actx->pinfo->private_data=old_private_data;
 
-       return offset;
+    return offset;
 }
 
 static int
-dissect_krb5_PAC_CONSTRAINED_DELEGATION(proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
+dissect_krb5_PAC_S4U_DELEGATION_INFO(proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       proto_item *item=NULL;
-       proto_tree *tree=NULL;
-       guint8 drep[4] = { 0x10, 0x00, 0x00, 0x00}; /* fake DREP struct */
-       dcerpc_info di; /* fake dcerpc_info struct */
-       void *old_private_data;
-
-       item=proto_tree_add_item(parent_tree, hf_krb_PAC_CONSTRAINED_DELEGATION, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
-       if(parent_tree){
-               tree=proto_item_add_subtree(item, ett_krb_PAC_CONSTRAINED_DELEGATION);
-       }
-
-       /* skip the first 16 bytes, they are some magic created by the idl
-        * compiler   the first 4 bytes might be flags?
-        */
-       offset=dissect_krb5_PAC_NDRHEADERBLOB(tree, tvb, offset, &drep[0], actx);
+    proto_item *item=NULL;
+    proto_tree *tree=NULL;
+    guint8 drep[4] = { 0x10, 0x00, 0x00, 0x00}; /* fake DREP struct */
+    static dcerpc_info di;      /* fake dcerpc_info struct */
+    static dcerpc_call_value call_data;
+    void *old_private_data;
 
+    item=proto_tree_add_item(parent_tree, hf_krb_PAC_S4U_DELEGATION_INFO, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
+    if(parent_tree){
+        tree=proto_item_add_subtree(item, ett_krb_PAC_S4U_DELEGATION_INFO);
+    }
 
-       /* the PAC_CONSTRAINED_DELEGATION blob */
-       /* fake whatever state the dcerpc runtime support needs */
-       di.conformant_run=0;
-       di.call_data=NULL;
-       old_private_data=actx->pinfo->private_data;
-       actx->pinfo->private_data=&di;
-       init_ndr_pointer_list(actx->pinfo);
-       offset = dissect_ndr_pointer(tvb, offset, actx->pinfo, tree, drep,
-               netlogon_dissect_PAC_CONSTRAINED_DELEGATION, NDR_POINTER_UNIQUE,
-               "PAC_CONSTRAINED_DELEGATION:", -1);
-       actx->pinfo->private_data=old_private_data;
+    /* skip the first 16 bytes, they are some magic created by the idl
+     * compiler   the first 4 bytes might be flags?
+     */
+    offset=dissect_krb5_PAC_NDRHEADERBLOB(tree, tvb, offset, &drep[0], actx);
+
+
+    /* the S4U_DELEGATION_INFO blob. See [MS-PAC] */
+    /* fake whatever state the dcerpc runtime support needs */
+    di.conformant_run=0;
+    /* we need di->call_data->flags.NDR64 == 0 */
+    di.call_data=&call_data;
+    old_private_data=actx->pinfo->private_data;
+    actx->pinfo->private_data=&di;
+    init_ndr_pointer_list(actx->pinfo);
+    offset = dissect_ndr_pointer(tvb, offset, actx->pinfo, tree, drep,
+                                 netlogon_dissect_PAC_S4U_DELEGATION_INFO, NDR_POINTER_UNIQUE,
+                                 "PAC_S4U_DELEGATION_INFO:", -1);
+    actx->pinfo->private_data=old_private_data;
 
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_PAC_UPN_DNS_INFO(proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       proto_item *item=NULL;
-       proto_tree *tree=NULL;
-       guint16 dns_offset, dns_len;
-       guint16 upn_offset, upn_len;
-       const char *dn;
-       int dn_len;
-       guint16 bc;
-
-       item=proto_tree_add_item(parent_tree, hf_krb_PAC_UPN_DNS_INFO, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
-       if(parent_tree){
-               tree=proto_item_add_subtree(item, ett_krb_PAC_UPN_DNS_INFO);
-       }
-
-       /* upn */
-       upn_len = tvb_get_letohs(tvb, offset);
-       proto_tree_add_item(tree, hf_krb_pac_upn_upn_len, tvb, offset, 2, TRUE);
-       offset+=2;
-       upn_offset = tvb_get_letohs(tvb, offset);
-       proto_tree_add_item(tree, hf_krb_pac_upn_upn_offset, tvb, offset, 2, TRUE);
-       offset+=2;
-
-       /* dns */
-       dns_len = tvb_get_letohs(tvb, offset);
-       proto_tree_add_item(tree, hf_krb_pac_upn_dns_len, tvb, offset, 2, TRUE);
-       offset+=2;
-       dns_offset = tvb_get_letohs(tvb, offset);
-       proto_tree_add_item(tree, hf_krb_pac_upn_dns_offset, tvb, offset, 2, TRUE);
-       offset+=2;
-
-       /* flags */     
-       proto_tree_add_item(tree, hf_krb_pac_upn_flags, tvb, offset, 4, TRUE);  
-
-       /* upn */
-       offset = upn_offset;
-       dn_len = upn_len;
-       bc = tvb_length_remaining(tvb, offset);
-       dn = get_unicode_or_ascii_string(tvb, &offset,
-                       TRUE, &dn_len, TRUE, TRUE, &bc);
-       proto_tree_add_string(tree, hf_krb_pac_upn_upn_name, tvb, upn_offset, upn_len, dn);
-
-       /* dns */
-       offset = dns_offset;
-       dn_len = dns_len;
-       bc = tvb_length_remaining(tvb, offset);
-       dn = get_unicode_or_ascii_string(tvb, &offset,
-                       TRUE, &dn_len, TRUE, TRUE, &bc);
-       proto_tree_add_string(tree, hf_krb_pac_upn_dns_name, tvb, dns_offset, dns_len, dn);
-
-       return offset;
+    proto_item *item=NULL;
+    proto_tree *tree=NULL;
+    guint16 dns_offset, dns_len;
+    guint16 upn_offset, upn_len;
+    const char *dn;
+    int dn_len;
+    guint16 bc;
+
+    item=proto_tree_add_item(parent_tree, hf_krb_PAC_UPN_DNS_INFO, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
+    if(parent_tree){
+        tree=proto_item_add_subtree(item, ett_krb_PAC_UPN_DNS_INFO);
+    }
+
+    /* upn */
+    upn_len = tvb_get_letohs(tvb, offset);
+    proto_tree_add_item(tree, hf_krb_pac_upn_upn_len, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset+=2;
+    upn_offset = tvb_get_letohs(tvb, offset);
+    proto_tree_add_item(tree, hf_krb_pac_upn_upn_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset+=2;
+
+    /* dns */
+    dns_len = tvb_get_letohs(tvb, offset);
+    proto_tree_add_item(tree, hf_krb_pac_upn_dns_len, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset+=2;
+    dns_offset = tvb_get_letohs(tvb, offset);
+    proto_tree_add_item(tree, hf_krb_pac_upn_dns_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset+=2;
+
+    /* flags */
+    proto_tree_add_item(tree, hf_krb_pac_upn_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+
+    /* upn */
+    offset = upn_offset;
+    dn_len = upn_len;
+    bc = tvb_length_remaining(tvb, offset);
+    dn = get_unicode_or_ascii_string(tvb, &offset,
+                                     TRUE, &dn_len, TRUE, TRUE, &bc);
+    proto_tree_add_string(tree, hf_krb_pac_upn_upn_name, tvb, upn_offset, upn_len, dn);
+
+    /* dns */
+    offset = dns_offset;
+    dn_len = dns_len;
+    bc = tvb_length_remaining(tvb, offset);
+    dn = get_unicode_or_ascii_string(tvb, &offset,
+                                     TRUE, &dn_len, TRUE, TRUE, &bc);
+    proto_tree_add_string(tree, hf_krb_pac_upn_dns_name, tvb, dns_offset, dns_len, dn);
+
+    return offset;
 }
 
 static int
 dissect_krb5_PAC_CREDENTIAL_TYPE(proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       proto_item *item=NULL;
-       proto_tree *tree=NULL;
-
-       item=proto_tree_add_item(parent_tree, hf_krb_PAC_CREDENTIAL_TYPE, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
-       if(parent_tree){
-               tree=proto_item_add_subtree(item, ett_krb_PAC_CREDENTIAL_TYPE);
-       }
+    proto_tree_add_item(parent_tree, hf_krb_PAC_CREDENTIAL_TYPE, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
 
 /*qqq*/
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_PAC_SERVER_CHECKSUM(proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       proto_item *item=NULL;
-       proto_tree *tree=NULL;
+    proto_item *item=NULL;
+    proto_tree *tree=NULL;
 
-       item=proto_tree_add_item(parent_tree, hf_krb_PAC_SERVER_CHECKSUM, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
-       if(parent_tree){
-               tree=proto_item_add_subtree(item, ett_krb_PAC_SERVER_CHECKSUM);
-       }
+    item=proto_tree_add_item(parent_tree, hf_krb_PAC_SERVER_CHECKSUM, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
+    if(parent_tree){
+        tree=proto_item_add_subtree(item, ett_krb_PAC_SERVER_CHECKSUM);
+    }
 
-       /* signature type */
-       proto_tree_add_item(tree, hf_krb_pac_signature_type, tvb, offset, 4, TRUE);
-       offset+=4;
+    /* signature type */
+    proto_tree_add_item(tree, hf_krb_pac_signature_type, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    offset+=4;
 
-       /* signature data */
-       proto_tree_add_item(tree, hf_krb_pac_signature_signature, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
+    /* signature data */
+    proto_tree_add_item(tree, hf_krb_pac_signature_signature, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
 
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_PAC_PRIVSVR_CHECKSUM(proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       proto_item *item=NULL;
-       proto_tree *tree=NULL;
+    proto_item *item=NULL;
+    proto_tree *tree=NULL;
 
-       item=proto_tree_add_item(parent_tree, hf_krb_PAC_PRIVSVR_CHECKSUM, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
-       if(parent_tree){
-               tree=proto_item_add_subtree(item, ett_krb_PAC_PRIVSVR_CHECKSUM);
-       }
+    item=proto_tree_add_item(parent_tree, hf_krb_PAC_PRIVSVR_CHECKSUM, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
+    if(parent_tree){
+        tree=proto_item_add_subtree(item, ett_krb_PAC_PRIVSVR_CHECKSUM);
+    }
 
-       /* signature type */
-       proto_tree_add_item(tree, hf_krb_pac_signature_type, tvb, offset, 4, TRUE);
-       offset+=4;
+    /* signature type */
+    proto_tree_add_item(tree, hf_krb_pac_signature_type, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    offset+=4;
 
-       /* signature data */
-       proto_tree_add_item(tree, hf_krb_pac_signature_signature, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
+    /* signature data */
+    proto_tree_add_item(tree, hf_krb_pac_signature_signature, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
 
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_PAC_CLIENT_INFO_TYPE(proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       proto_item *item=NULL;
-       proto_tree *tree=NULL;
-       guint16 namelen;
-       char *name;
+    proto_item *item=NULL;
+    proto_tree *tree=NULL;
+    guint16 namelen;
+    char *name;
 
-       item=proto_tree_add_item(parent_tree, hf_krb_PAC_CLIENT_INFO_TYPE, tvb, offset, tvb_length_remaining(tvb, offset), FALSE);
-       if(parent_tree){
-               tree=proto_item_add_subtree(item, ett_krb_PAC_CLIENT_INFO_TYPE);
-       }
+    item=proto_tree_add_item(parent_tree, hf_krb_PAC_CLIENT_INFO_TYPE, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
+    if(parent_tree){
+        tree=proto_item_add_subtree(item, ett_krb_PAC_CLIENT_INFO_TYPE);
+    }
 
-       /* clientid */
-       offset = dissect_nt_64bit_time(tvb, tree, offset,
-                       hf_krb_pac_clientid);
+    /* clientid */
+    offset = dissect_nt_64bit_time(tvb, tree, offset,
+                                   hf_krb_pac_clientid);
 
-       /* name length */
-       namelen=tvb_get_letohs(tvb, offset);
-       proto_tree_add_uint(tree, hf_krb_pac_namelen, tvb, offset, 2, namelen);
-       offset+=2;
+    /* name length */
+    namelen=tvb_get_letohs(tvb, offset);
+    proto_tree_add_uint(tree, hf_krb_pac_namelen, tvb, offset, 2, namelen);
+    offset+=2;
 
-       /* client name */
-       name=tvb_get_ephemeral_faked_unicode(tvb, offset, namelen/2, TRUE);
-       proto_tree_add_string(tree, hf_krb_pac_clientname, tvb, offset, namelen, name);
-       offset+=namelen;
+    /* client name */
+    name=tvb_get_ephemeral_unicode_string(tvb, offset, namelen/2, ENC_LITTLE_ENDIAN);
+    proto_tree_add_string(tree, hf_krb_pac_clientname, tvb, offset, namelen, name);
+    offset+=namelen;
 
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_AD_WIN2K_PAC_struct(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint32 pac_type;
-       guint32 pac_size;
-       guint32 pac_offset;
-       proto_item *it=NULL;
-       proto_tree *tr=NULL;
-       tvbuff_t *next_tvb;
-
-       /* type of pac data */
-       pac_type=tvb_get_letohl(tvb, offset);
-       it=proto_tree_add_uint(tree, hf_krb_w2k_pac_type, tvb, offset, 4, pac_type);
-       if(it){
-               tr=proto_item_add_subtree(it, ett_krb_PAC);
-       }
-
-       offset += 4;
-
-       /* size of pac data */
-       pac_size=tvb_get_letohl(tvb, offset);
-       proto_tree_add_uint(tr, hf_krb_w2k_pac_size, tvb, offset, 4, pac_size);
-       offset += 4;
-
-       /* offset to pac data */
-       pac_offset=tvb_get_letohl(tvb, offset);
-       proto_tree_add_uint(tr, hf_krb_w2k_pac_offset, tvb, offset, 4, pac_offset);
-       offset += 8;
-
-
-       next_tvb=tvb_new_subset(tvb, pac_offset, pac_size, pac_size);
-       switch(pac_type){
-       case PAC_LOGON_INFO:
-               dissect_krb5_PAC_LOGON_INFO(tr, next_tvb, 0, actx);
-               break;
-       case PAC_CREDENTIAL_TYPE:
-               dissect_krb5_PAC_CREDENTIAL_TYPE(tr, next_tvb, 0, actx);
-               break;
-       case PAC_SERVER_CHECKSUM:
-               dissect_krb5_PAC_SERVER_CHECKSUM(tr, next_tvb, 0, actx);
-               break;
-       case PAC_PRIVSVR_CHECKSUM:
-               dissect_krb5_PAC_PRIVSVR_CHECKSUM(tr, next_tvb, 0, actx);
-               break;
-       case PAC_CLIENT_INFO_TYPE:
-               dissect_krb5_PAC_CLIENT_INFO_TYPE(tr, next_tvb, 0, actx);
-               break;
-       case PAC_CONSTRAINED_DELEGATION:
-               dissect_krb5_PAC_CONSTRAINED_DELEGATION(tr, next_tvb, 0, actx);
-               break;
-       case PAC_UPN_DNS_INFO:
-               dissect_krb5_PAC_UPN_DNS_INFO(tr, next_tvb, 0, actx);
-               break;
-
-       default:;
+    guint32 pac_type;
+    guint32 pac_size;
+    guint32 pac_offset;
+    proto_item *it=NULL;
+    proto_tree *tr=NULL;
+    tvbuff_t *next_tvb;
+
+    /* type of pac data */
+    pac_type=tvb_get_letohl(tvb, offset);
+    it=proto_tree_add_uint(tree, hf_krb_w2k_pac_type, tvb, offset, 4, pac_type);
+    if(it){
+        tr=proto_item_add_subtree(it, ett_krb_PAC);
+    }
+
+    offset += 4;
+
+    /* size of pac data */
+    pac_size=tvb_get_letohl(tvb, offset);
+    proto_tree_add_uint(tr, hf_krb_w2k_pac_size, tvb, offset, 4, pac_size);
+    offset += 4;
+
+    /* offset to pac data */
+    pac_offset=tvb_get_letohl(tvb, offset);
+    proto_tree_add_uint(tr, hf_krb_w2k_pac_offset, tvb, offset, 4, pac_offset);
+    offset += 8;
+
+
+    next_tvb=tvb_new_subset(tvb, pac_offset, pac_size, pac_size);
+    switch(pac_type){
+    case PAC_LOGON_INFO:
+        dissect_krb5_PAC_LOGON_INFO(tr, next_tvb, 0, actx);
+        break;
+    case PAC_CREDENTIAL_TYPE:
+        dissect_krb5_PAC_CREDENTIAL_TYPE(tr, next_tvb, 0, actx);
+        break;
+    case PAC_SERVER_CHECKSUM:
+        dissect_krb5_PAC_SERVER_CHECKSUM(tr, next_tvb, 0, actx);
+        break;
+    case PAC_PRIVSVR_CHECKSUM:
+        dissect_krb5_PAC_PRIVSVR_CHECKSUM(tr, next_tvb, 0, actx);
+        break;
+    case PAC_CLIENT_INFO_TYPE:
+        dissect_krb5_PAC_CLIENT_INFO_TYPE(tr, next_tvb, 0, actx);
+        break;
+    case PAC_S4U_DELEGATION_INFO:
+        dissect_krb5_PAC_S4U_DELEGATION_INFO(tr, next_tvb, 0, actx);
+        break;
+    case PAC_UPN_DNS_INFO:
+        dissect_krb5_PAC_UPN_DNS_INFO(tr, next_tvb, 0, actx);
+        break;
+
+    default:;
 /*qqq*/
-       }
-       return offset;
+    }
+    return offset;
 }
 
 static int
 dissect_krb5_AD_WIN2K_PAC(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint32 entries;
-       guint32 version;
-       guint32 i;
+    guint32 entries;
+    guint32 version;
+    guint32 i;
 
-       /* first in the PAC structure comes the number of entries */
-       entries=tvb_get_letohl(tvb, offset);
-       proto_tree_add_uint(tree, hf_krb_w2k_pac_entries, tvb, offset, 4, entries);
-       offset += 4;
+    /* first in the PAC structure comes the number of entries */
+    entries=tvb_get_letohl(tvb, offset);
+    proto_tree_add_uint(tree, hf_krb_w2k_pac_entries, tvb, offset, 4, entries);
+    offset += 4;
 
-       /* second comes the version */
-       version=tvb_get_letohl(tvb, offset);
-       proto_tree_add_uint(tree, hf_krb_w2k_pac_version, tvb, offset, 4, version);
-       offset += 4;
+    /* second comes the version */
+    version=tvb_get_letohl(tvb, offset);
+    proto_tree_add_uint(tree, hf_krb_w2k_pac_version, tvb, offset, 4, version);
+    offset += 4;
 
-       for(i=0;i<entries;i++){
-               offset=dissect_krb5_AD_WIN2K_PAC_struct(tree, tvb, offset, actx);
-       }
+    for(i=0;i<entries;i++){
+        offset=dissect_krb5_AD_WIN2K_PAC_struct(tree, tvb, offset, actx);
+    }
 
-       return offset;
+    return offset;
 }
 
 
 int dissect_krb5_Checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx);
 
 static ber_old_sequence_t AD_SIGNTICKET_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_etype },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_Checksum },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_etype },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_Checksum },
+    { 0, 0, 0, NULL }
 };
 
 /* first seen in traces from vista */
 static int
 dissect_krb5_AD_SIGNTICKET(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AD_SIGNTICKET_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AD_SIGNTICKET_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 static guint32 IF_RELEVANT_type;
 static int
 dissect_krb5_IF_RELEVANT_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_IF_RELEVANT_type, &IF_RELEVANT_type);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(IF_RELEVANT_type, krb5_ad_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_IF_RELEVANT_type, &IF_RELEVANT_type);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(IF_RELEVANT_type, krb5_ad_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 static int
 dissect_krb5_IF_RELEVANT_value(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       switch(IF_RELEVANT_type){
-       case KRB5_AD_WIN2K_PAC:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_AD_WIN2K_PAC);
-               break;
-       case KRB5_AD_SIGNTICKET:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_AD_SIGNTICKET);
-               break;
-       default:
-               offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_IF_RELEVANT_value, NULL);
-       }
-       return offset;
+    switch(IF_RELEVANT_type){
+    case KRB5_AD_WIN2K_PAC:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_AD_WIN2K_PAC);
+        break;
+    case KRB5_AD_SIGNTICKET:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_AD_SIGNTICKET);
+        break;
+    default:
+        offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_IF_RELEVANT_value, NULL);
+    }
+    return offset;
 }
 static ber_old_sequence_t IF_RELEVANT_item_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_IF_RELEVANT_type },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_IF_RELEVANT_value },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_IF_RELEVANT_type },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_IF_RELEVANT_value },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_IF_RELEVANT_item(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, IF_RELEVANT_item_sequence, hf_krb_IF_RELEVANT, ett_krb_IF_RELEVANT);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, IF_RELEVANT_item_sequence, hf_krb_IF_RELEVANT, ett_krb_IF_RELEVANT);
 
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t IF_RELEVANT_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_IF_RELEVANT_item },
+    { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_IF_RELEVANT_item },
 };
 
 static int
 dissect_krb5_IF_RELEVANT(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, IF_RELEVANT_sequence_of, -1, -1);
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, IF_RELEVANT_sequence_of, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 static guint32 adtype;
 static int
 dissect_krb5_adtype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_adtype, &adtype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(adtype, krb5_ad_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_adtype, &adtype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(adtype, krb5_ad_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 static int
 dissect_krb5_advalue(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       switch(adtype){
-       case KRB5_AD_IF_RELEVANT:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_IF_RELEVANT);
-               break;
-       default:
-               offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_advalue, NULL);
-       }
-       return offset;
+    switch(adtype){
+    case KRB5_AD_IF_RELEVANT:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_advalue, dissect_krb5_IF_RELEVANT);
+        break;
+    default:
+        offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_advalue, NULL);
+    }
+    return offset;
 }
 /*
  * AuthorizationData ::=        SEQUENCE {
@@ -2964,51 +3011,51 @@ dissect_krb5_advalue(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
  *     ad-data  [1] octet string
  */
 static ber_old_sequence_t AuthorizationData_item_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_adtype },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_advalue },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_adtype },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_advalue },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_AuthorizationData_item(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AuthorizationData_item_sequence, hf_krb_AuthorizationData, ett_krb_AuthorizationData);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AuthorizationData_item_sequence, hf_krb_AuthorizationData, ett_krb_AuthorizationData);
 
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t AuthorizationData_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_AuthorizationData_item },
+    { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_AuthorizationData_item },
 };
 static int
 dissect_krb5_AuthorizationData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, AuthorizationData_sequence_of, -1, -1);
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, AuthorizationData_sequence_of, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 
 static int
 dissect_krb5_transited_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint32 trtype;
+    guint32 trtype;
 
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_transitedtype, &trtype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(trtype, krb5_transited_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_transitedtype, &trtype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(trtype, krb5_transited_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 
 static int
 dissect_krb5_transited_contents(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_transitedcontents, NULL);
-       return offset;
+    offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_transitedcontents, NULL);
+    return offset;
 }
 
 /*
@@ -3017,44 +3064,44 @@ dissect_krb5_transited_contents(proto_tree *tree, tvbuff_t *tvb, int offset, asn
  *     contents [1] octet string
  */
 static ber_old_sequence_t TransitedEncoding_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_transited_type },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_transited_contents },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_transited_type },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_transited_contents },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_transited(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, TransitedEncoding_sequence, hf_krb_TransitedEncoding, ett_krb_TransitedEncoding);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, TransitedEncoding_sequence, hf_krb_TransitedEncoding, ett_krb_TransitedEncoding);
 
-       return offset;
+    return offset;
 }
 
 
 static int
 dissect_krb5_authtime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_authtime);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_authtime);
+    return offset;
 }
 static int
 dissect_krb5_starttime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_starttime);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_starttime);
+    return offset;
 }
 static int
 dissect_krb5_endtime(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_endtime);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_endtime);
+    return offset;
 }
 static int
 dissect_krb5_renew_till(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_renew_till);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_renew_till);
+    return offset;
 }
 
 /*
@@ -3073,36 +3120,36 @@ dissect_krb5_renew_till(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t
  * }
  */
 static ber_old_sequence_t EncTicketPart_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_TicketFlags },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_key },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_crealm },
-       { BER_CLASS_CON, 3, 0,
-               dissect_krb5_cname },
-       { BER_CLASS_CON, 4, 0,
-               dissect_krb5_transited },
-       { BER_CLASS_CON, 5, 0,
-               dissect_krb5_authtime },
-       { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL,
-               dissect_krb5_starttime },
-       { BER_CLASS_CON, 7, 0,
-               dissect_krb5_endtime },
-       { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL,
-               dissect_krb5_renew_till },
-       { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL,
-               dissect_krb5_HostAddresses },
-       { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL,
-               dissect_krb5_AuthorizationData },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_TicketFlags },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_key },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_crealm },
+    { BER_CLASS_CON, 3, 0,
+      dissect_krb5_cname },
+    { BER_CLASS_CON, 4, 0,
+      dissect_krb5_transited },
+    { BER_CLASS_CON, 5, 0,
+      dissect_krb5_authtime },
+    { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL,
+      dissect_krb5_starttime },
+    { BER_CLASS_CON, 7, 0,
+      dissect_krb5_endtime },
+    { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL,
+      dissect_krb5_renew_till },
+    { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL,
+      dissect_krb5_HostAddresses },
+    { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL,
+      dissect_krb5_AuthorizationData },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_EncTicketPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncTicketPart_sequence, hf_krb_EncTicketPart, ett_krb_EncTicketPart);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncTicketPart_sequence, hf_krb_EncTicketPart, ett_krb_EncTicketPart);
 
-       return offset;
+    return offset;
 }
 
 
@@ -3119,22 +3166,22 @@ dissect_krb5_EncTicketPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx
  * }
  */
 static ber_old_sequence_t EncAPRepPart_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_ctime },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_cusec },
-       { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
-               dissect_krb5_subkey },
-       { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
-               dissect_krb5_seq_number },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_ctime },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_cusec },
+    { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
+      dissect_krb5_subkey },
+    { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
+      dissect_krb5_seq_number },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_EncAPRepPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncAPRepPart_sequence, hf_krb_EncAPRepPart, ett_krb_EncAPRepPart);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncAPRepPart_sequence, hf_krb_EncAPRepPart, ett_krb_EncAPRepPart);
 
-       return offset;
+    return offset;
 }
 
 
@@ -3154,130 +3201,131 @@ static const value_string krb5_lr_types[] = {
 static int
 dissect_krb5_lr_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_lr_type, &lr_type);
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_lr_type, &lr_type);
 
-       return offset;
+    return offset;
 }
 static int
 dissect_krb5_lr_value(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_lr_time);
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_lr_time);
 
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t LastReq_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_lr_type },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_lr_value },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_lr_type },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_lr_value },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_LastReq(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, LastReq_sequence, hf_krb_LastReq, ett_krb_LastReq);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, LastReq_sequence, hf_krb_LastReq, ett_krb_LastReq);
 
-       return offset;
+    return offset;
 }
 static ber_old_sequence_t LastReq_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_LastReq },
+    { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_LastReq },
 };
 static int
 dissect_krb5_LastReq_sequence_of(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, LastReq_sequence_of, hf_krb_LastReqs, ett_krb_LastReqs);
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, LastReq_sequence_of, hf_krb_LastReqs, ett_krb_LastReqs);
 
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_key_expiration(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_key_expire);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_key_expire);
+    return offset;
 }
 
 static ber_old_sequence_t EncKDCRepPart_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_key },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_LastReq_sequence_of },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_nonce },
-       { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
-               dissect_krb5_key_expiration },
-       { BER_CLASS_CON, 4, 0,
-               dissect_krb5_TicketFlags },
-       { BER_CLASS_CON, 5, 0,
-               dissect_krb5_authtime },
-       { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL,
-               dissect_krb5_starttime },
-       { BER_CLASS_CON, 7, 0,
-               dissect_krb5_endtime },
-       { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL,
-               dissect_krb5_renew_till },
-       { BER_CLASS_CON, 9, 0,
-               dissect_krb5_realm },
-       { BER_CLASS_CON, 10, 0,
-               dissect_krb5_sname },
-       { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL,
-               dissect_krb5_HostAddresses },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_key },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_LastReq_sequence_of },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_nonce },
+    { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
+      dissect_krb5_key_expiration },
+    { BER_CLASS_CON, 4, 0,
+      dissect_krb5_TicketFlags },
+    { BER_CLASS_CON, 5, 0,
+      dissect_krb5_authtime },
+    { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL,
+      dissect_krb5_starttime },
+    { BER_CLASS_CON, 7, 0,
+      dissect_krb5_endtime },
+    { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL,
+      dissect_krb5_renew_till },
+    { BER_CLASS_CON, 9, 0,
+      dissect_krb5_realm },
+    { BER_CLASS_CON, 10, 0,
+      dissect_krb5_sname },
+    { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL,
+      dissect_krb5_HostAddresses },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_EncKDCRepPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncKDCRepPart_sequence, hf_krb_EncKDCRepPart, ett_krb_EncKDCRepPart);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncKDCRepPart_sequence, hf_krb_EncKDCRepPart, ett_krb_EncKDCRepPart);
 
-       return offset;
+    return offset;
 }
 
 
 static int
 dissect_krb5_authenticator_vno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_authenticator_vno, NULL);
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_authenticator_vno, NULL);
 
-       return offset;
+    return offset;
 }
 
 
-#define KRB5_GSS_C_DELEG_FLAG          0x01
-#define KRB5_GSS_C_MUTUAL_FLAG         0x02
-#define KRB5_GSS_C_REPLAY_FLAG         0x04
-#define KRB5_GSS_C_SEQUENCE_FLAG       0x08
-#define KRB5_GSS_C_CONF_FLAG           0x10
-#define KRB5_GSS_C_INTEG_FLAG          0x20
-#define KRB5_GSS_C_DCE_STYLE           0x1000
+#define KRB5_GSS_C_DELEG_FLAG             0x01
+#define KRB5_GSS_C_MUTUAL_FLAG            0x02
+#define KRB5_GSS_C_REPLAY_FLAG            0x04
+#define KRB5_GSS_C_SEQUENCE_FLAG          0x08
+#define KRB5_GSS_C_CONF_FLAG              0x10
+#define KRB5_GSS_C_INTEG_FLAG             0x20
+#define KRB5_GSS_C_DCE_STYLE            0x1000
+
 static const true_false_string tfs_gss_flags_deleg = {
-       "Delegate credantials to remote peer",
-       "Do NOT delegate"
+    "Delegate credentials to remote peer",
+    "Do NOT delegate"
 };
 static const true_false_string tfs_gss_flags_mutual = {
-       "Request that remote peer authenticates itself",
-       "Mutual authentication NOT required"
+    "Request that remote peer authenticates itself",
+    "Mutual authentication NOT required"
 };
 static const true_false_string tfs_gss_flags_replay = {
-       "Enable replay protection for signed or sealed messages",
-       "Do NOT enable replay protection"
+    "Enable replay protection for signed or sealed messages",
+    "Do NOT enable replay protection"
 };
 static const true_false_string tfs_gss_flags_sequence = {
-       "Enable Out-of-sequence detection for sign or sealed messages",
-       "Do NOT enable out-of-sequence detection"
+    "Enable Out-of-sequence detection for sign or sealed messages",
+    "Do NOT enable out-of-sequence detection"
 };
 static const true_false_string tfs_gss_flags_conf = {
-       "Confidentiality (sealing) may be invoked",
-       "Do NOT use Confidentiality (sealing)"
+    "Confidentiality (sealing) may be invoked",
+    "Do NOT use Confidentiality (sealing)"
 };
 static const true_false_string tfs_gss_flags_integ = {
-       "Integrity protection (signing) may be invoked",
-       "Do NOT use integrity protection"
+    "Integrity protection (signing) may be invoked",
+    "Do NOT use integrity protection"
 };
 
 static const true_false_string tfs_gss_flags_dce_style = {
-       "DCE-STYLE",
-       "Not using DCE-STYLE"
+    "DCE-STYLE",
+    "Not using DCE-STYLE"
 };
 
 /* Dissect a GSSAPI checksum as per RFC1964. This is NOT ASN.1 encoded.
@@ -3285,57 +3333,57 @@ static const true_false_string tfs_gss_flags_dce_style = {
 static int
 dissect_krb5_rfc1964_checksum(asn1_ctx_t *actx _U_, proto_tree *tree, tvbuff_t *tvb)
 {
-       int offset=0;
-       guint32 len;
-       guint16 dlglen;
-
-       /* Length of Bnd field */
-       len=tvb_get_letohl(tvb, offset);
-       proto_tree_add_item(tree, hf_krb_gssapi_len, tvb, offset, 4, TRUE);
-       offset += 4;
-
-       /* Bnd field */
-       proto_tree_add_item(tree, hf_krb_gssapi_bnd, tvb, offset, len, TRUE);
-       offset += len;
-
-
-       /* flags */
-       proto_tree_add_item(tree, hf_krb_gssapi_c_flag_dce_style, tvb, offset, 4, TRUE);
-       proto_tree_add_item(tree, hf_krb_gssapi_c_flag_integ, tvb, offset, 4, TRUE);
-       proto_tree_add_item(tree, hf_krb_gssapi_c_flag_conf, tvb, offset, 4, TRUE);
-       proto_tree_add_item(tree, hf_krb_gssapi_c_flag_sequence, tvb, offset, 4, TRUE);
-       proto_tree_add_item(tree, hf_krb_gssapi_c_flag_replay, tvb, offset, 4, TRUE);
-       proto_tree_add_item(tree, hf_krb_gssapi_c_flag_mutual, tvb, offset, 4, TRUE);
-       proto_tree_add_item(tree, hf_krb_gssapi_c_flag_deleg, tvb, offset, 4, TRUE);
-       offset += 4;
-
-       /* the next fields are optional so we have to check that we have
-        * more data in our buffers */
-       if(tvb_length_remaining(tvb, offset)<2){
-               return offset;
-       }
-       /* dlgopt identifier */
-       proto_tree_add_item(tree, hf_krb_gssapi_dlgopt, tvb, offset, 2, TRUE);
-       offset += 2;
-
-       if(tvb_length_remaining(tvb, offset)<2){
-               return offset;
-       }
-       /* dlglen identifier */
-       dlglen=tvb_get_letohs(tvb, offset);
-       proto_tree_add_item(tree, hf_krb_gssapi_dlglen, tvb, offset, 2, TRUE);
-       offset += 2;
+    int offset=0;
+    guint32 len;
+    guint16 dlglen;
+
+    /* Length of Bnd field */
+    len=tvb_get_letohl(tvb, offset);
+    proto_tree_add_item(tree, hf_krb_gssapi_len, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    offset += 4;
+
+    /* Bnd field */
+    proto_tree_add_item(tree, hf_krb_gssapi_bnd, tvb, offset, len, ENC_NA);
+    offset += len;
+
+
+    /* flags */
+    proto_tree_add_item(tree, hf_krb_gssapi_c_flag_dce_style, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(tree, hf_krb_gssapi_c_flag_integ, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(tree, hf_krb_gssapi_c_flag_conf, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(tree, hf_krb_gssapi_c_flag_sequence, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(tree, hf_krb_gssapi_c_flag_replay, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(tree, hf_krb_gssapi_c_flag_mutual, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(tree, hf_krb_gssapi_c_flag_deleg, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    offset += 4;
+
+    /* the next fields are optional so we have to check that we have
+     * more data in our buffers */
+    if(tvb_length_remaining(tvb, offset)<2){
+        return offset;
+    }
+    /* dlgopt identifier */
+    proto_tree_add_item(tree, hf_krb_gssapi_dlgopt, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset += 2;
 
-       if(dlglen!=tvb_length_remaining(tvb, offset)){
-               proto_tree_add_text(tree, tvb, 0, 0, "Error: DlgLen:%d is not the same as number of bytes remaining:%d", dlglen, tvb_length_remaining(tvb, offset));
-               return offset;
-       }
+    if(tvb_length_remaining(tvb, offset)<2){
+        return offset;
+    }
+    /* dlglen identifier */
+    dlglen=tvb_get_letohs(tvb, offset);
+    proto_tree_add_item(tree, hf_krb_gssapi_dlglen, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset += 2;
+
+    if(dlglen!=tvb_length_remaining(tvb, offset)){
+        proto_tree_add_text(tree, tvb, 0, 0, "Error: DlgLen:%d is not the same as number of bytes remaining:%d", dlglen, tvb_length_remaining(tvb, offset));
+        return offset;
+    }
 
-       /* this should now be a KRB_CRED message */
-       offset=dissect_ber_old_choice(actx, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
+    /* this should now be a KRB_CRED message */
+    offset=dissect_ber_old_choice(actx, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
 
 
-       return offset;
+    return offset;
 }
 
 static guint32 checksum_type;
@@ -3343,25 +3391,25 @@ static guint32 checksum_type;
 static int
 dissect_krb5_checksum_type(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_checksum_type, &checksum_type);
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_checksum_type, &checksum_type);
 
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_checksum_checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       tvbuff_t *next_tvb;
+    tvbuff_t *next_tvb;
 
-       switch(checksum_type){
-       case KRB5_CHKSUM_GSSAPI:
-               offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_checksum_checksum, &next_tvb);
-               dissect_krb5_rfc1964_checksum(actx, tree, next_tvb);
-               break;
-       default:
-               offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_checksum_checksum, NULL);
-       }
-       return offset;
+    switch(checksum_type){
+    case KRB5_CHKSUM_GSSAPI:
+        offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_checksum_checksum, &next_tvb);
+        dissect_krb5_rfc1964_checksum(actx, tree, next_tvb);
+        break;
+    default:
+        offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_checksum_checksum, NULL);
+    }
+    return offset;
 }
 
 /*
@@ -3369,23 +3417,23 @@ dissect_krb5_checksum_checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1
  * }
  */
 static ber_old_sequence_t Checksum_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_checksum_type },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_checksum_checksum },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_checksum_type },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_checksum_checksum },
+    { 0, 0, 0, NULL }
 };
 int
 dissect_krb5_Checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Checksum_sequence, hf_krb_Checksum, ett_krb_Checksum);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Checksum_sequence, hf_krb_Checksum, ett_krb_Checksum);
 
-       return offset;
+    return offset;
 }
 
 /*
  * Authenticator ::=        SEQUENCE {
- *     authenticator-vno       [0] integer
+ *     authenticator-vno        [0] integer
  *     crealm                   [1] Realm
  *     cname                    [2] PrincipalName
  *     cksum                    [3] Checksum OPTIONAL
@@ -3397,111 +3445,113 @@ dissect_krb5_Checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *a
  * }
  */
 static ber_old_sequence_t Authenticator_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_authenticator_vno },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_crealm },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_cname },
-       { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
-               dissect_krb5_Checksum },
-       { BER_CLASS_CON, 4, 0,
-               dissect_krb5_cusec },
-       { BER_CLASS_CON, 5, 0,
-               dissect_krb5_ctime },
-       { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL,
-               dissect_krb5_subkey },
-       { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL,
-               dissect_krb5_seq_number },
-       { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL,
-               dissect_krb5_AuthorizationData },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_authenticator_vno },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_crealm },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_cname },
+    { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
+      dissect_krb5_Checksum },
+    { BER_CLASS_CON, 4, 0,
+      dissect_krb5_cusec },
+    { BER_CLASS_CON, 5, 0,
+      dissect_krb5_ctime },
+    { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL,
+      dissect_krb5_subkey },
+    { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL,
+      dissect_krb5_seq_number },
+    { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL,
+      dissect_krb5_AuthorizationData },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_Authenticator(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Authenticator_sequence, hf_krb_Authenticator, ett_krb_Authenticator);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Authenticator_sequence, hf_krb_Authenticator, ett_krb_Authenticator);
 
-       return offset;
+    return offset;
 }
 
 
 static int
 dissect_krb5_PRIV_BODY_user_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       tvbuff_t *new_tvb;
-       offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_PRIV_BODY_user_data, &new_tvb);
+    tvbuff_t *new_tvb;
+    offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_PRIV_BODY_user_data, &new_tvb);
 
-       if (new_tvb)
-               call_kerberos_callbacks(actx->pinfo, tree, new_tvb, KRB_CBTAG_PRIV_USER_DATA);
+    if (new_tvb)
+        call_kerberos_callbacks(actx->pinfo, tree, new_tvb, KRB_CBTAG_PRIV_USER_DATA);
 
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t EncKrbPrivPart_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_PRIV_BODY_user_data },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_patimestamp },
-       { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
-               dissect_krb5_cusec },
-       { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
-               dissect_krb5_seq_number },
-       { BER_CLASS_CON, 4, 0,
-               dissect_krb5_s_address },
-       { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL,
-               dissect_krb5_HostAddresses },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_PRIV_BODY_user_data },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_patimestamp },
+    { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
+      dissect_krb5_cusec },
+    { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
+      dissect_krb5_seq_number },
+    { BER_CLASS_CON, 4, 0,
+      dissect_krb5_s_address },
+    { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL,
+      dissect_krb5_HostAddresses },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_EncKrbPrivPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncKrbPrivPart_sequence, hf_krb_EncKrbPrivPart, ett_krb_EncKrbPrivPart);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncKrbPrivPart_sequence, hf_krb_EncKrbPrivPart, ett_krb_EncKrbPrivPart);
 
-       return offset;
+    return offset;
 }
 
 static guint32 PRIV_etype;
 static int
 dissect_krb5_PRIV_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &PRIV_etype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(PRIV_etype, krb5_encryption_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &PRIV_etype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(PRIV_etype, krb5_encryption_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 
 #ifdef HAVE_KERBEROS
 static int
 dissect_krb5_decrypt_PRIV (proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint8 *plaintext=NULL;
-       int length;
+    guint8 *plaintext=NULL;
+    int length;
 
-       length=tvb_length_remaining(tvb, offset);
+    length=tvb_length_remaining(tvb, offset);
 
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 13, length, tvb_get_ptr(tvb, offset, length), PRIV_etype, NULL);
-       }
+    if(!plaintext){
+        tvbuff_t *next_tvb;
 
-       if(plaintext){
-               tvbuff_t *next_tvb;
-               next_tvb = tvb_new_real_data (plaintext,
-                                          length,
-                                          length);
-               tvb_set_free_cb(next_tvb, g_free);
-               tvb_set_child_real_data_tvbuff(tvb, next_tvb);
+        next_tvb=tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_reported_length_remaining(tvb, offset));
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 13, next_tvb, PRIV_etype, NULL);
+    }
 
-               /* Add the decrypted data to the data source list. */
-               add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
+    if(plaintext){
+        tvbuff_t *next_tvb;
+        next_tvb = tvb_new_child_real_data(tvb, plaintext,
+                                           length,
+                                           length);
+        tvb_set_free_cb(next_tvb, g_free);
 
-               offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+        /* Add the decrypted data to the data source list. */
+        add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
 
-       }
-       return offset;
+        offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+
+    }
+    return offset;
 }
 #endif
 
@@ -3517,56 +3567,56 @@ static int
 dissect_krb5_encrypted_PRIV(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PRIV, dissect_krb5_decrypt_PRIV);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PRIV, dissect_krb5_decrypt_PRIV);
 #else
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PRIV, NULL);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_PRIV, NULL);
 #endif
-       return offset;
+    return offset;
 }
 static ber_old_sequence_t ENC_PRIV_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_PRIV_etype },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_kvno },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_encrypted_PRIV },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_PRIV_etype },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_kvno },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_encrypted_PRIV },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_ENC_PRIV(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, ENC_PRIV_sequence, hf_krb_ENC_PRIV, ett_krb_PRIV_enc);
-       return offset;
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, ENC_PRIV_sequence, hf_krb_ENC_PRIV, ett_krb_PRIV_enc);
+    return offset;
 }
 static ber_old_sequence_t PRIV_BODY_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_pvno },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_msg_type },
-       { BER_CLASS_CON, 3, 0,
-               dissect_krb5_ENC_PRIV },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_pvno },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_msg_type },
+    { BER_CLASS_CON, 3, 0,
+      dissect_krb5_ENC_PRIV },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_PRIV(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PRIV_BODY_sequence, hf_krb_PRIV_BODY, ett_krb_PRIV);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, PRIV_BODY_sequence, hf_krb_PRIV_BODY, ett_krb_PRIV);
 
-       return offset;
+    return offset;
 }
 
 static guint32 EncKrbCredPart_etype;
 static int
 dissect_krb5_EncKrbCredPart_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &EncKrbCredPart_etype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(EncKrbCredPart_etype, krb5_encryption_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &EncKrbCredPart_etype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(EncKrbCredPart_etype, krb5_encryption_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 
 
@@ -3574,87 +3624,89 @@ dissect_krb5_EncKrbCredPart_etype(proto_tree *tree, tvbuff_t *tvb, int offset, a
 
 
 static ber_old_sequence_t KrbCredInfo_sequence[] = {
-       { BER_CLASS_CON, 0, 0, dissect_krb5_key },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_prealm },
-       { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_krb5_pname },
-       { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_krb5_TicketFlags },
-       { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_krb5_authtime },
-       { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_krb5_starttime },
-       { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_krb5_endtime },
-       { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_krb5_renew_till },
-       { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_krb5_srealm },
-       { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_krb5_sname },
-       { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL, dissect_krb5_HostAddresses },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0, dissect_krb5_key },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_prealm },
+    { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_krb5_pname },
+    { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_krb5_TicketFlags },
+    { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_krb5_authtime },
+    { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_krb5_starttime },
+    { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_krb5_endtime },
+    { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_krb5_renew_till },
+    { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_krb5_srealm },
+    { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_krb5_sname },
+    { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL, dissect_krb5_HostAddresses },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_KrbCredInfo(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KrbCredInfo_sequence, hf_krb_KrbCredInfo, ett_krb_KrbCredInfo);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KrbCredInfo_sequence, hf_krb_KrbCredInfo, ett_krb_KrbCredInfo);
 
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t KrbCredInfo_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_KrbCredInfo },
+    { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_KrbCredInfo },
 };
 static int
 dissect_krb5_KrbCredInfo_sequence_of(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, KrbCredInfo_sequence_of, hf_krb_KrbCredInfos, ett_krb_KrbCredInfos);
+    offset=dissect_ber_old_sequence_of(FALSE, actx, tree, tvb, offset, KrbCredInfo_sequence_of, hf_krb_KrbCredInfos, ett_krb_KrbCredInfos);
 
-       return offset;
+    return offset;
 }
 static const ber_old_sequence_t EncKrbCredPart_sequence[] = {
-       { BER_CLASS_CON, 0, 0, dissect_krb5_KrbCredInfo_sequence_of },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_nonce },
-       { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_krb5_ctime },
-       { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_krb5_cusec },
-       { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_krb5_s_address },
-       { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_krb5_r_address },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0, dissect_krb5_KrbCredInfo_sequence_of },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_nonce },
+    { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_krb5_ctime },
+    { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_krb5_cusec },
+    { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_krb5_s_address },
+    { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_krb5_r_address },
+    { 0, 0, 0, NULL }
 };
 
 static int
 dissect_krb5_EncKrbCredPart(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncKrbCredPart_sequence, hf_krb_EncKrbCredPart, ett_krb_EncKrbCredPart);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, EncKrbCredPart_sequence, hf_krb_EncKrbCredPart, ett_krb_EncKrbCredPart);
 
-       return offset;
+    return offset;
 }
 
 #ifdef HAVE_KERBEROS
 static int
 dissect_krb5_decrypt_EncKrbCredPart (proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint8 *plaintext=NULL;
-       int length;
+    guint8 *plaintext=NULL;
+    int length;
+    tvbuff_t *next_tvb;
+
+    next_tvb=tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_reported_length_remaining(tvb, offset));
 
-       length=tvb_length_remaining(tvb, offset);
+    length=tvb_length_remaining(tvb, offset);
 
-       /* RFC4120 :
-        * EncKrbCredPart encrypted with usage
-        * == 14
-        */
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 14, length, tvb_get_ptr(tvb, offset, length), EncKrbCredPart_etype, NULL);
-       }
+    /* RFC4120 :
+     * EncKrbCredPart encrypted with usage
+     * == 14
+     */
+    if(!plaintext){
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 14, next_tvb, EncKrbCredPart_etype, NULL);
+    }
 
-       if(plaintext){
-               tvbuff_t *next_tvb;
-               next_tvb = tvb_new_real_data (plaintext,
-                                          length,
-                                          length);
-               tvb_set_free_cb(next_tvb, g_free);
-               tvb_set_child_real_data_tvbuff(tvb, next_tvb);
+    if(plaintext){
+        tvbuff_t *child_tvb;
+        child_tvb = tvb_new_child_real_data(tvb, plaintext,
+                                            length,
+                                            length);
+        tvb_set_free_cb(child_tvb, g_free);
 
-               /* Add the decrypted data to the data source list. */
-               add_new_data_source(actx->pinfo, next_tvb, "EncKrbCredPart");
+        /* Add the decrypted data to the data source list. */
+        add_new_data_source(actx->pinfo, child_tvb, "EncKrbCredPart");
 
-               offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
-       }
-       return offset;
+        offset=dissect_ber_old_choice(actx, tree, child_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+    }
+    return offset;
 }
 #endif
 
@@ -3662,119 +3714,119 @@ static int
 dissect_krb5_encrypted_CRED_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, dissect_krb5_decrypt_EncKrbCredPart);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, dissect_krb5_decrypt_EncKrbCredPart);
 #else
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, NULL);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_EncKrbCredPart, NULL);
 #endif
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t encrypted_CRED_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_EncKrbCredPart_etype },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_kvno },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_encrypted_CRED_data },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_EncKrbCredPart_etype },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_kvno },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_encrypted_CRED_data },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_encrypted_CRED(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_CRED_sequence, hf_krb_CRED_enc, ett_krb_CRED_enc);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_CRED_sequence, hf_krb_CRED_enc, ett_krb_CRED_enc);
 
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t CRED_BODY_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_pvno },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_msg_type },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_sq_tickets },
-       { BER_CLASS_CON, 3, 0,
-               dissect_krb5_encrypted_CRED },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_pvno },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_msg_type },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_sq_tickets },
+    { BER_CLASS_CON, 3, 0,
+      dissect_krb5_encrypted_CRED },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_CRED(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, CRED_BODY_sequence, hf_krb_CRED_BODY, ett_krb_CRED);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, CRED_BODY_sequence, hf_krb_CRED_BODY, ett_krb_CRED);
 
-       return offset;
+    return offset;
 }
 
 
 static int
 dissect_krb5_SAFE_BODY_user_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       tvbuff_t *new_tvb;
-       offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_SAFE_BODY_user_data, &new_tvb);
-       if (new_tvb)
-               call_kerberos_callbacks(actx->pinfo, tree, new_tvb, KRB_CBTAG_SAFE_USER_DATA);
-       return offset;
+    tvbuff_t *new_tvb;
+    offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_SAFE_BODY_user_data, &new_tvb);
+    if (new_tvb)
+        call_kerberos_callbacks(actx->pinfo, tree, new_tvb, KRB_CBTAG_SAFE_USER_DATA);
+    return offset;
 }
 static int
 dissect_krb5_SAFE_BODY_timestamp(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_SAFE_BODY_timestamp);
-       return offset;
+    offset=dissect_ber_GeneralizedTime(FALSE, actx, tree, tvb, offset, hf_krb_SAFE_BODY_timestamp);
+    return offset;
 }
 
 static int
 dissect_krb5_SAFE_BODY_usec(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_SAFE_BODY_usec, NULL);
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_SAFE_BODY_usec, NULL);
+    return offset;
 }
 
 static ber_old_sequence_t SAFE_BODY_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_SAFE_BODY_user_data },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_SAFE_BODY_timestamp },
-       { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
-               dissect_krb5_SAFE_BODY_usec },
-       { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
-               dissect_krb5_seq_number },
-       /*XXX this one is OPTIONAL in packetcable?  but mandatory in kerberos */
-       { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL,
-               dissect_krb5_s_address },
-       { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL,
-               dissect_krb5_HostAddresses },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_SAFE_BODY_user_data },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_SAFE_BODY_timestamp },
+    { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
+      dissect_krb5_SAFE_BODY_usec },
+    { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
+      dissect_krb5_seq_number },
+    /*XXX this one is OPTIONAL in packetcable?  but mandatory in kerberos */
+    { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL,
+      dissect_krb5_s_address },
+    { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL,
+      dissect_krb5_HostAddresses },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_SAFE_BODY(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, SAFE_BODY_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, SAFE_BODY_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 
 
 static ber_old_sequence_t SAFE_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_pvno },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_msg_type },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_SAFE_BODY },
-       { BER_CLASS_CON, 3, 0,
-               dissect_krb5_Checksum },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_pvno },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_msg_type },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_SAFE_BODY },
+    { BER_CLASS_CON, 3, 0,
+      dissect_krb5_Checksum },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_SAFE(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, SAFE_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, SAFE_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 #ifdef HAVE_KERBEROS
@@ -3783,39 +3835,41 @@ static guint32 enc_authorization_data_etype;
 static int
 dissect_krb5_decrypt_enc_authorization_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint8 *plaintext=NULL;
-       int length;
+    guint8 *plaintext=NULL;
+    int length;
+    tvbuff_t *next_tvb;
+
+    next_tvb=tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_reported_length_remaining(tvb, offset));
 
-       length=tvb_length_remaining(tvb, offset);
+    length=tvb_length_remaining(tvb, offset);
 
-       /*
-       RFC 4120 : 5.4.1
-       The key usage value used when encrypting is 5
-       if a sub-session key is used, or 4 if the session key is used.
-       */
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 4, length, tvb_get_ptr(tvb, offset, length), enc_authorization_data_etype, NULL);
-       }
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 5, length, tvb_get_ptr(tvb, offset, length), enc_authorization_data_etype, NULL);
-       }
+    /*
+      RFC 4120 : 5.4.1
+      The key usage value used when encrypting is 5
+      if a sub-session key is used, or 4 if the session key is used.
+    */
+    if(!plaintext){
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 4, next_tvb, enc_authorization_data_etype, NULL);
+    }
+    if(!plaintext){
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 5, next_tvb, enc_authorization_data_etype, NULL);
+    }
 
-       if(plaintext){
-               tvbuff_t *next_tvb;
-               next_tvb = tvb_new_real_data (plaintext,
-                                          length,
-                                          length);
-               tvb_set_free_cb(next_tvb, g_free);
-               tvb_set_child_real_data_tvbuff(tvb, next_tvb);
+    if(plaintext){
+        tvbuff_t *child_tvb;
+        child_tvb = tvb_new_child_real_data(tvb, plaintext,
+                                            length,
+                                            length);
+        tvb_set_free_cb(child_tvb, g_free);
 
-               /* Add the decrypted data to the data source list. */
-               add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
+        /* Add the decrypted data to the data source list. */
+        add_new_data_source(actx->pinfo, child_tvb, "Decrypted Krb5");
 
 
-               proto_tree_add_text(tree, next_tvb, 0, length, "AtuhorizationData for TGS_REQ not implemented yet");
+        proto_tree_add_text(tree, child_tvb, 0, length, "AtuhorizationData for TGS_REQ not implemented yet");
 
-       }
-       return offset;
+    }
+    return offset;
 }
 #endif
 
@@ -3823,42 +3877,42 @@ static int
 dissect_krb5_encrypted_enc_authorization_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_enc_authorization_data, dissect_krb5_decrypt_enc_authorization_data);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_enc_authorization_data, dissect_krb5_decrypt_enc_authorization_data);
 #else
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_enc_authorization_data, NULL);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_enc_authorization_data, NULL);
 #endif
-       return offset;
+    return offset;
 }
 
 static int
 dissect_krb5_enc_authorization_data_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifndef HAVE_KERBEROS
-       guint32 enc_authorization_data_etype;
+    guint32 enc_authorization_data_etype;
 #endif
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &enc_authorization_data_etype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(enc_authorization_data_etype, krb5_encryption_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &enc_authorization_data_etype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(enc_authorization_data_etype, krb5_encryption_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 static ber_old_sequence_t enc_authorization_data_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_enc_authorization_data_etype },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_kvno },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_encrypted_enc_authorization_data },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_enc_authorization_data_etype },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_kvno },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_encrypted_enc_authorization_data },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_enc_authorization_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, enc_authorization_data_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, enc_authorization_data_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 /*
@@ -3883,63 +3937,63 @@ dissect_krb5_enc_authorization_data(proto_tree *tree, tvbuff_t *tvb, int offset,
  *
  */
 static ber_old_sequence_t KDC_REQ_BODY_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_KDCOptions },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_cname },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_realm},
-       { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
-               dissect_krb5_sname },
-       { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL,
-               dissect_krb5_from },
-               /* this field is not optional in the kerberos spec,
-                * however, in the packetcable spec it is optional.
-                * make it optional here since normal kerberos will
-                * still decode the pdu correctly.
-                */
-       { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL,
-               dissect_krb5_till },
-       { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL,
-               dissect_krb5_rtime },
-       { BER_CLASS_CON, 7, 0,
-               dissect_krb5_nonce },
-       { BER_CLASS_CON, 8, 0,
-               dissect_krb5_etype_sequence_of },
-       { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL,
-               dissect_krb5_HostAddresses },
-       { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL,
-               dissect_krb5_enc_authorization_data },
-       { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL,
-               dissect_krb5_sq_tickets },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_KDCOptions },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_cname },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_realm},
+    { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
+      dissect_krb5_sname },
+    { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL,
+      dissect_krb5_from },
+    /* this field is not optional in the kerberos spec,
+     * however, in the packetcable spec it is optional.
+     * make it optional here since normal kerberos will
+     * still decode the pdu correctly.
+     */
+    { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL,
+      dissect_krb5_till },
+    { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL,
+      dissect_krb5_rtime },
+    { BER_CLASS_CON, 7, 0,
+      dissect_krb5_nonce },
+    { BER_CLASS_CON, 8, 0,
+      dissect_krb5_etype_sequence_of },
+    { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL,
+      dissect_krb5_HostAddresses },
+    { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL,
+      dissect_krb5_enc_authorization_data },
+    { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL,
+      dissect_krb5_sq_tickets },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_KDC_REQ_BODY(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       conversation_t *conversation;
-
-       /*
-        * UDP replies to KDC_REQs are sent from the server back to the client's
-        * source port, similar to the way TFTP works.  Set up a conversation
-        * accordingly.
-        *
-        * Ref: Section 7.2.1 of
-        * http://www.ietf.org/internet-drafts/draft-ietf-krb-wg-kerberos-clarifications-07.txt
-        */
-       if (actx->pinfo->destport == UDP_PORT_KERBEROS && actx->pinfo->ptype == PT_UDP) {
-               conversation = find_conversation(actx->pinfo->fd->num, &actx->pinfo->src, &actx->pinfo->dst, PT_UDP,
-                       actx->pinfo->srcport, 0, NO_PORT_B);
-               if (conversation == NULL) {
-                       conversation = conversation_new(actx->pinfo->fd->num, &actx->pinfo->src, &actx->pinfo->dst, PT_UDP,
-                               actx->pinfo->srcport, 0, NO_PORT2);
-                       conversation_set_dissector(conversation, kerberos_handle_udp);
-               }
-       }
+    conversation_t *conversation;
+
+    /*
+     * UDP replies to KDC_REQs are sent from the server back to the client's
+     * source port, similar to the way TFTP works.  Set up a conversation
+     * accordingly.
+     *
+     * Ref: Section 7.2.1 of
+     * http://www.ietf.org/internet-drafts/draft-ietf-krb-wg-kerberos-clarifications-07.txt
+     */
+    if (actx->pinfo->destport == UDP_PORT_KERBEROS && actx->pinfo->ptype == PT_UDP) {
+        conversation = find_conversation(actx->pinfo->fd->num, &actx->pinfo->src, &actx->pinfo->dst, PT_UDP,
+                                         actx->pinfo->srcport, 0, NO_PORT_B);
+        if (conversation == NULL) {
+            conversation = conversation_new(actx->pinfo->fd->num, &actx->pinfo->src, &actx->pinfo->dst, PT_UDP,
+                                            actx->pinfo->srcport, 0, NO_PORT2);
+            conversation_set_dissector(conversation, kerberos_handle_udp);
+        }
+    }
 
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KDC_REQ_BODY_sequence, hf_krb_KDC_REQ_BODY, ett_krb_request);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KDC_REQ_BODY_sequence, hf_krb_KDC_REQ_BODY, ett_krb_request);
 
-       return offset;
+    return offset;
 }
 
 
@@ -3953,22 +4007,22 @@ dissect_krb5_KDC_REQ_BODY(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_
  * }
  */
 static ber_old_sequence_t KDC_REQ_sequence[] = {
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_pvno },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_msg_type },
-       { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
-               dissect_krb5_padata },
-       { BER_CLASS_CON, 4, 0,
-               dissect_krb5_KDC_REQ_BODY },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_pvno },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_msg_type },
+    { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
+      dissect_krb5_padata },
+    { BER_CLASS_CON, 4, 0,
+      dissect_krb5_KDC_REQ_BODY },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_KDC_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KDC_REQ_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KDC_REQ_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 
@@ -3976,40 +4030,42 @@ dissect_krb5_KDC_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
 static int
 dissect_krb5_decrypt_authenticator_data (proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint8 *plaintext=NULL;
-       int length;
+    guint8 *plaintext=NULL;
+    int length;
+    tvbuff_t *next_tvb;
+
+    next_tvb=tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_reported_length_remaining(tvb, offset));
 
-       length=tvb_length_remaining(tvb, offset);
+    length=tvb_length_remaining(tvb, offset);
 
-       /* draft-ietf-krb-wg-kerberos-clarifications-05.txt :
-        * 7.5.1
-        * Authenticators are encrypted with usage
-        * == 7 or
-        * == 11
-        */
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 7, length, tvb_get_ptr(tvb, offset, length), authenticator_etype, NULL);
-       }
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 11, length, tvb_get_ptr(tvb, offset, length), authenticator_etype, NULL);
-       }
+    /* draft-ietf-krb-wg-kerberos-clarifications-05.txt :
+     * 7.5.1
+     * Authenticators are encrypted with usage
+     * == 7 or
+     * == 11
+     */
+    if(!plaintext){
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 7, next_tvb, authenticator_etype, NULL);
+    }
+    if(!plaintext){
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 11, next_tvb, authenticator_etype, NULL);
+    }
 
-       if(plaintext){
-               tvbuff_t *next_tvb;
-               next_tvb = tvb_new_real_data (plaintext,
-                                          length,
-                                          length);
-               tvb_set_free_cb(next_tvb, g_free);
-               tvb_set_child_real_data_tvbuff(tvb, next_tvb);
+    if(plaintext){
+        tvbuff_t *child_tvb;
+        child_tvb = tvb_new_child_real_data(tvb, plaintext,
+                                            length,
+                                            length);
+        tvb_set_free_cb(child_tvb, g_free);
 
-               /* Add the decrypted data to the data source list. */
-               add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
+        /* Add the decrypted data to the data source list. */
+        add_new_data_source(actx->pinfo, child_tvb, "Decrypted Krb5");
 
 
-               offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+        offset=dissect_ber_old_choice(actx, tree, child_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
 
-       }
-       return offset;
+    }
+    return offset;
 }
 #endif
 
@@ -4025,27 +4081,27 @@ static int
 dissect_krb5_encrypted_authenticator_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_authenticator_data, dissect_krb5_decrypt_authenticator_data);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_authenticator_data, dissect_krb5_decrypt_authenticator_data);
 #else
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_authenticator_data, NULL);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_authenticator_data, NULL);
 #endif
-       return offset;
+    return offset;
 }
 static ber_old_sequence_t encrypted_authenticator_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_authenticator_etype },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_kvno },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_encrypted_authenticator_data },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_authenticator_etype },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_kvno },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_encrypted_authenticator_data },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_encrypted_authenticator(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_authenticator_sequence, hf_krb_authenticator_enc, ett_krb_authenticator_enc);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_authenticator_sequence, hf_krb_authenticator_enc, ett_krb_authenticator_enc);
 
-       return offset;
+    return offset;
 }
 
 
@@ -4054,8 +4110,8 @@ dissect_krb5_encrypted_authenticator(proto_tree *tree, tvbuff_t *tvb, int offset
 static int
 dissect_krb5_tkt_vno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_tkt_vno, NULL);
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_tkt_vno, NULL);
+    return offset;
 }
 
 
@@ -4063,31 +4119,33 @@ dissect_krb5_tkt_vno(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
 static int
 dissect_krb5_decrypt_Ticket_data (proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint8 *plaintext;
-       int length;
+    guint8 *plaintext;
+    int length;
+    tvbuff_t *next_tvb;
+
+    next_tvb=tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_reported_length_remaining(tvb, offset));
 
-       length=tvb_length_remaining(tvb, offset);
+    length=tvb_length_remaining(tvb, offset);
 
-       /* draft-ietf-krb-wg-kerberos-clarifications-05.txt :
-        * 7.5.1
-        * All Ticket encrypted parts use usage == 2
-        */
-       if( (plaintext=decrypt_krb5_data(tree, actx->pinfo, 2, length, tvb_get_ptr(tvb, offset, length), Ticket_etype, NULL)) ){
-               tvbuff_t *next_tvb;
-               next_tvb = tvb_new_real_data (plaintext,
-                                          length,
-                                          length);
-               tvb_set_free_cb(next_tvb, g_free);
-               tvb_set_child_real_data_tvbuff(tvb, next_tvb);
+    /* draft-ietf-krb-wg-kerberos-clarifications-05.txt :
+     * 7.5.1
+     * All Ticket encrypted parts use usage == 2
+     */
+    if( (plaintext=decrypt_krb5_data(tree, actx->pinfo, 2, next_tvb, Ticket_etype, NULL)) ){
+        tvbuff_t *child_tvb;
+        child_tvb = tvb_new_child_real_data(tvb, plaintext,
+                                            length,
+                                            length);
+        tvb_set_free_cb(child_tvb, g_free);
 
-               /* Add the decrypted data to the data source list. */
-               add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
+        /* Add the decrypted data to the data source list. */
+        add_new_data_source(actx->pinfo, child_tvb, "Decrypted Krb5");
 
 
-               offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+        offset=dissect_ber_old_choice(actx, tree, child_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
 
-       }
-       return offset;
+    }
+    return offset;
 }
 #endif
 
@@ -4095,61 +4153,61 @@ static int
 dissect_krb5_encrypted_Ticket_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_Ticket_data, dissect_krb5_decrypt_Ticket_data);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_Ticket_data, dissect_krb5_decrypt_Ticket_data);
 #else
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_Ticket_data, NULL);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_Ticket_data, NULL);
 #endif
-       return offset;
+    return offset;
 }
 static ber_old_sequence_t encrypted_Ticket_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_Ticket_etype },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_kvno },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_encrypted_Ticket_data },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_Ticket_etype },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_kvno },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_encrypted_Ticket_data },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_Ticket_encrypted(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_Ticket_sequence, hf_krb_ticket_enc, ett_krb_ticket_enc);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_Ticket_sequence, hf_krb_ticket_enc, ett_krb_ticket_enc);
 
-       return offset;
+    return offset;
 }
 
 static ber_old_sequence_t Application_1_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_tkt_vno },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_realm },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_sname },
-       { BER_CLASS_CON, 3, 0,
-               dissect_krb5_Ticket_encrypted },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_tkt_vno },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_realm },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_sname },
+    { BER_CLASS_CON, 3, 0,
+      dissect_krb5_Ticket_encrypted },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_Application_1(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Application_1_sequence, hf_krb_ticket, ett_krb_ticket);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Application_1_sequence, hf_krb_ticket, ett_krb_ticket);
 
-       return offset;
+    return offset;
 }
 
 
 
 static const ber_old_choice_t Ticket_choice[] = {
-       { 1, BER_CLASS_APP, 1,  0,
-               dissect_krb5_Application_1 },
-       { 0, 0, 0, 0, NULL }
+    { 1, BER_CLASS_APP, 1,  0,
+      dissect_krb5_Application_1 },
+    { 0, 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_Ticket(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_choice(actx, tree, tvb, offset, Ticket_choice, -1, -1, NULL);
+    offset=dissect_ber_old_choice(actx, tree, tvb, offset, Ticket_choice, -1, -1, NULL);
 
-       return offset;
+    return offset;
 }
 
 
@@ -4165,24 +4223,24 @@ dissect_krb5_Ticket(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *act
  *  }
  */
 static ber_old_sequence_t AP_REQ_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_pvno },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_msg_type },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_APOptions },
-       { BER_CLASS_CON, 3, 0,
-               dissect_krb5_Ticket },
-       { BER_CLASS_CON, 4, 0,
-               dissect_krb5_encrypted_authenticator },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_pvno },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_msg_type },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_APOptions },
+    { BER_CLASS_CON, 3, 0,
+      dissect_krb5_Ticket },
+    { BER_CLASS_CON, 4, 0,
+      dissect_krb5_encrypted_authenticator },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_AP_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AP_REQ_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AP_REQ_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 
@@ -4192,37 +4250,39 @@ dissect_krb5_AP_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *act
 static int
 dissect_krb5_decrypt_AP_REP_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint8 *plaintext=NULL;
-       int length;
+    guint8 *plaintext=NULL;
+    int length;
 
-       length=tvb_length_remaining(tvb, offset);
+    length=tvb_length_remaining(tvb, offset);
 
-       /* draft-ietf-krb-wg-kerberos-clarifications-05.txt :
-        * 7.5.1
-        * Authenticators are encrypted with usage
-        * == 7 or
-        * == 11
-        */
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 12, length, tvb_get_ptr(tvb, offset, length), AP_REP_etype, NULL);
-       }
+    /* draft-ietf-krb-wg-kerberos-clarifications-05.txt :
+     * 7.5.1
+     * Authenticators are encrypted with usage
+     * == 7 or
+     * == 11
+     */
+    if(!plaintext){
+        tvbuff_t *next_tvb;
 
-       if(plaintext){
-               tvbuff_t *next_tvb;
-               next_tvb = tvb_new_real_data (plaintext,
-                                          length,
-                                          length);
-               tvb_set_free_cb(next_tvb, g_free);
-               tvb_set_child_real_data_tvbuff(tvb, next_tvb);
+        next_tvb=tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_reported_length_remaining(tvb, offset));
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 12, next_tvb, AP_REP_etype, NULL);
+    }
+
+    if(plaintext){
+        tvbuff_t *next_tvb;
+        next_tvb = tvb_new_child_real_data(tvb, plaintext,
+                                           length,
+                                           length);
+        tvb_set_free_cb(next_tvb, g_free);
 
-               /* Add the decrypted data to the data source list. */
-               add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
+        /* Add the decrypted data to the data source list. */
+        add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
 
 
-               offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+        offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
 
-       }
-       return offset;
+    }
+    return offset;
 }
 #endif
 
@@ -4231,27 +4291,27 @@ static int
 dissect_krb5_encrypted_AP_REP_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, dissect_krb5_decrypt_AP_REP_data);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, dissect_krb5_decrypt_AP_REP_data);
 #else
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, NULL);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_AP_REP_data, NULL);
 #endif
-       return offset;
+    return offset;
 }
 static ber_old_sequence_t encrypted_AP_REP_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_AP_REP_etype },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_kvno },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_encrypted_AP_REP_data },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_AP_REP_etype },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_kvno },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_encrypted_AP_REP_data },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_encrypted_AP_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_AP_REP_sequence, hf_krb_AP_REP_enc, ett_krb_AP_REP_enc);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_AP_REP_sequence, hf_krb_AP_REP_enc, ett_krb_AP_REP_enc);
 
-       return offset;
+    return offset;
 }
 
 /*
@@ -4262,20 +4322,20 @@ dissect_krb5_encrypted_AP_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
  *  }
  */
 static ber_old_sequence_t AP_REP_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_pvno },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_msg_type },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_encrypted_AP_REP },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_pvno },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_msg_type },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_encrypted_AP_REP },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_AP_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AP_REP_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, AP_REP_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 
@@ -4286,57 +4346,59 @@ static guint32 KDC_REP_etype;
 static int
 dissect_krb5_KDC_REP_etype(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &KDC_REP_etype);
-       if(tree){
-               proto_item_append_text(tree, " %s",
-                       val_to_str(KDC_REP_etype, krb5_encryption_types,
-                       "%#x"));
-       }
-       return offset;
+    offset=dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_krb_etype, &KDC_REP_etype);
+    if(tree){
+        proto_item_append_text(tree, " %s",
+                               val_to_str(KDC_REP_etype, krb5_encryption_types,
+                                          "%#x"));
+    }
+    return offset;
 }
 
 #ifdef HAVE_KERBEROS
 static int
 dissect_krb5_decrypt_KDC_REP_data (proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       guint8 *plaintext=NULL;
-       int length;
+    guint8 *plaintext=NULL;
+    int length;
+    tvbuff_t *next_tvb;
 
-       length=tvb_length_remaining(tvb, offset);
+    next_tvb=tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_reported_length_remaining(tvb, offset));
 
-       /* draft-ietf-krb-wg-kerberos-clarifications-05.txt :
-        * 7.5.1
-        * ASREP/TGSREP encryptedparts are encrypted with usage
-        * == 3 or
-        * == 8 or
+    length=tvb_length_remaining(tvb, offset);
+
+    /* draft-ietf-krb-wg-kerberos-clarifications-05.txt :
+     * 7.5.1
+     * ASREP/TGSREP encryptedparts are encrypted with usage
+     * == 3 or
+     * == 8 or
      * == 9
-        */
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 3, length, tvb_get_ptr(tvb, offset, length), KDC_REP_etype, NULL);
-       }
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 8, length, tvb_get_ptr(tvb, offset, length), KDC_REP_etype, NULL);
-       }
-       if(!plaintext){
-               plaintext=decrypt_krb5_data(tree, actx->pinfo, 9, length, tvb_get_ptr(tvb, offset, length), KDC_REP_etype, NULL);
-       }
-
-       if(plaintext){
-               tvbuff_t *next_tvb;
-               next_tvb = tvb_new_real_data (plaintext,
-                                          length,
-                                          length);
-               tvb_set_free_cb(next_tvb, g_free);
-               tvb_set_child_real_data_tvbuff(tvb, next_tvb);
-
-               /* Add the decrypted data to the data source list. */
-               add_new_data_source(actx->pinfo, next_tvb, "Decrypted Krb5");
-
-
-               offset=dissect_ber_old_choice(actx, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
-
-       }
-       return offset;
+     */
+    if(!plaintext){
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 3, next_tvb, KDC_REP_etype, NULL);
+    }
+    if(!plaintext){
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 8, next_tvb, KDC_REP_etype, NULL);
+    }
+    if(!plaintext){
+        plaintext=decrypt_krb5_data(tree, actx->pinfo, 9, next_tvb, KDC_REP_etype, NULL);
+    }
+
+    if(plaintext){
+        tvbuff_t *child_tvb;
+        child_tvb = tvb_new_child_real_data(tvb, plaintext,
+                                            length,
+                                            length);
+        tvb_set_free_cb(child_tvb, g_free);
+
+        /* Add the decrypted data to the data source list. */
+        add_new_data_source(actx->pinfo, child_tvb, "Decrypted Krb5");
+
+
+        offset=dissect_ber_old_choice(actx, tree, child_tvb, 0, kerberos_applications_choice, -1, -1, NULL);
+
+    }
+    return offset;
 }
 #endif
 
@@ -4345,27 +4407,27 @@ static int
 dissect_krb5_encrypted_KDC_REP_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
 #ifdef HAVE_KERBEROS
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, dissect_krb5_decrypt_KDC_REP_data);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, dissect_krb5_decrypt_KDC_REP_data);
 #else
-       offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, NULL);
+    offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_encrypted_KDC_REP_data, NULL);
 #endif
-       return offset;
+    return offset;
 }
 static ber_old_sequence_t encrypted_KDC_REP_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_KDC_REP_etype },
-       { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
-               dissect_krb5_kvno },
-       { BER_CLASS_CON, 2, 0,
-               dissect_krb5_encrypted_KDC_REP_data },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_KDC_REP_etype },
+    { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL,
+      dissect_krb5_kvno },
+    { BER_CLASS_CON, 2, 0,
+      dissect_krb5_encrypted_KDC_REP_data },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_encrypted_KDC_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_KDC_REP_sequence, hf_krb_KDC_REP_enc, ett_krb_KDC_REP_enc);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, encrypted_KDC_REP_sequence, hf_krb_KDC_REP_enc, ett_krb_KDC_REP_enc);
 
-       return offset;
+    return offset;
 }
 
 /*
@@ -4380,28 +4442,28 @@ dissect_krb5_encrypted_KDC_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1
  *  }
  */
 static ber_old_sequence_t KDC_REP_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_pvno },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_msg_type },
-       { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
-               dissect_krb5_padata },
-       { BER_CLASS_CON, 3, 0,
-               dissect_krb5_crealm },
-       { BER_CLASS_CON, 4, 0,
-               dissect_krb5_cname },
-       { BER_CLASS_CON, 5, 0,
-               dissect_krb5_Ticket },
-       { BER_CLASS_CON, 6, 0,
-               dissect_krb5_encrypted_KDC_REP },
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_pvno },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_msg_type },
+    { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
+      dissect_krb5_padata },
+    { BER_CLASS_CON, 3, 0,
+      dissect_krb5_crealm },
+    { BER_CLASS_CON, 4, 0,
+      dissect_krb5_cname },
+    { BER_CLASS_CON, 5, 0,
+      dissect_krb5_Ticket },
+    { BER_CLASS_CON, 6, 0,
+      dissect_krb5_encrypted_KDC_REP },
+    { 0, 0, 0, NULL }
 };
 static int
 dissect_krb5_KDC_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KDC_REP_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, KDC_REP_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 
@@ -4410,33 +4472,33 @@ dissect_krb5_KDC_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *ac
 static int
 dissect_krb5_e_text(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_e_text, NULL, 0);
-       return offset;
+    offset=dissect_ber_GeneralString(actx, tree, tvb, offset, hf_krb_e_text, NULL, 0);
+    return offset;
 }
 
 static int
 dissect_krb5_e_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       switch(krb5_errorcode){
-       case KRB5_ET_KRB5KDC_ERR_BADOPTION:
-       case KRB5_ET_KRB5KDC_ERR_CLIENT_REVOKED:
-       case KRB5_ET_KRB5KDC_ERR_KEY_EXP:
-       case KRB5_ET_KRB5KDC_ERR_POLICY:
-               /* ms windows kdc sends e-data of this type containing a "salt"
-                * that contains the nt_status code for these error codes.
-                */
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_e_data, dissect_krb5_PA_DATA);
-               break;
-       case KRB5_ET_KRB5KDC_ERR_PREAUTH_REQUIRED:
-       case KRB5_ET_KRB5KDC_ERR_PREAUTH_FAILED:
-       case KRB5_ET_KRB5KDC_ERR_ETYPE_NOSUPP:
-               offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_e_data, dissect_krb5_padata);
-
-               break;
-       default:
-               offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_e_data, NULL);
-       }
-       return offset;
+    switch(krb5_errorcode){
+    case KRB5_ET_KRB5KDC_ERR_BADOPTION:
+    case KRB5_ET_KRB5KDC_ERR_CLIENT_REVOKED:
+    case KRB5_ET_KRB5KDC_ERR_KEY_EXP:
+    case KRB5_ET_KRB5KDC_ERR_POLICY:
+        /* ms windows kdc sends e-data of this type containing a "salt"
+         * that contains the nt_status code for these error codes.
+         */
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_e_data, dissect_krb5_PA_DATA);
+        break;
+    case KRB5_ET_KRB5KDC_ERR_PREAUTH_REQUIRED:
+    case KRB5_ET_KRB5KDC_ERR_PREAUTH_FAILED:
+    case KRB5_ET_KRB5KDC_ERR_ETYPE_NOSUPP:
+        offset=dissect_ber_old_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_krb_e_data, dissect_krb5_padata);
+
+        break;
+    default:
+        offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_krb_e_data, NULL);
+    }
+    return offset;
 }
 
 
@@ -4446,9 +4508,9 @@ dissect_krb5_e_data(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *act
 static int
 dissect_krb5_e_checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Checksum_sequence, hf_krb_e_checksum, ett_krb_e_checksum);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, Checksum_sequence, hf_krb_e_checksum, ett_krb_e_checksum);
 
-       return offset;
+    return offset;
 }
 
 
@@ -4478,59 +4540,57 @@ dissect_krb5_e_checksum(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t
  *            the method:
  */
 static ber_old_sequence_t ERROR_sequence[] = {
-       { BER_CLASS_CON, 0, 0,
-               dissect_krb5_pvno },
-       { BER_CLASS_CON, 1, 0,
-               dissect_krb5_msg_type },
-       { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
-               dissect_krb5_ctime },
-       { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
-               dissect_krb5_cusec },
-       { BER_CLASS_CON, 4, 0,
-               dissect_krb5_stime },
-       { BER_CLASS_CON, 5, 0,
-               dissect_krb5_susec },
-       { BER_CLASS_CON, 6, 0,
-               dissect_krb5_error_code },
-       { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL,
-               dissect_krb5_crealm },
-       { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL,
-               dissect_krb5_cname },
-       { BER_CLASS_CON, 9, 0,
-               dissect_krb5_realm },
-       { BER_CLASS_CON, 10, 0,
-               dissect_krb5_sname },
-       { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL,
-               dissect_krb5_e_text },
-       { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL,
-               dissect_krb5_e_data },
-       { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL,
-               dissect_krb5_e_checksum }, /* used by PacketCable */
-       { 0, 0, 0, NULL }
+    { BER_CLASS_CON, 0, 0,
+      dissect_krb5_pvno },
+    { BER_CLASS_CON, 1, 0,
+      dissect_krb5_msg_type },
+    { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL,
+      dissect_krb5_ctime },
+    { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL,
+      dissect_krb5_cusec },
+    { BER_CLASS_CON, 4, 0,
+      dissect_krb5_stime },
+    { BER_CLASS_CON, 5, 0,
+      dissect_krb5_susec },
+    { BER_CLASS_CON, 6, 0,
+      dissect_krb5_error_code },
+    { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL,
+      dissect_krb5_crealm },
+    { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL,
+      dissect_krb5_cname },
+    { BER_CLASS_CON, 9, 0,
+      dissect_krb5_realm },
+    { BER_CLASS_CON, 10, 0,
+      dissect_krb5_sname },
+    { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL,
+      dissect_krb5_e_text },
+    { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL,
+      dissect_krb5_e_data },
+    { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL,
+      dissect_krb5_e_checksum }, /* used by PacketCable */
+    { 0, 0, 0, NULL }
 };
 int
 dissect_krb5_ERROR(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_)
 {
-       offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, ERROR_sequence, -1, -1);
+    offset=dissect_ber_old_sequence(FALSE, actx, tree, tvb, offset, ERROR_sequence, -1, -1);
 
-       return offset;
+    return offset;
 }
 
 
 
-static struct { const char *set; const char *unset; } bitval = { "Set", "Not set" };
-
 static gint dissect_kerberos_udp(tvbuff_t *tvb, packet_info *pinfo,
-                                proto_tree *tree);
+                                 proto_tree *tree);
 static void dissect_kerberos_tcp(tvbuff_t *tvb, packet_info *pinfo,
-                                proto_tree *tree);
+                                 proto_tree *tree);
 static gint dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo,
-                                       proto_tree *tree, gboolean do_col_info,
-                                       gboolean do_col_protocol,
-                                       gboolean have_rm,
-                                       kerberos_callbacks *cb);
+                                    proto_tree *tree, gboolean do_col_info,
+                                    gboolean do_col_protocol,
+                                    gboolean have_rm,
+                                    kerberos_callbacks *cb);
 static void dissect_kerberos_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo,
-                               proto_tree *tree);
+                                     proto_tree *tree);
 
 
 gint
@@ -4542,7 +4602,7 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int d
 guint32
 kerberos_output_keytype(void)
 {
-  return keytype;
+    return keytype;
 }
 
 static gint
@@ -4556,14 +4616,14 @@ dissect_kerberos_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        so if first byte is <=16  just blindly assume it is krb4 then
     */
     if(tvb_length(tvb) >= 1 && tvb_get_guint8(tvb, 0)<=0x10){
-      if(krb4_handle){
-       gboolean res;
+        if(krb4_handle){
+            gboolean res;
 
-       res=call_dissector_only(krb4_handle, tvb, pinfo, tree);
-       return res;
-      }else{
-        return 0;
-      }
+            res=call_dissector_only(krb4_handle, tvb, pinfo, tree);
+            return res;
+        }else{
+            return 0;
+        }
     }
 
 
@@ -4592,26 +4652,22 @@ dissect_kerberos_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     pinfo->fragmented = TRUE;
     if (dissect_kerberos_common(tvb, pinfo, tree, TRUE, TRUE, TRUE, NULL) < 0) {
-       /*
-        * The dissector failed to recognize this as a valid
-        * Kerberos message.  Mark it as a continuation packet.
-        */
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Continuation");
-       }
+        /*
+         * The dissector failed to recognize this as a valid
+         * Kerberos message.  Mark it as a continuation packet.
+         */
+        col_set_str(pinfo->cinfo, COL_INFO, "Continuation");
     }
 }
 
 static void
 dissect_kerberos_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
-        col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
+    col_clear(pinfo->cinfo, COL_INFO);
 
     tcp_dissect_pdus(tvb, pinfo, tree, krb_desegment, 4, get_krb_pdu_len,
-       dissect_kerberos_tcp_pdu);
+                     dissect_kerberos_tcp_pdu);
 }
 
 /*
@@ -4625,11 +4681,11 @@ show_krb_recordmark(proto_tree *tree, tvbuff_t *tvb, gint start, guint32 krb_rm)
     proto_tree *rm_tree;
 
     if (tree == NULL)
-       return;
+        return;
 
     rec_len = kerberos_rm_to_reclen(krb_rm);
     rm_item = proto_tree_add_text(tree, tvb, start, 4,
-       "Record Mark: %u %s", rec_len, plurality(rec_len, "byte", "bytes"));
+                                  "Record Mark: %u %s", rec_len, plurality(rec_len, "byte", "bytes"));
     rm_tree = proto_item_add_subtree(rm_item, ett_krb_recordmark);
     proto_tree_add_boolean(rm_tree, hf_krb_rm_reserved, tvb, start, 4, krb_rm);
     proto_tree_add_uint(rm_tree, hf_krb_rm_reclen, tvb, start, 4, krb_rm);
@@ -4638,14 +4694,14 @@ show_krb_recordmark(proto_tree *tree, tvbuff_t *tvb, gint start, guint32 krb_rm)
 
 static gint
 dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-    gboolean dci, gboolean do_col_protocol, gboolean have_rm,
-    kerberos_callbacks *cb)
+                        gboolean dci, gboolean do_col_protocol, gboolean have_rm,
+                        kerberos_callbacks *cb)
 {
     volatile int offset = 0;
     proto_tree *volatile kerberos_tree = NULL;
     proto_item *volatile item = NULL;
     void *saved_private_data;
-       asn1_ctx_t asn1_ctx;
+    asn1_ctx_t asn1_ctx;
 
     /* TCP record mark and length */
     guint32 krb_rm = 0;
@@ -4653,28 +4709,27 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     saved_private_data=pinfo->private_data;
     pinfo->private_data=cb;
-    do_col_info=dci;
+    gbl_do_col_info=dci;
 
     if (have_rm) {
-       krb_rm = tvb_get_ntohl(tvb, offset);
-       krb_reclen = kerberos_rm_to_reclen(krb_rm);
-       /*
-        * What is a reasonable size limit?
-        */
-       if (krb_reclen > 10 * 1024 * 1024) {
-           pinfo->private_data=saved_private_data;
-           return (-1);
-       }
-       if (do_col_protocol) {
-            if (check_col(pinfo->cinfo, COL_PROTOCOL))
-                col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
-       }
+        krb_rm = tvb_get_ntohl(tvb, offset);
+        krb_reclen = kerberos_rm_to_reclen(krb_rm);
+        /*
+         * What is a reasonable size limit?
+         */
+        if (krb_reclen > 10 * 1024 * 1024) {
+            pinfo->private_data=saved_private_data;
+            return (-1);
+        }
+        if (do_col_protocol) {
+            col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
+        }
         if (tree) {
-            item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, FALSE);
+            item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, ENC_NA);
             kerberos_tree = proto_item_add_subtree(item, ett_krb_kerberos);
         }
-       show_krb_recordmark(kerberos_tree, tvb, offset, krb_rm);
-       offset += 4;
+        show_krb_recordmark(kerberos_tree, tvb, offset, krb_rm);
+        offset += 4;
     } else {
         /* Do some sanity checking here,
          * All krb5 packets start with a TAG class that is BER_CLASS_APP
@@ -4686,54 +4741,52 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         gboolean tmp_pc;
         gint32 tmp_tag;
 
-       get_ber_identifier(tvb, offset, &tmp_class, &tmp_pc, &tmp_tag);
+        get_ber_identifier(tvb, offset, &tmp_class, &tmp_pc, &tmp_tag);
         if(tmp_class!=BER_CLASS_APP){
-           pinfo->private_data=saved_private_data;
+            pinfo->private_data=saved_private_data;
             return 0;
         }
         switch(tmp_tag){
-            case KRB5_MSG_TICKET:
-            case KRB5_MSG_AUTHENTICATOR:
-            case KRB5_MSG_ENC_TICKET_PART:
-            case KRB5_MSG_AS_REQ:
-            case KRB5_MSG_AS_REP:
-            case KRB5_MSG_TGS_REQ:
-            case KRB5_MSG_TGS_REP:
-            case KRB5_MSG_AP_REQ:
-            case KRB5_MSG_AP_REP:
-            case KRB5_MSG_ENC_AS_REP_PART:
-            case KRB5_MSG_ENC_TGS_REP_PART:
-            case KRB5_MSG_ENC_AP_REP_PART:
-            case KRB5_MSG_ENC_KRB_PRIV_PART:
-            case KRB5_MSG_ENC_KRB_CRED_PART:
-            case KRB5_MSG_SAFE:
-            case KRB5_MSG_PRIV:
-            case KRB5_MSG_ERROR:
-                break;
-            default:
-                pinfo->private_data=saved_private_data;
-                return 0;
+        case KRB5_MSG_TICKET:
+        case KRB5_MSG_AUTHENTICATOR:
+        case KRB5_MSG_ENC_TICKET_PART:
+        case KRB5_MSG_AS_REQ:
+        case KRB5_MSG_AS_REP:
+        case KRB5_MSG_TGS_REQ:
+        case KRB5_MSG_TGS_REP:
+        case KRB5_MSG_AP_REQ:
+        case KRB5_MSG_AP_REP:
+        case KRB5_MSG_ENC_AS_REP_PART:
+        case KRB5_MSG_ENC_TGS_REP_PART:
+        case KRB5_MSG_ENC_AP_REP_PART:
+        case KRB5_MSG_ENC_KRB_PRIV_PART:
+        case KRB5_MSG_ENC_KRB_CRED_PART:
+        case KRB5_MSG_SAFE:
+        case KRB5_MSG_PRIV:
+        case KRB5_MSG_ERROR:
+            break;
+        default:
+            pinfo->private_data=saved_private_data;
+            return 0;
+        }
+        if (do_col_protocol) {
+            col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
         }
-       if (do_col_protocol) {
-            if (check_col(pinfo->cinfo, COL_PROTOCOL))
-                col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
-       }
-       if (do_col_info) {
-            if (check_col(pinfo->cinfo, COL_INFO))
-                col_clear(pinfo->cinfo, COL_INFO);
+        if (gbl_do_col_info) {
+            col_clear(pinfo->cinfo, COL_INFO);
         }
         if (tree) {
-            item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, FALSE);
+            item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, ENC_NA);
             kerberos_tree = proto_item_add_subtree(item, ett_krb_kerberos);
         }
     }
-       asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+    asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
     TRY {
-       offset=dissect_ber_old_choice(&asn1_ctx, kerberos_tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
+        offset=dissect_ber_old_choice(&asn1_ctx, kerberos_tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL);
     } CATCH_ALL {
-       pinfo->private_data=saved_private_data;
-       RETHROW;
+        pinfo->private_data=saved_private_data;
+        RETHROW;
     } ENDTRY;
 
     proto_item_set_len(item, offset);
@@ -4744,8 +4797,8 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static void
 kerberos_prefs_apply_cb(void) {
 #ifdef HAVE_LIBNETTLE
-       clear_keytab();
-       read_keytab_file(keytab_filename);
+    clear_keytab();
+    read_keytab_file(keytab_filename);
 #endif
 }
 
@@ -4753,580 +4806,580 @@ void
 proto_register_kerberos(void)
 {
     static hf_register_info hf[] = {
-       { &hf_krb_rm_reserved, {
-           "Reserved", "kerberos.rm.reserved", FT_BOOLEAN, 32,
-           &bitval, KRB_RM_RESERVED, "Record mark reserved bit", HFILL }},
-       { &hf_krb_rm_reclen, {
-           "Record Length", "kerberos.rm.length", FT_UINT32, BASE_DEC,
-           NULL, KRB_RM_RECLEN, "Record length", HFILL }},
-       { &hf_krb_transitedtype, {
-           "Type", "kerberos.transited.type", FT_UINT32, BASE_DEC,
-           VALS(krb5_transited_types), 0, "Transited Type", HFILL }},
-       { &hf_krb_transitedcontents, {
-           "Contents", "kerberos.transited.contents", FT_BYTES, BASE_HEX,
-           NULL, 0, "Transitent Contents string", HFILL }},
-       { &hf_krb_keytype, {
-           "Key type", "kerberos.keytype", FT_UINT32, BASE_DEC,
-           VALS(krb5_encryption_types), 0, "Key Type", HFILL }},
-       { &hf_krb_keyvalue, {
-           "Key value", "kerberos.keyvalue", FT_BYTES, BASE_HEX,
-           NULL, 0, "Key value (encryption key)", HFILL }},
-       { &hf_krb_adtype, {
-           "Type", "kerberos.adtype", FT_UINT32, BASE_DEC,
-           VALS(krb5_ad_types), 0, "Authorization Data Type", HFILL }},
-       { &hf_krb_IF_RELEVANT_type, {
-           "Type", "kerberos.IF_RELEVANT.type", FT_UINT32, BASE_DEC,
-           VALS(krb5_ad_types), 0, "IF-RELEVANT Data Type", HFILL }},
-       { &hf_krb_advalue, {
-           "Data", "kerberos.advalue", FT_BYTES, BASE_HEX,
-           NULL, 0, "Authentication Data", HFILL }},
-       { &hf_krb_IF_RELEVANT_value, {
-           "Data", "kerberos.IF_RELEVANT.value", FT_BYTES, BASE_HEX,
-           NULL, 0, "IF_RELEVANT Data", HFILL }},
-       { &hf_krb_etype, {
-           "Encryption type", "kerberos.etype", FT_INT32, BASE_DEC,
-           VALS(krb5_encryption_types), 0, "Encryption Type", HFILL }},
-       { &hf_krb_addr_type, {
-           "Addr-type", "kerberos.addr_type", FT_UINT32, BASE_DEC,
-           VALS(krb5_address_types), 0, "Address Type", HFILL }},
-       { &hf_krb_pac_signature_type, {
-           "Type", "kerberos.pac.signature.type", FT_INT32, BASE_DEC,
-           NULL, 0, "PAC Signature Type", HFILL }},
-       { &hf_krb_name_type, {
-           "Name-type", "kerberos.name_type", FT_INT32, BASE_DEC,
-           VALS(krb5_princ_types), 0, "Type of principal name", HFILL }},
-       { &hf_krb_lr_type, {
-           "Lr-type", "kerberos.lr_type", FT_UINT32, BASE_DEC,
-           VALS(krb5_lr_types), 0, "Type of lastreq value", HFILL }},
-       { &hf_krb_address_ip, {
-           "IP Address", "kerberos.addr_ip", FT_IPv4, BASE_NONE,
-           NULL, 0, "IP Address", HFILL }},
-       { &hf_krb_address_ipv6, {
-           "IPv6 Address", "kerberos.addr_ipv6", FT_IPv6, BASE_NONE,
-           NULL, 0, "IPv6 Address", HFILL }},
-       { &hf_krb_address_netbios, {
-           "NetBIOS Address", "kerberos.addr_nb", FT_STRING, BASE_NONE,
-           NULL, 0, "NetBIOS Address and type", HFILL }},
-       { &hf_krb_authtime, {
-           "Authtime", "kerberos.authtime", FT_STRING, BASE_NONE,
-           NULL, 0, "Time of initial authentication", HFILL }},
-       { &hf_krb_SAFE_BODY_timestamp, {
-           "Timestamp", "kerberos.SAFE_BODY.timestamp", FT_STRING, BASE_NONE,
-           NULL, 0, "Timestamp of this SAFE_BODY", HFILL }},
-       { &hf_krb_patimestamp, {
-           "patimestamp", "kerberos.patimestamp", FT_STRING, BASE_NONE,
-           NULL, 0, "Time of client", HFILL }},
-       { &hf_krb_pausec, {
-           "pausec", "kerberos.pausec", FT_UINT32, BASE_DEC,
-           NULL, 0, "Microsecond component of client time", HFILL }},
-       { &hf_krb_lr_time, {
-           "Lr-time", "kerberos.lr_time", FT_STRING, BASE_NONE,
-           NULL, 0, "Time of LR-entry", HFILL }},
-       { &hf_krb_starttime, {
-           "Start time", "kerberos.starttime", FT_STRING, BASE_NONE,
-           NULL, 0, "The time after which the ticket is valid", HFILL }},
-       { &hf_krb_endtime, {
-           "End time", "kerberos.endtime", FT_STRING, BASE_NONE,
-           NULL, 0, "The time after which the ticket has expired", HFILL }},
-       { &hf_krb_key_expire, {
-           "Key Expiration", "kerberos.key_expiration", FT_STRING, BASE_NONE,
-           NULL, 0, "The time after which the key will expire", HFILL }},
-       { &hf_krb_renew_till, {
-           "Renew-till", "kerberos.renenw_till", FT_STRING, BASE_NONE,
-           NULL, 0, "The maximum time we can renew the ticket until", HFILL }},
-       { &hf_krb_rtime, {
-           "rtime", "kerberos.rtime", FT_STRING, BASE_NONE,
-           NULL, 0, "Renew Until timestamp", HFILL }},
-       { &hf_krb_ctime, {
-           "ctime", "kerberos.ctime", FT_STRING, BASE_NONE,
-           NULL, 0, "Current Time on the client host", HFILL }},
-       { &hf_krb_cusec, {
-           "cusec", "kerberos.cusec", FT_UINT32, BASE_DEC,
-           NULL, 0, "micro second component of client time", HFILL }},
-       { &hf_krb_SAFE_BODY_usec, {
-           "usec", "kerberos.SAFE_BODY.usec", FT_UINT32, BASE_DEC,
-           NULL, 0, "micro second component of SAFE_BODY time", HFILL }},
-       { &hf_krb_stime, {
-           "stime", "kerberos.stime", FT_STRING, BASE_NONE,
-           NULL, 0, "Current Time on the server host", HFILL }},
-       { &hf_krb_susec, {
-           "susec", "kerberos.susec", FT_UINT32, BASE_DEC,
-           NULL, 0, "micro second component of server time", HFILL }},
-       { &hf_krb_error_code, {
-           "error_code", "kerberos.error_code", FT_UINT32, BASE_DEC,
-           VALS(krb5_error_codes), 0, "Kerberos error code", HFILL }},
-       { &hf_krb_from, {
-           "from", "kerberos.from", FT_STRING, BASE_NONE,
-           NULL, 0, "From when the ticket is to be valid (postdating)", HFILL }},
-       { &hf_krb_till, {
-           "till", "kerberos.till", FT_STRING, BASE_NONE,
-           NULL, 0, "When the ticket will expire", HFILL }},
-       { &hf_krb_name_string, {
-           "Name", "kerberos.name_string", FT_STRING, BASE_NONE,
-           NULL, 0, "String component that is part of a PrincipalName", HFILL }},
-       { &hf_krb_provsrv_location, {
-           "PROVSRV Location", "kerberos.provsrv_location", FT_STRING, BASE_NONE,
-           NULL, 0, "PacketCable PROV SRV Location", HFILL }},
-       { &hf_krb_e_text, {
-           "e-text", "kerberos.e_text", FT_STRING, BASE_NONE,
-           NULL, 0, "Additional (human readable) error description", HFILL }},
-       { &hf_krb_s4u2self_auth, {
-           "S4U2Self Auth", "kerberos.s4u2self.auth", FT_STRING, BASE_NONE,
-           NULL, 0, "S4U2Self authentication string", HFILL }},
-       { &hf_krb_realm, {
-           "Realm", "kerberos.realm", FT_STRING, BASE_NONE,
-           NULL, 0, "Name of the Kerberos Realm", HFILL }},
-       { &hf_krb_srealm, {
-           "SRealm", "kerberos.srealm", FT_STRING, BASE_NONE,
-           NULL, 0, "Name of the Kerberos SRealm", HFILL }},
-       { &hf_krb_prealm, {
-           "Delegated Principal Realm", "kerberos.prealm", FT_STRING, BASE_NONE,
-           NULL, 0, "Name of the Kerberos PRealm", HFILL }},
-       { &hf_krb_crealm, {
-           "Client Realm", "kerberos.crealm", FT_STRING, BASE_NONE,
-           NULL, 0, "Name of the Clients Kerberos Realm", HFILL }},
-       { &hf_krb_pac_clientname, {
-           "Name", "kerberos.pac.name", FT_STRING, BASE_NONE,
-           NULL, 0, "Name of the Client in the PAC structure", HFILL }},
-       { &hf_krb_msg_type, {
-           "MSG Type", "kerberos.msg.type", FT_UINT32, BASE_DEC,
-           VALS(krb5_msg_types), 0, "Kerberos Message Type", HFILL }},
-       { &hf_krb_APOptions, {
-           "APOptions", "kerberos.apoptions", FT_BYTES, BASE_HEX,
-           NULL, 0, "Kerberos APOptions bitstring", HFILL }},
-       { &hf_krb_APOptions_use_session_key, {
-           "Use Session Key", "kerberos.apoptions.use_session_key", FT_BOOLEAN, 32,
-           TFS(&krb5_apoptions_use_session_key), 0x40000000, "", HFILL }},
-       { &hf_krb_APOptions_mutual_required, {
-           "Mutual required", "kerberos.apoptions.mutual_required", FT_BOOLEAN, 32,
-           TFS(&krb5_apoptions_mutual_required), 0x20000000, "", HFILL }},
-       { &hf_krb_KDCOptions, {
-           "KDCOptions", "kerberos.kdcoptions", FT_BYTES, BASE_HEX,
-           NULL, 0, "Kerberos KDCOptions bitstring", HFILL }},
-       { &hf_krb_TicketFlags, {
-           "Ticket Flags", "kerberos.ticketflags", FT_NONE, BASE_NONE,
-           NULL, 0, "Kerberos Ticket Flags", HFILL }},
-       { &hf_krb_TicketFlags_forwardable, {
-           "Forwardable", "kerberos.ticketflags.forwardable", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_forwardable), 0x40000000, "Flag controlling whether the tickes are forwardable or not", HFILL }},
-       { &hf_krb_TicketFlags_forwarded, {
-           "Forwarded", "kerberos.ticketflags.forwarded", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_forwarded), 0x20000000, "Has this ticket been forwarded?", HFILL }},
-       { &hf_krb_TicketFlags_proxyable, {
-           "Proxyable", "kerberos.ticketflags.proxyable", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_proxyable), 0x10000000, "Flag controlling whether the tickes are proxyable or not", HFILL }},
-       { &hf_krb_TicketFlags_proxy, {
-           "Proxy", "kerberos.ticketflags.proxy", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_proxy), 0x08000000, "Has this ticket been proxied?", HFILL }},
-       { &hf_krb_TicketFlags_allow_postdate, {
-           "Allow Postdate", "kerberos.ticketflags.allow_postdate", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_allow_postdate), 0x04000000, "Flag controlling whether we allow postdated tickets or not", HFILL }},
-       { &hf_krb_TicketFlags_postdated, {
-           "Postdated", "kerberos.ticketflags.postdated", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_postdated), 0x02000000, "Whether this ticket is postdated or not", HFILL }},
-       { &hf_krb_TicketFlags_invalid, {
-           "Invalid", "kerberos.ticketflags.invalid", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_invalid), 0x01000000, "Whether this ticket is invalid or not", HFILL }},
-       { &hf_krb_TicketFlags_renewable, {
-           "Renewable", "kerberos.ticketflags.renewable", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_renewable), 0x00800000, "Whether this ticket is renewable or not", HFILL }},
-       { &hf_krb_TicketFlags_initial, {
-           "Initial", "kerberos.ticketflags.initial", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_initial), 0x00400000, "Whether this ticket is an initial ticket or not", HFILL }},
-       { &hf_krb_TicketFlags_pre_auth, {
-           "Pre-Auth", "kerberos.ticketflags.pre_auth", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_pre_auth), 0x00200000, "Whether this ticket is pre-authenticated or not", HFILL }},
-       { &hf_krb_TicketFlags_hw_auth, {
-           "HW-Auth", "kerberos.ticketflags.hw_auth", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_hw_auth), 0x00100000, "Whether this ticket is hardware-authenticated or not", HFILL }},
-       { &hf_krb_TicketFlags_transited_policy_checked, {
-           "Transited Policy Checked", "kerberos.ticketflags.transited_policy_checked", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_transited_policy_checked), 0x00080000, "Whether this ticket is transited policy checked or not", HFILL }},
-       { &hf_krb_TicketFlags_ok_as_delegate, {
-           "Ok As Delegate", "kerberos.ticketflags.ok_as_delegate", FT_BOOLEAN, 32,
-           TFS(&krb5_ticketflags_ok_as_delegate), 0x00040000, "Whether this ticket is Ok As Delegate or not", HFILL }},
-       { &hf_krb_KDC_REQ_BODY, {
-           "KDC_REQ_BODY", "kerberos.kdc_req_body", FT_NONE, BASE_NONE,
-           NULL, 0, "Kerberos KDC REQuest BODY", HFILL }},
-       { &hf_krb_PRIV_BODY, {
-           "PRIV_BODY", "kerberos.priv_body", FT_NONE, BASE_NONE,
-           NULL, 0, "Kerberos PRIVate BODY", HFILL }},
-       { &hf_krb_CRED_BODY, {
-           "CRED_BODY", "kerberos.cred_body", FT_NONE, BASE_NONE,
-           NULL, 0, "Kerberos CREDential BODY", HFILL }},
-       { &hf_krb_encrypted_PRIV, {
-           "Encrypted PRIV", "kerberos.enc_priv", FT_NONE, BASE_NONE,
-           NULL, 0, "Kerberos Encrypted PRIVate blob data", HFILL }},
-       { &hf_krb_KDCOptions_forwardable, {
-           "Forwardable", "kerberos.kdcoptions.forwardable", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_forwardable), 0x40000000, "Flag controlling whether the tickes are forwardable or not", HFILL }},
-       { &hf_krb_KDCOptions_forwarded, {
-           "Forwarded", "kerberos.kdcoptions.forwarded", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_forwarded), 0x20000000, "Has this ticket been forwarded?", HFILL }},
-       { &hf_krb_KDCOptions_proxyable, {
-           "Proxyable", "kerberos.kdcoptions.proxyable", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_proxyable), 0x10000000, "Flag controlling whether the tickes are proxyable or not", HFILL }},
-       { &hf_krb_KDCOptions_proxy, {
-           "Proxy", "kerberos.kdcoptions.proxy", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_proxy), 0x08000000, "Has this ticket been proxied?", HFILL }},
-       { &hf_krb_KDCOptions_allow_postdate, {
-           "Allow Postdate", "kerberos.kdcoptions.allow_postdate", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_allow_postdate), 0x04000000, "Flag controlling whether we allow postdated tickets or not", HFILL }},
-       { &hf_krb_KDCOptions_postdated, {
-           "Postdated", "kerberos.kdcoptions.postdated", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_postdated), 0x02000000, "Whether this ticket is postdated or not", HFILL }},
-       { &hf_krb_KDCOptions_renewable, {
-           "Renewable", "kerberos.kdcoptions.renewable", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_renewable), 0x00800000, "Whether this ticket is renewable or not", HFILL }},
-       { &hf_krb_KDCOptions_constrained_delegation, {
-           "Constrained Delegation", "kerberos.kdcoptions.constrained_delegation", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_constrained_delegation), 0x00020000, "Do we want a PAC containing constrained delegation info or not", HFILL }},
-       { &hf_krb_KDCOptions_canonicalize, {
-           "Canonicalize", "kerberos.kdcoptions.canonicalize", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_canonicalize), 0x00010000, "Do we want the KDC to canonicalize the principal or not", HFILL }},
-       { &hf_krb_KDCOptions_opt_hardware_auth, {
-           "Opt HW Auth", "kerberos.kdcoptions.opt_hardware_auth", FT_BOOLEAN, 32,
-           NULL, 0x00100000, "Opt HW Auth flag", HFILL }},
-       { &hf_krb_KDCOptions_disable_transited_check, {
-           "Disable Transited Check", "kerberos.kdcoptions.disable_transited_check", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_disable_transited_check), 0x00000020, "Whether we should do transited checking or not", HFILL }},
-       { &hf_krb_KDCOptions_renewable_ok, {
-           "Renewable OK", "kerberos.kdcoptions.renewable_ok", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_renewable_ok), 0x00000010, "Whether we accept renewed tickets or not", HFILL }},
-       { &hf_krb_KDCOptions_enc_tkt_in_skey, {
-           "Enc-Tkt-in-Skey", "kerberos.kdcoptions.enc_tkt_in_skey", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_enc_tkt_in_skey), 0x00000008, "Whether the ticket is encrypted in the skey or not", HFILL }},
-       { &hf_krb_KDCOptions_renew, {
-           "Renew", "kerberos.kdcoptions.renew", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_renew), 0x00000002, "Is this a request to renew a ticket?", HFILL }},
-       { &hf_krb_KDCOptions_validate, {
-           "Validate", "kerberos.kdcoptions.validate", FT_BOOLEAN, 32,
-           TFS(&krb5_kdcoptions_validate), 0x00000001, "Is this a request to validate a postdated ticket?", HFILL }},
-       { &hf_krb_pvno, {
-           "Pvno", "kerberos.pvno", FT_UINT32, BASE_DEC,
-           NULL, 0, "Kerberos Protocol Version Number", HFILL }},
-       { &hf_krb_kvno, {
-           "Kvno", "kerberos.kvno", FT_UINT32, BASE_DEC,
-           NULL, 0, "Version Number for the encryption Key", HFILL }},
-       { &hf_krb_checksum_type, {
-           "Type", "kerberos.checksum.type", FT_UINT32, BASE_DEC,
-           VALS(krb5_checksum_types), 0, "Type of checksum", HFILL }},
-       { &hf_krb_authenticator_vno, {
-           "Authenticator vno", "kerberos.authenticator_vno", FT_UINT32, BASE_DEC,
-           NULL, 0, "Version Number for the Authenticator", HFILL }},
-       { &hf_krb_encrypted_authenticator_data, {
-           "Authenticator data", "kerberos.authenticator.data", FT_BYTES, BASE_HEX,
-           NULL, 0, "Data content of an encrypted authenticator", HFILL }},
-       { &hf_krb_encrypted_EncKrbCredPart, {
-           "enc EncKrbCredPart", "kerberos.EncKrbCredPart.encrypted", FT_BYTES, BASE_HEX,
-           NULL, 0, "Encrypted EncKrbCredPart blob", HFILL }},
-       { &hf_krb_encrypted_PA_ENC_TIMESTAMP, {
-           "enc PA_ENC_TIMESTAMP", "kerberos.PA_ENC_TIMESTAMP.encrypted", FT_BYTES, BASE_HEX,
-           NULL, 0, "Encrypted PA-ENC-TIMESTAMP blob", HFILL }},
-       { &hf_krb_encrypted_enc_authorization_data, {
-           "enc-authorization-data", "kerberos.enc_authorization_data.encrypted", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL }},
-       { &hf_krb_PAC_LOGON_INFO, {
-           "PAC_LOGON_INFO", "kerberos.PAC_LOGON_INFO", FT_BYTES, BASE_HEX,
-           NULL, 0, "PAC_LOGON_INFO structure", HFILL }},
-       { &hf_krb_PAC_CREDENTIAL_TYPE, {
-           "PAC_CREDENTIAL_TYPE", "kerberos.PAC_CREDENTIAL_TYPE", FT_BYTES, BASE_HEX,
-           NULL, 0, "PAC_CREDENTIAL_TYPE structure", HFILL }},
-       { &hf_krb_PAC_SERVER_CHECKSUM, {
-           "PAC_SERVER_CHECKSUM", "kerberos.PAC_SERVER_CHECKSUM", FT_BYTES, BASE_HEX,
-           NULL, 0, "PAC_SERVER_CHECKSUM structure", HFILL }},
-       { &hf_krb_PAC_PRIVSVR_CHECKSUM, {
-           "PAC_PRIVSVR_CHECKSUM", "kerberos.PAC_PRIVSVR_CHECKSUM", FT_BYTES, BASE_HEX,
-           NULL, 0, "PAC_PRIVSVR_CHECKSUM structure", HFILL }},
-       { &hf_krb_PAC_CLIENT_INFO_TYPE, {
-           "PAC_CLIENT_INFO_TYPE", "kerberos.PAC_CLIENT_INFO_TYPE", FT_BYTES, BASE_HEX,
-           NULL, 0, "PAC_CLIENT_INFO_TYPE structure", HFILL }},
-       { &hf_krb_PAC_CONSTRAINED_DELEGATION, {
-           "PAC_CONSTRAINED_DELEGATION", "kerberos.PAC_CONSTRAINED_DELEGATION", FT_BYTES, BASE_HEX,
-           NULL, 0, "PAC_CONSTRAINED_DELEGATION structure", HFILL }},
-       { &hf_krb_PAC_UPN_DNS_INFO, {
-           "UPN_DNS_INFO", "kerberos.PAC_UPN_DNS_INFO", FT_BYTES, BASE_HEX,
-           NULL, 0, "UPN_DNS_INFO structure", HFILL }},
-       { &hf_krb_checksum_checksum, {
-           "checksum", "kerberos.checksum.checksum", FT_BYTES, BASE_HEX,
-           NULL, 0, "Kerberos Checksum", HFILL }},
-       { &hf_krb_ENC_PRIV, {
-           "enc PRIV", "kerberos.ENC_PRIV", FT_BYTES, BASE_HEX,
-           NULL, 0, "Encrypted PRIV blob", HFILL }},
-       { &hf_krb_encrypted_Ticket_data, {
-           "enc-part", "kerberos.ticket.data", FT_BYTES, BASE_HEX,
-           NULL, 0, "The encrypted part of a ticket", HFILL }},
-       { &hf_krb_encrypted_AP_REP_data, {
-           "enc-part", "kerberos.aprep.data", FT_BYTES, BASE_HEX,
-           NULL, 0, "The encrypted part of AP-REP", HFILL }},
-       { &hf_krb_encrypted_KDC_REP_data, {
-           "enc-part", "kerberos.kdcrep.data", FT_BYTES, BASE_HEX,
-           NULL, 0, "The encrypted part of KDC-REP", HFILL }},
-       { &hf_krb_PA_DATA_value, {
-           "Value", "kerberos.padata.value", FT_BYTES, BASE_HEX,
-           NULL, 0, "Content of the PADATA blob", HFILL }},
-       { &hf_krb_etype_info_salt, {
-           "Salt", "kerberos.etype_info.salt", FT_BYTES, BASE_HEX,
-           NULL, 0, "Salt", HFILL }},
-       { &hf_krb_etype_info2_salt, {
-           "Salt", "kerberos.etype_info2.salt", FT_BYTES, BASE_HEX,
-           NULL, 0, "Salt", HFILL }},
-       { &hf_krb_etype_info2_s2kparams, {
-           "Salt", "kerberos.etype_info.s2kparams", FT_BYTES, BASE_HEX,
-           NULL, 0, "S2kparams", HFILL }},
-       { &hf_krb_SAFE_BODY_user_data, {
-           "User Data", "kerberos.SAFE_BODY.user_data", FT_BYTES, BASE_HEX,
-           NULL, 0, "SAFE BODY userdata field", HFILL }},
-       { &hf_krb_PRIV_BODY_user_data, {
-           "User Data", "kerberos.PRIV_BODY.user_data", FT_BYTES, BASE_HEX,
-           NULL, 0, "PRIV BODY userdata field", HFILL }},
-       { &hf_krb_pac_signature_signature, {
-           "Signature", "kerberos.pac.signature.signature", FT_BYTES, BASE_HEX,
-           NULL, 0, "A PAC signature blob", HFILL }},
-       { &hf_krb_PA_DATA_type, {
-           "Type", "kerberos.padata.type", FT_UINT32, BASE_DEC,
-           VALS(krb5_preauthentication_types), 0, "Type of preauthentication data", HFILL }},
-       { &hf_krb_nonce, {
-           "Nonce", "kerberos.nonce", FT_UINT32, BASE_DEC,
-           NULL, 0, "Kerberos Nonce random number", HFILL }},
-       { &hf_krb_tkt_vno, {
-           "Tkt-vno", "kerberos.tkt_vno", FT_UINT32, BASE_DEC,
-           NULL, 0, "Version number for the Ticket format", HFILL }},
-       { &hf_krb_KrbCredInfo, {
-           "KrbCredInfo", "kerberos.KrbCredInfo", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a Kerberos KrbCredInfo", HFILL }},
-       { &hf_krb_HostAddress, {
-           "HostAddress", "kerberos.hostaddress", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a Kerberos HostAddress sequence", HFILL }},
-       { &hf_krb_s_address, {
-           "S-Address", "kerberos.s_address", FT_NONE, BASE_DEC,
-           NULL, 0, "This is the Senders address", HFILL }},
-       { &hf_krb_r_address, {
-           "R-Address", "kerberos.r_address", FT_NONE, BASE_DEC,
-           NULL, 0, "This is the Recipient address", HFILL }},
-       { &hf_krb_key, {
-           "key", "kerberos.key", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a Kerberos EncryptionKey sequence", HFILL }},
-       { &hf_krb_subkey, {
-           "Subkey", "kerberos.subkey", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a Kerberos subkey", HFILL }},
-       { &hf_krb_seq_number, {
-           "Seq Number", "kerberos.seq_number", FT_UINT32, BASE_DEC,
-           NULL, 0, "This is a Kerberos sequence number", HFILL }},
-       { &hf_krb_AuthorizationData, {
-           "AuthorizationData", "kerberos.AuthorizationData", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a Kerberos AuthorizationData sequence", HFILL }},
-       { &hf_krb_EncTicketPart, {
-           "EncTicketPart", "kerberos.EncTicketPart", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a decrypted Kerberos EncTicketPart sequence", HFILL }},
-       { &hf_krb_EncAPRepPart, {
-           "EncAPRepPart", "kerberos.EncAPRepPart", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a decrypted Kerberos EncAPRepPart sequence", HFILL }},
-       { &hf_krb_EncKrbPrivPart, {
-           "EncKrbPrivPart", "kerberos.EncKrbPrivPart", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a decrypted Kerberos EncKrbPrivPart sequence", HFILL }},
-       { &hf_krb_EncKrbCredPart, {
-           "EncKrbCredPart", "kerberos.EncKrbCredPart", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a decrypted Kerberos EncKrbCredPart sequence", HFILL }},
-       { &hf_krb_EncKDCRepPart, {
-           "EncKDCRepPart", "kerberos.EncKDCRepPart", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a decrypted Kerberos EncKDCRepPart sequence", HFILL }},
-       { &hf_krb_LastReq, {
-           "LastReq", "kerberos.LastReq", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a LastReq sequence", HFILL }},
-       { &hf_krb_Authenticator, {
-           "Authenticator", "kerberos.Authenticator", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a decrypted Kerberos Authenticator sequence", HFILL }},
-       { &hf_krb_Checksum, {
-           "Checksum", "kerberos.Checksum", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a Kerberos Checksum sequence", HFILL }},
-       { &hf_krb_HostAddresses, {
-           "HostAddresses", "kerberos.hostaddresses", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a list of Kerberos HostAddress sequences", HFILL }},
-       { &hf_krb_IF_RELEVANT, {
-           "IF_RELEVANT", "kerberos.if_relevant", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a list of IF-RELEVANT sequences", HFILL }},
-       { &hf_krb_etypes, {
-           "Encryption Types", "kerberos.etypes", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a list of Kerberos encryption types", HFILL }},
-       { &hf_krb_KrbCredInfos, {
-           "Sequence of KrbCredInfo", "kerberos.KrbCredInfos", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a list of KrbCredInfo", HFILL }},
-       { &hf_krb_sq_tickets, {
-           "Tickets", "kerberos.sq.tickets", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a list of Kerberos Tickets", HFILL }},
-       { &hf_krb_LastReqs, {
-           "LastReqs", "kerberos.LastReqs", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a list of LastReq structures", HFILL }},
-       { &hf_krb_sname, {
-           "Server Name", "kerberos.sname", FT_NONE, BASE_DEC,
-           NULL, 0, "This is the name part server's identity", HFILL }},
-       { &hf_krb_pname, {
-           "Delegated Principal Name", "kerberos.pname", FT_NONE, BASE_DEC,
-           NULL, 0, "Identity of the delegated principal", HFILL }},
-       { &hf_krb_cname, {
-           "Client Name", "kerberos.cname", FT_NONE, BASE_DEC,
-           NULL, 0, "The name part of the client principal identifier", HFILL }},
-       { &hf_krb_authenticator_enc, {
-           "Authenticator", "kerberos.authenticator", FT_NONE, BASE_DEC,
-           NULL, 0, "Encrypted authenticator blob", HFILL }},
-       { &hf_krb_CRED_enc, {
-           "EncKrbCredPart", "kerberos.encrypted_cred", FT_NONE, BASE_DEC,
-           NULL, 0, "Encrypted Cred blob", HFILL }},
-       { &hf_krb_ticket_enc, {
-           "enc-part", "kerberos.ticket.enc_part", FT_NONE, BASE_DEC,
-           NULL, 0, "The structure holding the encrypted part of a ticket", HFILL }},
-       { &hf_krb_AP_REP_enc, {
-           "enc-part", "kerberos.aprep.enc_part", FT_NONE, BASE_DEC,
-           NULL, 0, "The structure holding the encrypted part of AP-REP", HFILL }},
-       { &hf_krb_KDC_REP_enc, {
-           "enc-part", "kerberos.kdcrep.enc_part", FT_NONE, BASE_DEC,
-           NULL, 0, "The structure holding the encrypted part of KDC-REP", HFILL }},
-       { &hf_krb_e_data, {
-           "e-data", "kerberos.e_data", FT_NONE, BASE_DEC,
-           NULL, 0, "The e-data blob", HFILL }},
-       { &hf_krb_padata, {
-           "padata", "kerberos.padata", FT_NONE, BASE_DEC,
-           NULL, 0, "Sequence of preauthentication data", HFILL }},
-       { &hf_krb_ticket, {
-           "Ticket", "kerberos.ticket", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a Kerberos Ticket", HFILL }},
-       { &hf_krb_TransitedEncoding, {
-           "TransitedEncoding", "kerberos.TransitedEncoding", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a Kerberos TransitedEncoding sequence", HFILL }},
-       { &hf_krb_PA_PAC_REQUEST_flag, {
-           "PAC Request", "kerberos.pac_request.flag", FT_UINT32, BASE_DEC,
-           NULL, 0, "This is a MS PAC Request Flag", HFILL }},
-       { &hf_krb_w2k_pac_entries, {
-           "Num Entries", "kerberos.pac.entries", FT_UINT32, BASE_DEC,
-           NULL, 0, "Number of W2k PAC entries", HFILL }},
-       { &hf_krb_w2k_pac_version, {
-           "Version", "kerberos.pac.version", FT_UINT32, BASE_DEC,
-           NULL, 0, "Version of PAC structures", HFILL }},
-       { &hf_krb_w2k_pac_type, {
-           "Type", "kerberos.pac.type", FT_UINT32, BASE_DEC,
-           VALS(w2k_pac_types), 0, "Type of W2k PAC entry", HFILL }},
-       { &hf_krb_w2k_pac_size, {
-           "Size", "kerberos.pac.size", FT_UINT32, BASE_DEC,
-           NULL, 0, "Size of W2k PAC entry", HFILL }},
-       { &hf_krb_w2k_pac_offset, {
-           "Offset", "kerberos.pac.offset", FT_UINT32, BASE_DEC,
-           NULL, 0, "Offset to W2k PAC entry", HFILL }},
-       { &hf_krb_pac_clientid, {
-           "ClientID", "kerberos.pac.clientid", FT_ABSOLUTE_TIME, BASE_NONE,
-           NULL, 0, "ClientID Timestamp", HFILL }},
-       { &hf_krb_pac_namelen, {
-           "Name Length", "kerberos.pac.namelen", FT_UINT16, BASE_DEC,
-           NULL, 0, "Length of client name", HFILL }},
-       { &hf_krb_pac_upn_flags, {
-           "Flags", "kerberos.pac.upn.flags", FT_UINT32, BASE_HEX,
-           NULL, 0, "UPN flags", HFILL }},
-       { &hf_krb_pac_upn_dns_offset, {
-           "DNS Offset", "kerberos.pac.upn.dns_offset", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL }},
-       { &hf_krb_pac_upn_dns_len, {
-           "DNS Len", "kerberos.pac.upn.dns_len", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL }},
-       { &hf_krb_pac_upn_upn_offset, {
-           "UPN Offset", "kerberos.pac.upn.upn_offset", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL }},
-       { &hf_krb_pac_upn_upn_len, {
-           "UPN Len", "kerberos.pac.upn.upn_len", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL }},
-       { &hf_krb_pac_upn_upn_name, {
-           "UPN Name", "kerberos.pac.upn.upn_name", FT_STRING, BASE_NONE,
-           NULL, 0, "", HFILL }},
-       { &hf_krb_pac_upn_dns_name, {
-           "DNS Name", "kerberos.pac.upn.dns_name", FT_STRING, BASE_NONE,
-           NULL, 0, "", HFILL }},
-       { &hf_krb_e_checksum, {
-           "e-checksum", "kerberos.e_checksum", FT_NONE, BASE_DEC,
-           NULL, 0, "This is a Kerberos e-checksum", HFILL }},
-       { &hf_krb_gssapi_len, {
-           "Length", "kerberos.gssapi.len", FT_UINT32, BASE_DEC,
-           NULL, 0, "Length of GSSAPI Bnd field", HFILL }},
-       { &hf_krb_gssapi_bnd, {
-           "Bnd", "kerberos.gssapi.bdn", FT_BYTES, BASE_HEX,
-           NULL, 0, "GSSAPI Bnd field", HFILL }},
-       { &hf_krb_gssapi_c_flag_deleg, {
-           "Deleg", "kerberos.gssapi.checksum.flags.deleg", FT_BOOLEAN, 32,
-           TFS(&tfs_gss_flags_deleg), KRB5_GSS_C_DELEG_FLAG, "", HFILL }},
-       { &hf_krb_gssapi_c_flag_mutual, {
-           "Mutual", "kerberos.gssapi.checksum.flags.mutual", FT_BOOLEAN, 32,
-           TFS(&tfs_gss_flags_mutual), KRB5_GSS_C_MUTUAL_FLAG, "", HFILL }},
-       { &hf_krb_gssapi_c_flag_replay, {
-           "Replay", "kerberos.gssapi.checksum.flags.replay", FT_BOOLEAN, 32,
-           TFS(&tfs_gss_flags_replay), KRB5_GSS_C_REPLAY_FLAG, "", HFILL }},
-       { &hf_krb_gssapi_c_flag_sequence, {
-           "Sequence", "kerberos.gssapi.checksum.flags.sequence", FT_BOOLEAN, 32,
-           TFS(&tfs_gss_flags_sequence), KRB5_GSS_C_SEQUENCE_FLAG, "", HFILL }},
-       { &hf_krb_gssapi_c_flag_conf, {
-           "Conf", "kerberos.gssapi.checksum.flags.conf", FT_BOOLEAN, 32,
-           TFS(&tfs_gss_flags_conf), KRB5_GSS_C_CONF_FLAG, "", HFILL }},
-       { &hf_krb_gssapi_c_flag_integ, {
-           "Integ", "kerberos.gssapi.checksum.flags.integ", FT_BOOLEAN, 32,
-           TFS(&tfs_gss_flags_integ), KRB5_GSS_C_INTEG_FLAG, "", HFILL }},
-       { &hf_krb_gssapi_c_flag_dce_style, {
-           "DCE-style", "kerberos.gssapi.checksum.flags.dce-style", FT_BOOLEAN, 32,
-           TFS(&tfs_gss_flags_dce_style), KRB5_GSS_C_DCE_STYLE, "", HFILL }},
-       { &hf_krb_gssapi_dlgopt, {
-           "DlgOpt", "kerberos.gssapi.dlgopt", FT_UINT16, BASE_DEC,
-           NULL, 0, "GSSAPI DlgOpt", HFILL }},
-       { &hf_krb_gssapi_dlglen, {
-           "DlgLen", "kerberos.gssapi.dlglen", FT_UINT16, BASE_DEC,
-           NULL, 0, "GSSAPI DlgLen", HFILL }},
-       { &hf_krb_smb_nt_status,
-               { "NT Status", "kerberos.smb.nt_status", FT_UINT32, BASE_HEX,
-               VALS(NT_errors), 0, "NT Status code", HFILL }},
-       { &hf_krb_smb_unknown,
-               { "Unknown", "kerberos.smb.unknown", FT_UINT32, BASE_HEX,
-               NULL, 0, "unknown", HFILL }},
-       { &hf_krb_midl_blob_len,
-               { "Blob Length", "kerberos.midl_blob_len", FT_UINT64, BASE_DEC,
-               NULL, 0, "Length of NDR encoded data that follows", HFILL }},
-
-       { &hf_krb_midl_fill_bytes,
-               { "Fill bytes", "kerberos.midl.fill_bytes", FT_UINT32, BASE_HEX,
-               NULL, 0, "Just some fill bytes", HFILL }},
-
-       { &hf_krb_midl_version,
-               { "Version", "kerberos.midl.version", FT_UINT8, BASE_DEC,
-               NULL, 0, "Version of pickling", HFILL }},
-
-       { &hf_krb_midl_hdr_len,
-               { "HDR Length", "kerberos.midl.hdr_len", FT_UINT16, BASE_DEC,
-               NULL, 0, "Length of header", HFILL }},
+        { &hf_krb_rm_reserved, {
+                "Reserved", "kerberos.rm.reserved", FT_BOOLEAN, 32,
+                TFS(&tfs_set_notset), KRB_RM_RESERVED, "Record mark reserved bit", HFILL }},
+        { &hf_krb_rm_reclen, {
+                "Record Length", "kerberos.rm.length", FT_UINT32, BASE_DEC,
+                NULL, KRB_RM_RECLEN, NULL, HFILL }},
+        { &hf_krb_transitedtype, {
+                "Type", "kerberos.transited.type", FT_UINT32, BASE_DEC,
+                VALS(krb5_transited_types), 0, "Transited Type", HFILL }},
+        { &hf_krb_transitedcontents, {
+                "Contents", "kerberos.transited.contents", FT_BYTES, BASE_NONE,
+                NULL, 0, "Transited Contents string", HFILL }},
+        { &hf_krb_keytype, {
+                "Key type", "kerberos.keytype", FT_UINT32, BASE_DEC,
+                VALS(krb5_encryption_types), 0, NULL, HFILL }},
+        { &hf_krb_keyvalue, {
+                "Key value", "kerberos.keyvalue", FT_BYTES, BASE_NONE,
+                NULL, 0, "Key value (encryption key)", HFILL }},
+        { &hf_krb_adtype, {
+                "Type", "kerberos.adtype", FT_UINT32, BASE_DEC,
+                VALS(krb5_ad_types), 0, "Authorization Data Type", HFILL }},
+        { &hf_krb_IF_RELEVANT_type, {
+                "Type", "kerberos.IF_RELEVANT.type", FT_UINT32, BASE_DEC,
+                VALS(krb5_ad_types), 0, "IF-RELEVANT Data Type", HFILL }},
+        { &hf_krb_advalue, {
+                "Data", "kerberos.advalue", FT_BYTES, BASE_NONE,
+                NULL, 0, "Authentication Data", HFILL }},
+        { &hf_krb_IF_RELEVANT_value, {
+                "Data", "kerberos.IF_RELEVANT.value", FT_BYTES, BASE_NONE,
+                NULL, 0, "IF_RELEVANT Data", HFILL }},
+        { &hf_krb_etype, {
+                "Encryption type", "kerberos.etype", FT_INT32, BASE_DEC,
+                VALS(krb5_encryption_types), 0, NULL, HFILL }},
+        { &hf_krb_addr_type, {
+                "Addr-type", "kerberos.addr_type", FT_UINT32, BASE_DEC,
+                VALS(krb5_address_types), 0, "Address Type", HFILL }},
+        { &hf_krb_pac_signature_type, {
+                "Type", "kerberos.pac.signature.type", FT_INT32, BASE_DEC,
+                NULL, 0, "PAC Signature Type", HFILL }},
+        { &hf_krb_name_type, {
+                "Name-type", "kerberos.name_type", FT_INT32, BASE_DEC,
+                VALS(krb5_princ_types), 0, "Type of principal name", HFILL }},
+        { &hf_krb_lr_type, {
+                "Lr-type", "kerberos.lr_type", FT_UINT32, BASE_DEC,
+                VALS(krb5_lr_types), 0, "Type of lastreq value", HFILL }},
+        { &hf_krb_address_ip, {
+                "IP Address", "kerberos.addr_ip", FT_IPv4, BASE_NONE,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_address_ipv6, {
+                "IPv6 Address", "kerberos.addr_ipv6", FT_IPv6, BASE_NONE,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_address_netbios, {
+                "NetBIOS Address", "kerberos.addr_nb", FT_STRING, BASE_NONE,
+                NULL, 0, "NetBIOS Address and type", HFILL }},
+        { &hf_krb_authtime, {
+                "Authtime", "kerberos.authtime", FT_STRING, BASE_NONE,
+                NULL, 0, "Time of initial authentication", HFILL }},
+        { &hf_krb_SAFE_BODY_timestamp, {
+                "Timestamp", "kerberos.SAFE_BODY.timestamp", FT_STRING, BASE_NONE,
+                NULL, 0, "Timestamp of this SAFE_BODY", HFILL }},
+        { &hf_krb_patimestamp, {
+                "patimestamp", "kerberos.patimestamp", FT_STRING, BASE_NONE,
+                NULL, 0, "Time of client", HFILL }},
+        { &hf_krb_pausec, {
+                "pausec", "kerberos.pausec", FT_UINT32, BASE_DEC,
+                NULL, 0, "Microsecond component of client time", HFILL }},
+        { &hf_krb_lr_time, {
+                "Lr-time", "kerberos.lr_time", FT_STRING, BASE_NONE,
+                NULL, 0, "Time of LR-entry", HFILL }},
+        { &hf_krb_starttime, {
+                "Start time", "kerberos.starttime", FT_STRING, BASE_NONE,
+                NULL, 0, "The time after which the ticket is valid", HFILL }},
+        { &hf_krb_endtime, {
+                "End time", "kerberos.endtime", FT_STRING, BASE_NONE,
+                NULL, 0, "The time after which the ticket has expired", HFILL }},
+        { &hf_krb_key_expire, {
+                "Key Expiration", "kerberos.key_expiration", FT_STRING, BASE_NONE,
+                NULL, 0, "The time after which the key will expire", HFILL }},
+        { &hf_krb_renew_till, {
+                "Renew-till", "kerberos.renenw_till", FT_STRING, BASE_NONE,
+                NULL, 0, "The maximum time we can renew the ticket until", HFILL }},
+        { &hf_krb_rtime, {
+                "rtime", "kerberos.rtime", FT_STRING, BASE_NONE,
+                NULL, 0, "Renew Until timestamp", HFILL }},
+        { &hf_krb_ctime, {
+                "ctime", "kerberos.ctime", FT_STRING, BASE_NONE,
+                NULL, 0, "Current Time on the client host", HFILL }},
+        { &hf_krb_cusec, {
+                "cusec", "kerberos.cusec", FT_UINT32, BASE_DEC,
+                NULL, 0, "micro second component of client time", HFILL }},
+        { &hf_krb_SAFE_BODY_usec, {
+                "usec", "kerberos.SAFE_BODY.usec", FT_UINT32, BASE_DEC,
+                NULL, 0, "micro second component of SAFE_BODY time", HFILL }},
+        { &hf_krb_stime, {
+                "stime", "kerberos.stime", FT_STRING, BASE_NONE,
+                NULL, 0, "Current Time on the server host", HFILL }},
+        { &hf_krb_susec, {
+                "susec", "kerberos.susec", FT_UINT32, BASE_DEC,
+                NULL, 0, "micro second component of server time", HFILL }},
+        { &hf_krb_error_code, {
+                "error_code", "kerberos.error_code", FT_UINT32, BASE_DEC,
+                VALS(krb5_error_codes), 0, "Kerberos error code", HFILL }},
+        { &hf_krb_from, {
+                "from", "kerberos.from", FT_STRING, BASE_NONE,
+                NULL, 0, "From when the ticket is to be valid (postdating)", HFILL }},
+        { &hf_krb_till, {
+                "till", "kerberos.till", FT_STRING, BASE_NONE,
+                NULL, 0, "When the ticket will expire", HFILL }},
+        { &hf_krb_name_string, {
+                "Name", "kerberos.name_string", FT_STRING, BASE_NONE,
+                NULL, 0, "String component that is part of a PrincipalName", HFILL }},
+        { &hf_krb_provsrv_location, {
+                "PROVSRV Location", "kerberos.provsrv_location", FT_STRING, BASE_NONE,
+                NULL, 0, "PacketCable PROV SRV Location", HFILL }},
+        { &hf_krb_e_text, {
+                "e-text", "kerberos.e_text", FT_STRING, BASE_NONE,
+                NULL, 0, "Additional (human readable) error description", HFILL }},
+        { &hf_krb_s4u2self_auth, {
+                "S4U2Self Auth", "kerberos.s4u2self.auth", FT_STRING, BASE_NONE,
+                NULL, 0, "S4U2Self authentication string", HFILL }},
+        { &hf_krb_realm, {
+                "Realm", "kerberos.realm", FT_STRING, BASE_NONE,
+                NULL, 0, "Name of the Kerberos Realm", HFILL }},
+        { &hf_krb_srealm, {
+                "SRealm", "kerberos.srealm", FT_STRING, BASE_NONE,
+                NULL, 0, "Name of the Kerberos SRealm", HFILL }},
+        { &hf_krb_prealm, {
+                "Delegated Principal Realm", "kerberos.prealm", FT_STRING, BASE_NONE,
+                NULL, 0, "Name of the Kerberos PRealm", HFILL }},
+        { &hf_krb_crealm, {
+                "Client Realm", "kerberos.crealm", FT_STRING, BASE_NONE,
+                NULL, 0, "Name of the Clients Kerberos Realm", HFILL }},
+        { &hf_krb_pac_clientname, {
+                "Name", "kerberos.pac.name", FT_STRING, BASE_NONE,
+                NULL, 0, "Name of the Client in the PAC structure", HFILL }},
+        { &hf_krb_msg_type, {
+                "MSG Type", "kerberos.msg.type", FT_UINT32, BASE_DEC,
+                VALS(krb5_msg_types), 0, "Kerberos Message Type", HFILL }},
+        { &hf_krb_APOptions, {
+                "APOptions", "kerberos.apoptions", FT_BYTES, BASE_NONE,
+                NULL, 0, "Kerberos APOptions bitstring", HFILL }},
+        { &hf_krb_APOptions_reserved, {
+               "reserved", "kerberos.apoptions.reserved", FT_BOOLEAN, 32,
+                TFS(&krb5_apoptions_reserved), 0x80000000, NULL, HFILL }},
+        { &hf_krb_APOptions_use_session_key, {
+                "Use Session Key", "kerberos.apoptions.use_session_key", FT_BOOLEAN, 32,
+                TFS(&krb5_apoptions_use_session_key), 0x40000000, NULL, HFILL }},
+        { &hf_krb_APOptions_mutual_required, {
+                "Mutual required", "kerberos.apoptions.mutual_required", FT_BOOLEAN, 32,
+                TFS(&krb5_apoptions_mutual_required), 0x20000000, NULL, HFILL }},
+        { &hf_krb_KDCOptions, {
+                "KDCOptions", "kerberos.kdcoptions", FT_BYTES, BASE_NONE,
+                NULL, 0, "Kerberos KDCOptions bitstring", HFILL }},
+        { &hf_krb_TicketFlags, {
+                "Ticket Flags", "kerberos.ticketflags", FT_NONE, BASE_NONE,
+                NULL, 0, "Kerberos Ticket Flags", HFILL }},
+        { &hf_krb_TicketFlags_forwardable, {
+                "Forwardable", "kerberos.ticketflags.forwardable", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_forwardable), 0x40000000, "Flag controlling whether the tickets are forwardable or not", HFILL }},
+        { &hf_krb_TicketFlags_forwarded, {
+                "Forwarded", "kerberos.ticketflags.forwarded", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_forwarded), 0x20000000, "Has this ticket been forwarded?", HFILL }},
+        { &hf_krb_TicketFlags_proxiable, {
+                "Proxiable", "kerberos.ticketflags.proxiable", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_proxiable), 0x10000000, "Flag controlling whether the tickets are proxiable or not", HFILL }},
+        { &hf_krb_TicketFlags_proxy, {
+                "Proxy", "kerberos.ticketflags.proxy", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_proxy), 0x08000000, "Has this ticket been proxied?", HFILL }},
+        { &hf_krb_TicketFlags_allow_postdate, {
+                "Allow Postdate", "kerberos.ticketflags.allow_postdate", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_allow_postdate), 0x04000000, "Flag controlling whether we allow postdated tickets or not", HFILL }},
+        { &hf_krb_TicketFlags_postdated, {
+                "Postdated", "kerberos.ticketflags.postdated", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_postdated), 0x02000000, "Whether this ticket is postdated or not", HFILL }},
+        { &hf_krb_TicketFlags_invalid, {
+                "Invalid", "kerberos.ticketflags.invalid", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_invalid), 0x01000000, "Whether this ticket is invalid or not", HFILL }},
+        { &hf_krb_TicketFlags_renewable, {
+                "Renewable", "kerberos.ticketflags.renewable", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_renewable), 0x00800000, "Whether this ticket is renewable or not", HFILL }},
+        { &hf_krb_TicketFlags_initial, {
+                "Initial", "kerberos.ticketflags.initial", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_initial), 0x00400000, "Whether this ticket is an initial ticket or not", HFILL }},
+        { &hf_krb_TicketFlags_pre_auth, {
+                "Pre-Auth", "kerberos.ticketflags.pre_auth", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_pre_auth), 0x00200000, "Whether this ticket is pre-authenticated or not", HFILL }},
+        { &hf_krb_TicketFlags_hw_auth, {
+                "HW-Auth", "kerberos.ticketflags.hw_auth", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_hw_auth), 0x00100000, "Whether this ticket is hardware-authenticated or not", HFILL }},
+        { &hf_krb_TicketFlags_transited_policy_checked, {
+                "Transited Policy Checked", "kerberos.ticketflags.transited_policy_checked", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_transited_policy_checked), 0x00080000, "Whether this ticket is transited policy checked or not", HFILL }},
+        { &hf_krb_TicketFlags_ok_as_delegate, {
+                "Ok As Delegate", "kerberos.ticketflags.ok_as_delegate", FT_BOOLEAN, 32,
+                TFS(&krb5_ticketflags_ok_as_delegate), 0x00040000, "Whether this ticket is Ok As Delegate or not", HFILL }},
+        { &hf_krb_KDC_REQ_BODY, {
+                "KDC_REQ_BODY", "kerberos.kdc_req_body", FT_NONE, BASE_NONE,
+                NULL, 0, "Kerberos KDC REQuest BODY", HFILL }},
+        { &hf_krb_PRIV_BODY, {
+                "PRIV_BODY", "kerberos.priv_body", FT_NONE, BASE_NONE,
+                NULL, 0, "Kerberos PRIVate BODY", HFILL }},
+        { &hf_krb_CRED_BODY, {
+                "CRED_BODY", "kerberos.cred_body", FT_NONE, BASE_NONE,
+                NULL, 0, "Kerberos CREDential BODY", HFILL }},
+        { &hf_krb_encrypted_PRIV, {
+                "Encrypted PRIV", "kerberos.enc_priv", FT_NONE, BASE_NONE,
+                NULL, 0, "Kerberos Encrypted PRIVate blob data", HFILL }},
+        { &hf_krb_KDCOptions_forwardable, {
+                "Forwardable", "kerberos.kdcoptions.forwardable", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_forwardable), 0x40000000, "Flag controlling whether the tickets are forwardable or not", HFILL }},
+        { &hf_krb_KDCOptions_forwarded, {
+                "Forwarded", "kerberos.kdcoptions.forwarded", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_forwarded), 0x20000000, "Has this ticket been forwarded?", HFILL }},
+        { &hf_krb_KDCOptions_proxiable, {
+                "Proxiable", "kerberos.kdcoptions.proxiable", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_proxiable), 0x10000000, "Flag controlling whether the tickets are proxiable or not", HFILL }},
+        { &hf_krb_KDCOptions_proxy, {
+                "Proxy", "kerberos.kdcoptions.proxy", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_proxy), 0x08000000, "Has this ticket been proxied?", HFILL }},
+        { &hf_krb_KDCOptions_allow_postdate, {
+                "Allow Postdate", "kerberos.kdcoptions.allow_postdate", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_allow_postdate), 0x04000000, "Flag controlling whether we allow postdated tickets or not", HFILL }},
+        { &hf_krb_KDCOptions_postdated, {
+                "Postdated", "kerberos.kdcoptions.postdated", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_postdated), 0x02000000, "Whether this ticket is postdated or not", HFILL }},
+        { &hf_krb_KDCOptions_renewable, {
+                "Renewable", "kerberos.kdcoptions.renewable", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_renewable), 0x00800000, "Whether this ticket is renewable or not", HFILL }},
+        { &hf_krb_KDCOptions_constrained_delegation, {
+                "Constrained Delegation", "kerberos.kdcoptions.constrained_delegation", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_constrained_delegation), 0x00020000, "Do we want a PAC containing constrained delegation info or not", HFILL }},
+        { &hf_krb_KDCOptions_canonicalize, {
+                "Canonicalize", "kerberos.kdcoptions.canonicalize", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_canonicalize), 0x00010000, "Do we want the KDC to canonicalize the principal or not", HFILL }},
+        { &hf_krb_KDCOptions_opt_hardware_auth, {
+                "Opt HW Auth", "kerberos.kdcoptions.opt_hardware_auth", FT_BOOLEAN, 32,
+                NULL, 0x00100000, "Opt HW Auth flag", HFILL }},
+        { &hf_krb_KDCOptions_disable_transited_check, {
+                "Disable Transited Check", "kerberos.kdcoptions.disable_transited_check", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_disable_transited_check), 0x00000020, "Whether we should do transited checking or not", HFILL }},
+        { &hf_krb_KDCOptions_renewable_ok, {
+                "Renewable OK", "kerberos.kdcoptions.renewable_ok", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_renewable_ok), 0x00000010, "Whether we accept renewed tickets or not", HFILL }},
+        { &hf_krb_KDCOptions_enc_tkt_in_skey, {
+                "Enc-Tkt-in-Skey", "kerberos.kdcoptions.enc_tkt_in_skey", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_enc_tkt_in_skey), 0x00000008, "Whether the ticket is encrypted in the skey or not", HFILL }},
+        { &hf_krb_KDCOptions_renew, {
+                "Renew", "kerberos.kdcoptions.renew", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_renew), 0x00000002, "Is this a request to renew a ticket?", HFILL }},
+        { &hf_krb_KDCOptions_validate, {
+                "Validate", "kerberos.kdcoptions.validate", FT_BOOLEAN, 32,
+                TFS(&krb5_kdcoptions_validate), 0x00000001, "Is this a request to validate a postdated ticket?", HFILL }},
+        { &hf_krb_pvno, {
+                "Pvno", "kerberos.pvno", FT_UINT32, BASE_DEC,
+                NULL, 0, "Kerberos Protocol Version Number", HFILL }},
+        { &hf_krb_kvno, {
+                "Kvno", "kerberos.kvno", FT_UINT32, BASE_DEC,
+                NULL, 0, "Version Number for the encryption Key", HFILL }},
+        { &hf_krb_checksum_type, {
+                "Type", "kerberos.checksum.type", FT_UINT32, BASE_DEC,
+                VALS(krb5_checksum_types), 0, "Type of checksum", HFILL }},
+        { &hf_krb_authenticator_vno, {
+                "Authenticator vno", "kerberos.authenticator_vno", FT_UINT32, BASE_DEC,
+                NULL, 0, "Version Number for the Authenticator", HFILL }},
+        { &hf_krb_encrypted_authenticator_data, {
+                "Authenticator data", "kerberos.authenticator.data", FT_BYTES, BASE_NONE,
+                NULL, 0, "Data content of an encrypted authenticator", HFILL }},
+        { &hf_krb_encrypted_EncKrbCredPart, {
+                "enc EncKrbCredPart", "kerberos.EncKrbCredPart.encrypted", FT_BYTES, BASE_NONE,
+                NULL, 0, "Encrypted EncKrbCredPart blob", HFILL }},
+        { &hf_krb_encrypted_PA_ENC_TIMESTAMP, {
+                "enc PA_ENC_TIMESTAMP", "kerberos.PA_ENC_TIMESTAMP.encrypted", FT_BYTES, BASE_NONE,
+                NULL, 0, "Encrypted PA-ENC-TIMESTAMP blob", HFILL }},
+        { &hf_krb_encrypted_enc_authorization_data, {
+                "enc-authorization-data", "kerberos.enc_authorization_data.encrypted", FT_BYTES, BASE_NONE,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_PAC_LOGON_INFO, {
+                "PAC_LOGON_INFO", "kerberos.PAC_LOGON_INFO", FT_BYTES, BASE_NONE,
+                NULL, 0, "PAC_LOGON_INFO structure", HFILL }},
+        { &hf_krb_PAC_CREDENTIAL_TYPE, {
+                "PAC_CREDENTIAL_TYPE", "kerberos.PAC_CREDENTIAL_TYPE", FT_BYTES, BASE_NONE,
+                NULL, 0, "PAC_CREDENTIAL_TYPE structure", HFILL }},
+        { &hf_krb_PAC_SERVER_CHECKSUM, {
+                "PAC_SERVER_CHECKSUM", "kerberos.PAC_SERVER_CHECKSUM", FT_BYTES, BASE_NONE,
+                NULL, 0, "PAC_SERVER_CHECKSUM structure", HFILL }},
+        { &hf_krb_PAC_PRIVSVR_CHECKSUM, {
+                "PAC_PRIVSVR_CHECKSUM", "kerberos.PAC_PRIVSVR_CHECKSUM", FT_BYTES, BASE_NONE,
+                NULL, 0, "PAC_PRIVSVR_CHECKSUM structure", HFILL }},
+        { &hf_krb_PAC_CLIENT_INFO_TYPE, {
+                "PAC_CLIENT_INFO_TYPE", "kerberos.PAC_CLIENT_INFO_TYPE", FT_BYTES, BASE_NONE,
+                NULL, 0, "PAC_CLIENT_INFO_TYPE structure", HFILL }},
+        { &hf_krb_PAC_S4U_DELEGATION_INFO, {
+                "PAC_S4U_DELEGATION_INFO", "kerberos.PAC_S4U_DELEGATION_INFO", FT_BYTES, BASE_NONE,
+                NULL, 0, "PAC_S4U_DELEGATION_INFO structure", HFILL }},
+        { &hf_krb_PAC_UPN_DNS_INFO, {
+                "UPN_DNS_INFO", "kerberos.PAC_UPN_DNS_INFO", FT_BYTES, BASE_NONE,
+                NULL, 0, "UPN_DNS_INFO structure", HFILL }},
+        { &hf_krb_checksum_checksum, {
+                "checksum", "kerberos.checksum.checksum", FT_BYTES, BASE_NONE,
+                NULL, 0, "Kerberos Checksum", HFILL }},
+        { &hf_krb_ENC_PRIV, {
+                "enc PRIV", "kerberos.ENC_PRIV", FT_BYTES, BASE_NONE,
+                NULL, 0, "Encrypted PRIV blob", HFILL }},
+        { &hf_krb_encrypted_Ticket_data, {
+                "enc-part", "kerberos.ticket.data", FT_BYTES, BASE_NONE,
+                NULL, 0, "The encrypted part of a ticket", HFILL }},
+        { &hf_krb_encrypted_AP_REP_data, {
+                "enc-part", "kerberos.aprep.data", FT_BYTES, BASE_NONE,
+                NULL, 0, "The encrypted part of AP-REP", HFILL }},
+        { &hf_krb_encrypted_KDC_REP_data, {
+                "enc-part", "kerberos.kdcrep.data", FT_BYTES, BASE_NONE,
+                NULL, 0, "The encrypted part of KDC-REP", HFILL }},
+        { &hf_krb_PA_DATA_value, {
+                "Value", "kerberos.padata.value", FT_BYTES, BASE_NONE,
+                NULL, 0, "Content of the PADATA blob", HFILL }},
+        { &hf_krb_etype_info_salt, {
+                "Salt", "kerberos.etype_info.salt", FT_BYTES, BASE_NONE,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_etype_info2_salt, {
+                "Salt", "kerberos.etype_info2.salt", FT_BYTES, BASE_NONE,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_etype_info2_s2kparams, {
+                "Salt", "kerberos.etype_info.s2kparams", FT_BYTES, BASE_NONE,
+                NULL, 0, "S2kparams", HFILL }},
+        { &hf_krb_SAFE_BODY_user_data, {
+                "User Data", "kerberos.SAFE_BODY.user_data", FT_BYTES, BASE_NONE,
+                NULL, 0, "SAFE BODY userdata field", HFILL }},
+        { &hf_krb_PRIV_BODY_user_data, {
+                "User Data", "kerberos.PRIV_BODY.user_data", FT_BYTES, BASE_NONE,
+                NULL, 0, "PRIV BODY userdata field", HFILL }},
+        { &hf_krb_pac_signature_signature, {
+                "Signature", "kerberos.pac.signature.signature", FT_BYTES, BASE_NONE,
+                NULL, 0, "A PAC signature blob", HFILL }},
+        { &hf_krb_PA_DATA_type, {
+                "Type", "kerberos.padata.type", FT_INT32, BASE_DEC,
+                VALS(krb5_preauthentication_types), 0, "Type of preauthentication data", HFILL }},
+        { &hf_krb_nonce, {
+                "Nonce", "kerberos.nonce", FT_UINT32, BASE_DEC,
+                NULL, 0, "Kerberos Nonce random number", HFILL }},
+        { &hf_krb_tkt_vno, {
+                "Tkt-vno", "kerberos.tkt_vno", FT_UINT32, BASE_DEC,
+                NULL, 0, "Version number for the Ticket format", HFILL }},
+        { &hf_krb_KrbCredInfo, {
+                "KrbCredInfo", "kerberos.KrbCredInfo", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a Kerberos KrbCredInfo", HFILL }},
+        { &hf_krb_HostAddress, {
+                "HostAddress", "kerberos.hostaddress", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a Kerberos HostAddress sequence", HFILL }},
+        { &hf_krb_s_address, {
+                "S-Address", "kerberos.s_address", FT_NONE, BASE_NONE,
+                NULL, 0, "This is the Senders address", HFILL }},
+        { &hf_krb_r_address, {
+                "R-Address", "kerberos.r_address", FT_NONE, BASE_NONE,
+                NULL, 0, "This is the Recipient address", HFILL }},
+        { &hf_krb_key, {
+                "key", "kerberos.key", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a Kerberos EncryptionKey sequence", HFILL }},
+        { &hf_krb_subkey, {
+                "Subkey", "kerberos.subkey", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a Kerberos subkey", HFILL }},
+        { &hf_krb_seq_number, {
+                "Seq Number", "kerberos.seq_number", FT_UINT32, BASE_DEC,
+                NULL, 0, "This is a Kerberos sequence number", HFILL }},
+        { &hf_krb_AuthorizationData, {
+                "AuthorizationData", "kerberos.AuthorizationData", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a Kerberos AuthorizationData sequence", HFILL }},
+        { &hf_krb_EncTicketPart, {
+                "EncTicketPart", "kerberos.EncTicketPart", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a decrypted Kerberos EncTicketPart sequence", HFILL }},
+        { &hf_krb_EncAPRepPart, {
+                "EncAPRepPart", "kerberos.EncAPRepPart", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a decrypted Kerberos EncAPRepPart sequence", HFILL }},
+        { &hf_krb_EncKrbPrivPart, {
+                "EncKrbPrivPart", "kerberos.EncKrbPrivPart", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a decrypted Kerberos EncKrbPrivPart sequence", HFILL }},
+        { &hf_krb_EncKrbCredPart, {
+                "EncKrbCredPart", "kerberos.EncKrbCredPart", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a decrypted Kerberos EncKrbCredPart sequence", HFILL }},
+        { &hf_krb_EncKDCRepPart, {
+                "EncKDCRepPart", "kerberos.EncKDCRepPart", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a decrypted Kerberos EncKDCRepPart sequence", HFILL }},
+        { &hf_krb_LastReq, {
+                "LastReq", "kerberos.LastReq", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a LastReq sequence", HFILL }},
+        { &hf_krb_Authenticator, {
+                "Authenticator", "kerberos.Authenticator", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a decrypted Kerberos Authenticator sequence", HFILL }},
+        { &hf_krb_Checksum, {
+                "Checksum", "kerberos.Checksum", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a Kerberos Checksum sequence", HFILL }},
+        { &hf_krb_HostAddresses, {
+                "HostAddresses", "kerberos.hostaddresses", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a list of Kerberos HostAddress sequences", HFILL }},
+        { &hf_krb_IF_RELEVANT, {
+                "IF_RELEVANT", "kerberos.if_relevant", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a list of IF-RELEVANT sequences", HFILL }},
+        { &hf_krb_etypes, {
+                "Encryption Types", "kerberos.etypes", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a list of Kerberos encryption types", HFILL }},
+        { &hf_krb_KrbCredInfos, {
+                "Sequence of KrbCredInfo", "kerberos.KrbCredInfos", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a list of KrbCredInfo", HFILL }},
+        { &hf_krb_sq_tickets, {
+                "Tickets", "kerberos.sq.tickets", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a list of Kerberos Tickets", HFILL }},
+        { &hf_krb_LastReqs, {
+                "LastReqs", "kerberos.LastReqs", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a list of LastReq structures", HFILL }},
+        { &hf_krb_sname, {
+                "Server Name", "kerberos.sname", FT_NONE, BASE_NONE,
+                NULL, 0, "This is the name part server's identity", HFILL }},
+        { &hf_krb_pname, {
+                "Delegated Principal Name", "kerberos.pname", FT_NONE, BASE_NONE,
+                NULL, 0, "Identity of the delegated principal", HFILL }},
+        { &hf_krb_cname, {
+                "Client Name", "kerberos.cname", FT_NONE, BASE_NONE,
+                NULL, 0, "The name part of the client principal identifier", HFILL }},
+        { &hf_krb_authenticator_enc, {
+                "Authenticator", "kerberos.authenticator", FT_NONE, BASE_NONE,
+                NULL, 0, "Encrypted authenticator blob", HFILL }},
+        { &hf_krb_CRED_enc, {
+                "EncKrbCredPart", "kerberos.encrypted_cred", FT_NONE, BASE_NONE,
+                NULL, 0, "Encrypted Cred blob", HFILL }},
+        { &hf_krb_ticket_enc, {
+                "enc-part", "kerberos.ticket.enc_part", FT_NONE, BASE_NONE,
+                NULL, 0, "The structure holding the encrypted part of a ticket", HFILL }},
+        { &hf_krb_AP_REP_enc, {
+                "enc-part", "kerberos.aprep.enc_part", FT_NONE, BASE_NONE,
+                NULL, 0, "The structure holding the encrypted part of AP-REP", HFILL }},
+        { &hf_krb_KDC_REP_enc, {
+                "enc-part", "kerberos.kdcrep.enc_part", FT_NONE, BASE_NONE,
+                NULL, 0, "The structure holding the encrypted part of KDC-REP", HFILL }},
+        { &hf_krb_e_data, {
+                "e-data", "kerberos.e_data", FT_NONE, BASE_NONE,
+                NULL, 0, "The e-data blob", HFILL }},
+        { &hf_krb_padata, {
+                "padata", "kerberos.padata", FT_NONE, BASE_NONE,
+                NULL, 0, "Sequence of preauthentication data", HFILL }},
+        { &hf_krb_ticket, {
+                "Ticket", "kerberos.ticket", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a Kerberos Ticket", HFILL }},
+        { &hf_krb_TransitedEncoding, {
+                "TransitedEncoding", "kerberos.TransitedEncoding", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a Kerberos TransitedEncoding sequence", HFILL }},
+        { &hf_krb_PA_PAC_REQUEST_flag, {
+                "PAC Request", "kerberos.pac_request.flag", FT_BOOLEAN, 32,
+                NULL, 0, "This is a MS PAC Request Flag", HFILL }},
+        { &hf_krb_w2k_pac_entries, {
+                "Num Entries", "kerberos.pac.entries", FT_UINT32, BASE_DEC,
+                NULL, 0, "Number of W2k PAC entries", HFILL }},
+        { &hf_krb_w2k_pac_version, {
+                "Version", "kerberos.pac.version", FT_UINT32, BASE_DEC,
+                NULL, 0, "Version of PAC structures", HFILL }},
+        { &hf_krb_w2k_pac_type, {
+                "Type", "kerberos.pac.type", FT_UINT32, BASE_DEC,
+                VALS(w2k_pac_types), 0, "Type of W2k PAC entry", HFILL }},
+        { &hf_krb_w2k_pac_size, {
+                "Size", "kerberos.pac.size", FT_UINT32, BASE_DEC,
+                NULL, 0, "Size of W2k PAC entry", HFILL }},
+        { &hf_krb_w2k_pac_offset, {
+                "Offset", "kerberos.pac.offset", FT_UINT32, BASE_DEC,
+                NULL, 0, "Offset to W2k PAC entry", HFILL }},
+        { &hf_krb_pac_clientid, {
+                "ClientID", "kerberos.pac.clientid", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL,
+                NULL, 0, "ClientID Timestamp", HFILL }},
+        { &hf_krb_pac_namelen, {
+                "Name Length", "kerberos.pac.namelen", FT_UINT16, BASE_DEC,
+                NULL, 0, "Length of client name", HFILL }},
+        { &hf_krb_pac_upn_flags, {
+                "Flags", "kerberos.pac.upn.flags", FT_UINT32, BASE_HEX,
+                NULL, 0, "UPN flags", HFILL }},
+        { &hf_krb_pac_upn_dns_offset, {
+                "DNS Offset", "kerberos.pac.upn.dns_offset", FT_UINT16, BASE_DEC,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_pac_upn_dns_len, {
+                "DNS Len", "kerberos.pac.upn.dns_len", FT_UINT16, BASE_DEC,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_pac_upn_upn_offset, {
+                "UPN Offset", "kerberos.pac.upn.upn_offset", FT_UINT16, BASE_DEC,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_pac_upn_upn_len, {
+                "UPN Len", "kerberos.pac.upn.upn_len", FT_UINT16, BASE_DEC,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_pac_upn_upn_name, {
+                "UPN Name", "kerberos.pac.upn.upn_name", FT_STRING, BASE_NONE,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_pac_upn_dns_name, {
+                "DNS Name", "kerberos.pac.upn.dns_name", FT_STRING, BASE_NONE,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_e_checksum, {
+                "e-checksum", "kerberos.e_checksum", FT_NONE, BASE_NONE,
+                NULL, 0, "This is a Kerberos e-checksum", HFILL }},
+        { &hf_krb_gssapi_len, {
+                "Length", "kerberos.gssapi.len", FT_UINT32, BASE_DEC,
+                NULL, 0, "Length of GSSAPI Bnd field", HFILL }},
+        { &hf_krb_gssapi_bnd, {
+                "Bnd", "kerberos.gssapi.bdn", FT_BYTES, BASE_NONE,
+                NULL, 0, "GSSAPI Bnd field", HFILL }},
+        { &hf_krb_gssapi_c_flag_deleg, {
+                "Deleg", "kerberos.gssapi.checksum.flags.deleg", FT_BOOLEAN, 32,
+                TFS(&tfs_gss_flags_deleg), KRB5_GSS_C_DELEG_FLAG, NULL, HFILL }},
+        { &hf_krb_gssapi_c_flag_mutual, {
+                "Mutual", "kerberos.gssapi.checksum.flags.mutual", FT_BOOLEAN, 32,
+                TFS(&tfs_gss_flags_mutual), KRB5_GSS_C_MUTUAL_FLAG, NULL, HFILL }},
+        { &hf_krb_gssapi_c_flag_replay, {
+                "Replay", "kerberos.gssapi.checksum.flags.replay", FT_BOOLEAN, 32,
+                TFS(&tfs_gss_flags_replay), KRB5_GSS_C_REPLAY_FLAG, NULL, HFILL }},
+        { &hf_krb_gssapi_c_flag_sequence, {
+                "Sequence", "kerberos.gssapi.checksum.flags.sequence", FT_BOOLEAN, 32,
+                TFS(&tfs_gss_flags_sequence), KRB5_GSS_C_SEQUENCE_FLAG, NULL, HFILL }},
+        { &hf_krb_gssapi_c_flag_conf, {
+                "Conf", "kerberos.gssapi.checksum.flags.conf", FT_BOOLEAN, 32,
+                TFS(&tfs_gss_flags_conf), KRB5_GSS_C_CONF_FLAG, NULL, HFILL }},
+        { &hf_krb_gssapi_c_flag_integ, {
+                "Integ", "kerberos.gssapi.checksum.flags.integ", FT_BOOLEAN, 32,
+                TFS(&tfs_gss_flags_integ), KRB5_GSS_C_INTEG_FLAG, NULL, HFILL }},
+        { &hf_krb_gssapi_c_flag_dce_style, {
+                "DCE-style", "kerberos.gssapi.checksum.flags.dce-style", FT_BOOLEAN, 32,
+                TFS(&tfs_gss_flags_dce_style), KRB5_GSS_C_DCE_STYLE, NULL, HFILL }},
+        { &hf_krb_gssapi_dlgopt, {
+                "DlgOpt", "kerberos.gssapi.dlgopt", FT_UINT16, BASE_DEC,
+                NULL, 0, "GSSAPI DlgOpt", HFILL }},
+        { &hf_krb_gssapi_dlglen, {
+                "DlgLen", "kerberos.gssapi.dlglen", FT_UINT16, BASE_DEC,
+                NULL, 0, "GSSAPI DlgLen", HFILL }},
+        { &hf_krb_smb_nt_status, {
+                "NT Status", "kerberos.smb.nt_status", FT_UINT32, BASE_HEX,
+                VALS(NT_errors), 0, "NT Status code", HFILL }},
+        { &hf_krb_smb_unknown, {
+                "Unknown", "kerberos.smb.unknown", FT_UINT32, BASE_HEX,
+                NULL, 0, NULL, HFILL }},
+        { &hf_krb_midl_blob_len, {
+                "Blob Length", "kerberos.midl_blob_len", FT_UINT64, BASE_DEC,
+                NULL, 0, "Length of NDR encoded data that follows", HFILL }},
+        { &hf_krb_midl_fill_bytes, {
+                "Fill bytes", "kerberos.midl.fill_bytes", FT_UINT32, BASE_HEX,
+                NULL, 0, "Just some fill bytes", HFILL }},
+        { &hf_krb_midl_version, {
+                "Version", "kerberos.midl.version", FT_UINT8, BASE_DEC,
+                NULL, 0, "Version of pickling", HFILL }},
+        { &hf_krb_midl_hdr_len, {
+                "HDR Length", "kerberos.midl.hdr_len", FT_UINT16, BASE_DEC,
+                NULL, 0, "Length of header", HFILL }},
 
     };
 
     static gint *ett[] = {
         &ett_krb_kerberos,
-       &ett_krb_KDC_REP_enc,
+        &ett_krb_KDC_REP_enc,
         &ett_krb_sname,
         &ett_krb_pname,
         &ett_krb_cname,
-       &ett_krb_AP_REP_enc,
+        &ett_krb_AP_REP_enc,
         &ett_krb_padata,
         &ett_krb_etypes,
         &ett_krb_KrbCredInfos,
         &ett_krb_sq_tickets,
         &ett_krb_LastReqs,
         &ett_krb_IF_RELEVANT,
-       &ett_krb_PA_DATA_tree,
+        &ett_krb_PA_DATA_tree,
         &ett_krb_s_address,
         &ett_krb_r_address,
         &ett_krb_KrbCredInfo,
         &ett_krb_HostAddress,
         &ett_krb_HostAddresses,
-       &ett_krb_authenticator_enc,
-       &ett_krb_CRED_enc,
+        &ett_krb_authenticator_enc,
+        &ett_krb_CRED_enc,
         &ett_krb_AP_Options,
         &ett_krb_KDC_Options,
         &ett_krb_Ticket_Flags,
         &ett_krb_request,
         &ett_krb_recordmark,
         &ett_krb_ticket,
-       &ett_krb_ticket_enc,
+        &ett_krb_ticket_enc,
         &ett_krb_CRED,
         &ett_krb_PRIV,
         &ett_krb_PRIV_enc,
@@ -5341,18 +5394,17 @@ proto_register_kerberos(void)
         &ett_krb_key,
         &ett_krb_subkey,
         &ett_krb_AuthorizationData,
-       &ett_krb_TransitedEncoding,
-       &ett_krb_PAC,
-       &ett_krb_PAC_LOGON_INFO,
-       &ett_krb_PAC_CREDENTIAL_TYPE,
-       &ett_krb_PAC_SERVER_CHECKSUM,
-       &ett_krb_PAC_PRIVSVR_CHECKSUM,
-       &ett_krb_PAC_CLIENT_INFO_TYPE,
-       &ett_krb_PAC_CONSTRAINED_DELEGATION,
-       &ett_krb_e_checksum,
-       &ett_krb_PAC_MIDL_BLOB,
-       &ett_krb_PAC_DREP,
-       &ett_krb_PAC_UPN_DNS_INFO
+        &ett_krb_TransitedEncoding,
+        &ett_krb_PAC,
+        &ett_krb_PAC_LOGON_INFO,
+        &ett_krb_PAC_SERVER_CHECKSUM,
+        &ett_krb_PAC_PRIVSVR_CHECKSUM,
+        &ett_krb_PAC_CLIENT_INFO_TYPE,
+        &ett_krb_PAC_S4U_DELEGATION_INFO,
+        &ett_krb_e_checksum,
+        &ett_krb_PAC_MIDL_BLOB,
+        &ett_krb_PAC_DREP,
+        &ett_krb_PAC_UPN_DNS_INFO
     };
     module_t *krb_module;
 
@@ -5363,68 +5415,69 @@ proto_register_kerberos(void)
     /* Register preferences */
     krb_module = prefs_register_protocol(proto_kerberos, kerberos_prefs_apply_cb);
     prefs_register_bool_preference(krb_module, "desegment",
-       "Reassemble Kerberos over TCP messages spanning multiple TCP segments",
-       "Whether the Kerberos dissector should reassemble messages spanning multiple TCP segments."
-       " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
-    &krb_desegment);
+        "Reassemble Kerberos over TCP messages spanning multiple TCP segments",
+        "Whether the Kerberos dissector should reassemble messages spanning multiple TCP segments."
+        " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
+        &krb_desegment);
 #ifdef HAVE_KERBEROS
     prefs_register_bool_preference(krb_module, "decrypt",
-       "Try to decrypt Kerberos blobs",
-       "Whether the dissector should try to decrypt "
-       "encrypted Kerberos blobs. This requires that the proper "
-       "keytab file is installed as well.", &krb_decrypt);
-
-       prefs_register_string_preference(krb_module, "file",
-                                  "Kerberos keytab file",
-                                  "The keytab file containing all the secrets",
-                                  &keytab_filename);
+        "Try to decrypt Kerberos blobs",
+        "Whether the dissector should try to decrypt "
+        "encrypted Kerberos blobs. This requires that the proper "
+        "keytab file is installed as well.",
+        &krb_decrypt);
+
+    prefs_register_string_preference(krb_module, "file",
+        "Kerberos keytab file",
+        "The keytab file containing all the secrets",
+        &keytab_filename);
 #endif
 
 }
 
 static int wrap_dissect_gss_kerb(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                                proto_tree *tree, guint8 *drep _U_)
+                                 proto_tree *tree, guint8 *drep _U_)
 {
-       tvbuff_t *auth_tvb;
+    tvbuff_t *auth_tvb;
 
-       auth_tvb = tvb_new_subset(
-               tvb, offset, tvb_length_remaining(tvb, offset),
-               tvb_reported_length_remaining(tvb, offset));
+    auth_tvb = tvb_new_subset(
+        tvb, offset, tvb_length_remaining(tvb, offset),
+        tvb_reported_length_remaining(tvb, offset));
 
-       dissect_kerberos_main(auth_tvb, pinfo, tree, FALSE, NULL);
+    dissect_kerberos_main(auth_tvb, pinfo, tree, FALSE, NULL);
 
-       return tvb_length_remaining(tvb, offset);
+    return tvb_length_remaining(tvb, offset);
 }
 
 
 static dcerpc_auth_subdissector_fns gss_kerb_auth_connect_fns = {
-       wrap_dissect_gss_kerb,                  /* Bind */
-       wrap_dissect_gss_kerb,                  /* Bind ACK */
-       wrap_dissect_gss_kerb,                  /* AUTH3 */
-       NULL,                                   /* Request verifier */
-       NULL,                                   /* Response verifier */
-       NULL,                                   /* Request data */
-       NULL                                    /* Response data */
+    wrap_dissect_gss_kerb,                      /* Bind */
+    wrap_dissect_gss_kerb,                      /* Bind ACK */
+    wrap_dissect_gss_kerb,                      /* AUTH3 */
+    NULL,                                       /* Request verifier */
+    NULL,                                       /* Response verifier */
+    NULL,                                       /* Request data */
+    NULL                                        /* Response data */
 };
 
 static dcerpc_auth_subdissector_fns gss_kerb_auth_sign_fns = {
-       wrap_dissect_gss_kerb,                  /* Bind */
-       wrap_dissect_gss_kerb,                  /* Bind ACK */
-       wrap_dissect_gss_kerb,                  /* AUTH3 */
-       wrap_dissect_gssapi_verf,               /* Request verifier */
-       wrap_dissect_gssapi_verf,               /* Response verifier */
-       NULL,                                   /* Request data */
-       NULL                                    /* Response data */
+    wrap_dissect_gss_kerb,                      /* Bind */
+    wrap_dissect_gss_kerb,                      /* Bind ACK */
+    wrap_dissect_gss_kerb,                      /* AUTH3 */
+    wrap_dissect_gssapi_verf,                   /* Request verifier */
+    wrap_dissect_gssapi_verf,                   /* Response verifier */
+    NULL,                                       /* Request data */
+    NULL                                        /* Response data */
 };
 
 static dcerpc_auth_subdissector_fns gss_kerb_auth_seal_fns = {
-       wrap_dissect_gss_kerb,                  /* Bind */
-       wrap_dissect_gss_kerb,                  /* Bind ACK */
-       wrap_dissect_gss_kerb,                  /* AUTH3 */
-       wrap_dissect_gssapi_verf,               /* Request verifier */
-       wrap_dissect_gssapi_verf,               /* Response verifier */
-       wrap_dissect_gssapi_payload,            /* Request data */
-       wrap_dissect_gssapi_payload             /* Response data */
+    wrap_dissect_gss_kerb,                      /* Bind */
+    wrap_dissect_gss_kerb,                      /* Bind ACK */
+    wrap_dissect_gss_kerb,                      /* AUTH3 */
+    wrap_dissect_gssapi_verf,                   /* Request verifier */
+    wrap_dissect_gssapi_verf,                   /* Response verifier */
+    wrap_dissect_gssapi_payload,                /* Request data */
+    wrap_dissect_gssapi_payload                 /* Response data */
 };
 
 
@@ -5436,23 +5489,23 @@ proto_reg_handoff_kerberos(void)
     krb4_handle = find_dissector("krb4");
 
     kerberos_handle_udp = new_create_dissector_handle(dissect_kerberos_udp,
-       proto_kerberos);
+                                                      proto_kerberos);
     kerberos_handle_tcp = create_dissector_handle(dissect_kerberos_tcp,
-       proto_kerberos);
-    dissector_add("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
-    dissector_add("tcp.port", TCP_PORT_KERBEROS, kerberos_handle_tcp);
+                                                  proto_kerberos);
+    dissector_add_uint("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
+    dissector_add_uint("tcp.port", TCP_PORT_KERBEROS, kerberos_handle_tcp);
 
     register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_CONNECT,
-                                     DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
-                                     &gss_kerb_auth_connect_fns);
+                                      DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
+                                      &gss_kerb_auth_connect_fns);
 
     register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_PKT_INTEGRITY,
-                                     DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
-                                     &gss_kerb_auth_sign_fns);
+                                      DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
+                                      &gss_kerb_auth_sign_fns);
 
     register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_PKT_PRIVACY,
-                                     DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
-                                     &gss_kerb_auth_seal_fns);
+                                      DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
+                                      &gss_kerb_auth_seal_fns);
 
 }