RFC6113 errors
authorStefan Metzmacher <metze@samba.org>
Fri, 20 Feb 2015 17:47:56 +0000 (18:47 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 17 Oct 2018 14:09:07 +0000 (16:09 +0200)
Change-Id: I2b95bc257762cc8734386171da1bf574220c4530

epan/dissectors/asn1/kerberos/kerberos.cnf
epan/dissectors/asn1/kerberos/packet-kerberos-template.c

index 03a6031eeaac2acc08e5db9baa28883896063148..7341b5cd2b8c8180a234df1a22383561ca0f089f 100644 (file)
@@ -151,6 +151,10 @@ guint32 msgtype;
        case KRB5_ET_KRB5KDC_ERR_PREAUTH_FAILED:
        case KRB5_ET_KRB5KDC_ERR_ETYPE_NOSUPP:
        case KRB5_ET_KDC_ERR_WRONG_REALM:
+       case KRB5_ET_KDC_ERR_PREAUTH_EXPIRED:
+       case KRB5_ET_KDC_ERR_MORE_PREAUTH_DATA_REQUIRED:
+       case KRB5_ET_KDC_ERR_PREAUTH_BAD_AUTHENTICATION_SET:
+       case KRB5_ET_KDC_ERR_UNKNOWN_CRITICAL_FAST_OPTIONS:
                offset=dissect_ber_octet_string_wcb(FALSE, actx, tree, tvb, offset, hf_kerberos_e_data, dissect_kerberos_SEQUENCE_OF_PA_DATA);
 
                break;
index 4a0f25e6ffffa06342de4bde45bbd2d86ce62c3e..c92a35656b2fad8a66aba82d2e737ccf7f11ee69 100644 (file)
@@ -1177,6 +1177,10 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo,
 #define KRB5_ET_KDC_ERR_REVOCATION_STATUS_UNAVAILABLE  74
 #define KRB5_ET_KDC_ERR_CLIENT_NAME_MISMATCH           75
 #define KRB5_ET_KDC_ERR_KDC_NAME_MISMATCH              76
+#define KRB5_ET_KDC_ERR_PREAUTH_EXPIRED                        90
+#define KRB5_ET_KDC_ERR_MORE_PREAUTH_DATA_REQUIRED     91
+#define KRB5_ET_KDC_ERR_PREAUTH_BAD_AUTHENTICATION_SET 92
+#define KRB5_ET_KDC_ERR_UNKNOWN_CRITICAL_FAST_OPTIONS  93
 
 static const value_string krb5_error_codes[] = {
        { KRB5_ET_KRB5KDC_ERR_NONE, "KRB5KDC_ERR_NONE" },
@@ -1248,6 +1252,10 @@ static const value_string krb5_error_codes[] = {
        { 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" },
+       { KRB5_ET_KDC_ERR_PREAUTH_EXPIRED, "KDC_ERR_PREAUTH_EXPIRED" },
+       { KRB5_ET_KDC_ERR_MORE_PREAUTH_DATA_REQUIRED, "KDC_ERR_MORE_PREAUTH_DATA_REQUIRED" },
+       { KRB5_ET_KDC_ERR_PREAUTH_BAD_AUTHENTICATION_SET, "KDC_ERR_PREAUTH_BAD_AUTHENTICATION_SET" },
+       { KRB5_ET_KDC_ERR_UNKNOWN_CRITICAL_FAST_OPTIONS, "KDC_ERR_UNKNOWN_CRITICAL_FAST_OPTIONS" },
        { 0, NULL }
 };