aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ber.c
diff options
context:
space:
mode:
authorgal <gal@f5534014-38df-0310-8fa8-9805f1628bb7>2007-01-13 15:26:13 +0000
committergal <gal@f5534014-38df-0310-8fa8-9805f1628bb7>2007-01-13 15:26:13 +0000
commitcfa1eb0b494df2fc2a4b94b2a4dd45cfd201f890 (patch)
treee79b474786b42d3e673f7bf695c8f4226365ca95 /epan/dissectors/packet-ber.c
parent8b4aef453e7235811119f33f9a5dca69d9480f9f (diff)
New protocol dissector for PKCS#12 - Personal Information Exchange Syntax.
Generally found within a file (.p12 or .pfx) or as a directory attribute (userPKCS12 from iNetOrgPerson). Wiki page and sample file to follow. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20416 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ber.c')
-rw-r--r--epan/dissectors/packet-ber.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index c3f6571737..c3ff73fe1d 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -259,7 +259,7 @@ void ber_decode_as(gchar *syntax)
}
/* Get oid syntax from hash table to get translation in proto dissection(packet-per.c) */
-const char *
+const gchar *
get_ber_oid_syntax(const char *oid)
{
return g_hash_table_lookup(syntax_table, oid);
@@ -280,7 +280,7 @@ void ber_set_filename(gchar *filename)
if((ptr = strrchr(ber_filename, '.')) != NULL) {
- ber_decode_as(get_ber_oid_syntax(ptr));
+ ber_decode_as((gchar *)get_ber_oid_syntax(ptr));
}
}