some authentication stuff from metze

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13584 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index ac3ad4bb95955dbb608ac208dc3ec4a34b4a135e..85d456edb32b4753dd05820d072dca399a6aa769 100644 (file)
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -473,6 +473,12 @@ proto_reg_handoff_gssapi(void)
 {
        data_handle = find_dissector("data");
 
+       register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_CONNECT,
+                                         DCE_C_RPC_AUTHN_PROTOCOL_SPNEGO,
+                                         &gssapi_auth_fns);
+       register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_PKT_INTEGRITY,
+                                         DCE_C_RPC_AUTHN_PROTOCOL_SPNEGO,
+                                         &gssapi_auth_fns);
        register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_PKT_PRIVACY,
                                          DCE_C_RPC_AUTHN_PROTOCOL_SPNEGO,
                                          &gssapi_auth_fns);

diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index b9141c1ce212a901dcce6e676bdd8d652f50aad4..afbee68c2faebcd5690534627098b5aad05a3f70 100644 (file)
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -910,7 +910,7 @@ g_warning("woohoo decrypted keytype:%d in frame:%d\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
 
 /*
  * For KERB_ENCTYPE_RC4_HMAC and KERB_ENCTYPE_RC4_HMAC_EXP, see
@@ -1255,6 +1255,7 @@ 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" },
     { 0                           , NULL },
 };
 
@@ -4401,6 +4402,10 @@ proto_reg_handoff_kerberos(void)
     dissector_add("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
     dissector_add("tcp.port", TCP_PORT_KERBEROS, kerberos_handle_tcp);
 
+    register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_PKT_INTEGRITY,
+                                     DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
+                                     &gss_kerb_auth_fns);
+
     register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_PKT_PRIVACY,
                                      DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
                                      &gss_kerb_auth_fns);