diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-05-16 22:23:16 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-05-16 22:23:16 +0000 |
| commit | c3836c576e53df00206e15366c59cedc1cb6625a (patch) | |
| tree | 1572155b6ce5e9e91c3c962a723002a532f403c7 /asn1/kerberos/packet-kerberos-template.c | |
| parent | 5e1da6c1a6ddd0ff6bf6792f27596e64788088ca (diff) | |
| download | wireshark-c3836c576e53df00206e15366c59cedc1cb6625a.tar.gz | |
Fix link failure with Windows
svn path=/trunk/; revision=49349
Diffstat (limited to 'asn1/kerberos/packet-kerberos-template.c')
| -rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index 7cf64ac4bd..6a4c02927a 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -153,14 +153,13 @@ static gint ett_krb_recordmark = -1; #include "packet-kerberos-ett.c" -static guint32 krb5_errorcode; - - static dissector_handle_t krb4_handle=NULL; +/* Global variables */ +static guint32 krb5_errorcode; +static guint32 keytype; static gboolean gbl_do_col_info; - static void call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int tag) { @@ -749,12 +748,6 @@ g_warning("woohoo decrypted keytype:%d in frame:%u\n", keytype, pinfo->fd->num); g_free(decrypted_data); return NULL; } -#else -/* Make an empty function if none of the decryption algorithms are defined */ -static void -add_encryption_key(packet_info *pinfo _U_, int keytype _U_, int keylength _U_, const char *keyvalue _U_, const char *origin _U_) -{ -} #endif /* HAVE_MIT_KERBEROS / HAVE_HEIMDAL_KERBEROS / HAVE_LIBNETTLE */ @@ -1845,6 +1838,12 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int d return (dissect_kerberos_common(tvb, pinfo, tree, do_col_info, FALSE, FALSE, cb)); } +guint32 +kerberos_output_keytype(void) +{ + return keytype; +} + static gint dissect_kerberos_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { |