Remove the MIBenum stuff from the WAP code.

MIBenum values are from an IANA registry, not a WAP specification; add
<epan/iana_charsets.h> to declare the MIBenum -> Wireshark encoding
mapper routine and the value_string_ext for MIBenum values, and
epan/iana_charsets.c to define them.

Change-Id: I6d9c82cd011bd5211c688322e6423de38e161f41
Reviewed-on: https://code.wireshark.org/review/15298
Reviewed-by: Guy Harris <guy@alum.mit.edu>

11 files changed, 471 insertions, 388 deletions

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index fec80d289a..1e17bbadc1 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -125,6 +125,7 @@ set(LIBWIRESHARK_FILES
 	geoip_db.c
 	golay.c
 	guid-utils.c
+	iana_charsets.c
 	in_cksum.c
 	ipproto.c
 	ipv4.c
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 51e4581a57..8bd6fff4f2 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -63,6 +63,7 @@ LIBWIRESHARK_SRC =		\
 	geoip_db.c		\
 	golay.c			\
 	guid-utils.c		\
+	iana_charsets.c		\
 	in_cksum.c		\
 	ipproto.c		\
 	ipv4.c			\
@@ -207,6 +208,7 @@ LIBWIRESHARK_INCLUDES =		\
 	geoip_db.h		\
 	golay.h			\
 	guid-utils.h		\
+	iana_charsets.h		\
 	iax2_codec_type.h	\
 	in_cksum.h		\
 	ip_opts.h		\
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c
index 11aca16eae..5fcbc29b1c 100644
--- a/epan/dissectors/packet-btavrcp.c
+++ b/epan/dissectors/packet-btavrcp.c
@@ -28,7 +28,7 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/oui.h>
-#include "packet-wap.h"
+#include <epan/iana_charsets.h>
 #include "packet-btl2cap.h"
 #include "packet-btsdp.h"
 #include "packet-btavctp.h"
@@ -2443,7 +2443,7 @@ proto_register_btavrcp(void)
         },
         { &hf_btavrcp_character_set,
             { "Character Set",                   "btavrcp.character_set",
-            FT_UINT16, BASE_DEC|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00,
+            FT_UINT16, BASE_DEC|BASE_EXT_STRING, &mibenum_vals_character_sets_ext, 0x00,
             NULL, HFILL }
         },
         { &hf_btavrcp_number_of_items,
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index d57d79643a..6d1eeabdea 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -35,6 +35,7 @@
 #include <epan/prefs.h>
 #include <epan/etypes.h>
 #include <epan/to_str.h>
+#include <epan/iana_charsets.h>
 
 #include "packet-btsdp.h"
 #include "packet-btl2cap.h"
@@ -1090,7 +1091,6 @@ static const value_string vs_data_element_type[] = {
 };
 
 extern value_string_ext ext_psm_vals;
-extern value_string_ext wap_mib_enum_vals_character_sets_ext;
 extern value_string_ext usb_langid_vals_ext;
 
 void proto_register_btsdp(void);
@@ -3366,8 +3366,8 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
                 dissect_data_element(entry_tree, &sub_tree, pinfo, tvb, list_offset);
                 list_offset = get_type_length(tvb, list_offset, &entry_length);
                 value = tvb_get_ntohs(tvb, list_offset);
-                wmem_strbuf_append_printf(info_buf, ", Encoding: %s", val_to_str_ext_const(value, &wap_mib_enum_vals_character_sets_ext, "Unknown"));
-                proto_item_append_text(entry_item, ", Encoding: %s", val_to_str_ext_const(value, &wap_mib_enum_vals_character_sets_ext, "Unknown"));
+                wmem_strbuf_append_printf(info_buf, ", Encoding: %s", val_to_str_ext_const(value, &mibenum_vals_character_sets_ext, "Unknown"));
+                proto_item_append_text(entry_item, ", Encoding: %s", val_to_str_ext_const(value, &mibenum_vals_character_sets_ext, "Unknown"));
                 proto_tree_add_item(sub_tree, hf_sdp_lang_encoding, tvb, list_offset, 2, ENC_BIG_ENDIAN);
                 list_offset += entry_length;
 
@@ -6070,7 +6070,7 @@ proto_register_btsdp(void)
         },
         { &hf_sdp_lang_encoding,
             { "Language Encoding",               "btsdp.lang.encoding",
-            FT_UINT16, BASE_DEC | BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0,
+            FT_UINT16, BASE_DEC | BASE_EXT_STRING, &mibenum_vals_character_sets_ext, 0,
             NULL, HFILL }
         },
         { &hf_sdp_lang_attribute_base,
diff --git a/epan/dissectors/packet-wap.c b/epan/dissectors/packet-wap.c
index 1e1d88cb34..a8737f0eea 100644
--- a/epan/dissectors/packet-wap.c
+++ b/epan/dissectors/packet-wap.c
@@ -82,373 +82,6 @@ tvb_get_guintvar (tvbuff_t *tvb, guint offset, guint *octetCount)
 }
 
 /*
- * Map a charset to a Wireshark string encoding.
- *
- * XXX - this is an IANA registry:
- *
- *    http://www.iana.org/assignments/character-sets/character-sets.xhtml
- *
- * so perhaps it should be a general API.
- */
-guint
-wap_charset_to_encoding (guint charset)
-{
-    switch (charset) {
-        case 3:
-            return ENC_NA|ENC_ASCII;
-
-        case 4:
-            return ENC_NA|ENC_ISO_8859_1;
-
-        case 5:
-            return ENC_NA|ENC_ISO_8859_2;
-
-        case 6:
-            return ENC_NA|ENC_ISO_8859_3;
-
-        case 7:
-            return ENC_NA|ENC_ISO_8859_4;
-
-        case 8:
-            return ENC_NA|ENC_ISO_8859_5;
-
-        case 9:
-            return ENC_NA|ENC_ISO_8859_6;
-
-        case 10:
-            return ENC_NA|ENC_ISO_8859_7;
-
-        case 11:
-            return ENC_NA|ENC_ISO_8859_8;
-
-        case 12:
-            return ENC_NA|ENC_ISO_8859_9;
-
-        case 13:
-            return ENC_NA|ENC_ISO_8859_10;
-
-        case 106:
-            return ENC_NA|ENC_UTF_8;
-
-        case 109:
-            return ENC_NA|ENC_ISO_8859_13;
-
-        case 110:
-            return ENC_NA|ENC_ISO_8859_14;
-
-        case 111:
-            return ENC_NA|ENC_ISO_8859_15;
-
-        case 112:
-            return ENC_NA|ENC_ISO_8859_16;
-
-        case 1000:
-            /*
-             * The IANA page says:
-             *
-             *    this needs to specify network byte order: the
-             *    standard does not specify
-             *
-             * so presumably this means "big-endian UCS-2".
-             */
-            return ENC_BIG_ENDIAN|ENC_UCS_2;
-
-        case 1001:
-            /*
-             * The IANA page says the same thing as for UCS-2.
-             */
-            return ENC_BIG_ENDIAN|ENC_UCS_4;
-
-        case 1013:
-            return ENC_BIG_ENDIAN|ENC_UTF_16;
-
-        case 1014:
-            return ENC_LITTLE_ENDIAN|ENC_UTF_16;
-
-        case 1015:
-            /* XXX - UTF-16 with a BOM at the beginning */
-            return ENC_LITTLE_ENDIAN|ENC_UTF_16;
-
-        case 2011:
-            return ENC_NA|ENC_CP437;
-
-        case 2259:
-            return ENC_NA|ENC_ISO_8859_11;
-
-        default:
-            return ENC_NA|ENC_ASCII;
-    }
-}
-
-/* See http://www.iana.org/assignments/character-sets for the MIBenum mapping */
-/* Updated from 10/04/2012 version */
-static const value_string wap_mib_enum_vals_character_sets[] = {
-    {    0, "*" },
-    {    3, "US-ASCII" },
-    {    4, "ISO-8859-1" },
-    {    5, "ISO-8859-2" },
-    {    6, "ISO-8859-3" },
-    {    7, "ISO-8859-4" },
-    {    8, "ISO-8859-5" },
-    {    9, "ISO-8859-6" },
-    {   10, "ISO-8859-7" },
-    {   11, "ISO-8859-8" },
-    {   12, "ISO-8859-9" },
-    {   13, "ISO-8859-10" },
-    {   14, "ISO_6937-2-add" },
-    {   15, "JIS_X0201" },
-    {   16, "JIS_Encoding" },
-    {   17, "Shift_JIS" },
-    {   18, "EUC-JP" },
-    {   19, "Extended_UNIX_Code_Fixed_Width_for_Japanese" },
-    {   20, "BS_4730" },
-    {   21, "SEN_850200_C" },
-    {   22, "IT" },
-    {   23, "ES" },
-    {   24, "DIN_66003" },
-    {   25, "NS_4551-1" },
-    {   26, "NF_Z_62-010" },
-    {   27, "ISO-10646-UTF-1" },
-    {   28, "ISO_646.basic:1983" },
-    {   29, "INVARIANT" },
-    {   30, "ISO_646.irv:1983" },
-    {   31, "NATS-SEFI" },
-    {   32, "NATS-SEFI-ADD" },
-    {   33, "NATS-DANO" },
-    {   34, "NATS-DANO-ADD" },
-    {   35, "SEN_850200_B" },
-    {   36, "KS_C_5601-1987" },
-    {   37, "ISO-2022-KR" },
-    {   38, "EUC-KR" },
-    {   39, "ISO-2022-JP" },
-    {   40, "ISO-2022-JP-2" },
-    {   41, "JIS_C6220-1969-jp" },
-    {   42, "JIS_C6220-1969-ro" },
-    {   43, "PT" },
-    {   44, "greek7-old" },
-    {   45, "latin-greek" },
-    {   46, "NF_Z_62-010_(1973)" },
-    {   47, "Latin-greek-1" },
-    {   48, "ISO_5427" },
-    {   49, "JIS_C6226-1978" },
-    {   50, "BS_viewdata" },
-    {   51, "INIS" },
-    {   52, "INIS-8" },
-    {   53, "INIS-cyrillic" },
-    {   54, "ISO_5427:1981" },
-    {   55, "ISO_5428:1980" },
-    {   56, "GB_1988-80" },
-    {   57, "GB_2312-80" },
-    {   58, "NS_4551-2" },
-    {   59, "videotex-suppl" },
-    {   60, "PT2" },
-    {   61, "ES2" },
-    {   62, "MSZ_7795.3" },
-    {   63, "JIS_C6226-1983" },
-    {   64, "greek7" },
-    {   65, "ASMO_449" },
-    {   66, "iso-ir-90" },
-    {   67, "JIS_C6229-1984-a" },
-    {   68, "JIS_C6229-1984-b" },
-    {   69, "JIS_C6229-1984-b-add" },
-    {   70, "JIS_C6229-1984-hand" },
-    {   71, "JIS_C6229-1984-hand-add" },
-    {   72, "JIS_C6229-1984-kana" },
-    {   73, "ISO_2033-1983" },
-    {   74, "ANSI_X3.110-1983" },
-    {   75, "T.61-7bit" },
-    {   76, "T.61-8bit" },
-    {   77, "ECMA-cyrillic" },
-    {   78, "CSA_Z243.4-1985-1" },
-    {   79, "CSA_Z243.4-1985-2" },
-    {   80, "CSA_Z243.4-1985-gr" },
-    {   81, "ISO-8859-6-E" },
-    {   82, "ISO-8859-6-I" },
-    {   83, "T.101-G2" },
-    {   84, "ISO-8859-8-E" },
-    {   85, "ISO-8859-8-I" },
-    {   86, "CSN_369103" },
-    {   87, "JUS_I.B1.002" },
-    {   88, "IEC_P27-1" },
-    {   89, "JUS_I.B1.003-serb" },
-    {   90, "JUS_I.B1.003-mac" },
-    {   91, "greek-ccitt" },
-    {   92, "NC_NC00-10:81" },
-    {   93, "ISO_6937-2-25" },
-    {   94, "GOST_19768-74" },
-    {   95, "ISO_8859-supp" },
-    {   96, "ISO_10367-box" },
-    {   97, "latin-lap" },
-    {   98, "JIS_X0212-1990" },
-    {   99, "DS_2089" },
-    {  100, "us-dk" },
-    {  101, "dk-us" },
-    {  102, "KSC5636" },
-    {  103, "UNICODE-1-1-UTF-7" },
-    {  104, "ISO-2022-CN" },
-    {  105, "ISO-2022-CN-EXT" },
-    {  106, "UTF-8" },
-    {  109, "ISO-8859-13" },
-    {  110, "ISO-8859-14" },
-    {  111, "ISO-8859-15" },
-    {  112, "ISO-8859-16" },
-    {  113, "GBK" },
-    {  114, "GB18030" },
-    {  115, "OSD_EBCDIC_DF04_15" },
-    {  116, "OSD_EBCDIC_DF03_IRV" },
-    {  117, "OSD_EBCDIC_DF04_1" },
-    {  118, "ISO-11548-1" },
-    {  119, "KZ-1048" },
-
-    { 1000, "ISO-10646-UCS-2" },
-    { 1001, "ISO-10646-UCS-4" },
-    { 1002, "ISO-10646-UCS-Basic" },
-    { 1003, "ISO-10646-Unicode-Latin1" },
-    { 1004, "ISO-10646-J-1" },
-    { 1005, "ISO-Unicode-IBM-1261" },
-    { 1006, "ISO-Unicode-IBM-1268" },
-    { 1007, "ISO-Unicode-IBM-1276" },
-    { 1008, "ISO-Unicode-IBM-1264" },
-    { 1009, "ISO-Unicode-IBM-1265" },
-    { 1010, "UNICODE-1-1" },
-    { 1011, "SCSU" },
-    { 1012, "UTF-7" },
-    { 1013, "UTF-16BE" },
-    { 1014, "UTF-16LE" },
-    { 1015, "UTF-16" },
-    { 1016, "CESU-8" },
-    { 1017, "UTF-32" },
-    { 1018, "UTF-32BE" },
-    { 1019, "UTF-32LE" },
-    { 1020, "BOCU-1" },
-
-    { 2000, "ISO-8859-1-Windows-3.0-Latin-1" },
-    { 2001, "ISO-8859-1-Windows-3.1-Latin-1" },
-    { 2002, "ISO-8859-2-Windows-Latin-2" },
-    { 2003, "ISO-8859-9-Windows-Latin-5" },
-    { 2004, "hp-roman8" },
-    { 2005, "Adobe-Standard-Encoding" },
-    { 2006, "Ventura-US" },
-    { 2007, "Ventura-International" },
-    { 2008, "DEC-MCS" },
-    { 2009, "IBM850" },
-    { 2010, "IBM852" },
-    { 2011, "IBM437" },
-    { 2012, "PC8-Danish-Norwegian" },
-    { 2013, "IBM862" },
-    { 2014, "PC8-Turkish" },
-    { 2015, "IBM-Symbols" },
-    { 2016, "IBM-Thai" },
-    { 2017, "HP-Legal" },
-    { 2018, "HP-Pi-font" },
-    { 2019, "HP-Math8" },
-    { 2020, "Adobe-Symbol-Encoding" },
-    { 2021, "HP-DeskTop" },
-    { 2022, "Ventura-Math" },
-    { 2023, "Microsoft-Publishing" },
-    { 2024, "Windows-31J" },
-    { 2025, "GB2312" },
-    { 2026, "Big5" },
-    { 2027, "macintosh" },
-    { 2028, "IBM037" },
-    { 2029, "IBM038" },
-    { 2030, "IBM273" },
-    { 2031, "IBM274" },
-    { 2032, "IBM275" },
-    { 2033, "IBM277" },
-    { 2034, "IBM278" },
-    { 2035, "IBM280" },
-    { 2036, "IBM281" },
-    { 2037, "IBM284" },
-    { 2038, "IBM285" },
-    { 2039, "IBM290" },
-    { 2040, "IBM297" },
-    { 2041, "IBM420" },
-    { 2042, "IBM423" },
-    { 2043, "IBM424" },
-    { 2044, "IBM500" },
-    { 2045, "IBM851" },
-    { 2046, "IBM855" },
-    { 2047, "IBM857" },
-    { 2048, "IBM860" },
-    { 2049, "IBM861" },
-    { 2050, "IBM863" },
-    { 2051, "IBM864" },
-    { 2052, "IBM865" },
-    { 2053, "IBM868" },
-    { 2054, "IBM869" },
-    { 2055, "IBM870" },
-    { 2056, "IBM871" },
-    { 2057, "IBM880" },
-    { 2058, "IBM891" },
-    { 2059, "IBM903" },
-    { 2060, "IBM904" },
-    { 2061, "IBM905" },
-    { 2062, "IBM918" },
-    { 2063, "IBM1026" },
-    { 2064, "EBCDIC-AT-DE" },
-    { 2065, "EBCDIC-AT-DE-A" },
-    { 2066, "EBCDIC-CA-FR" },
-    { 2067, "EBCDIC-DK-NO" },
-    { 2068, "EBCDIC-DK-NO-A" },
-    { 2069, "EBCDIC-FI-SE" },
-    { 2070, "EBCDIC-FI-SE-A" },
-    { 2071, "EBCDIC-FR" },
-    { 2072, "EBCDIC-IT" },
-    { 2073, "EBCDIC-PT" },
-    { 2074, "EBCDIC-ES" },
-    { 2075, "EBCDIC-ES-A" },
-    { 2076, "EBCDIC-ES-S" },
-    { 2077, "EBCDIC-UK" },
-    { 2078, "EBCDIC-US" },
-    { 2079, "UNKNOWN-8BIT" },
-    { 2080, "MNEMONIC" },
-    { 2081, "MNEM" },
-    { 2082, "VISCII" },
-    { 2083, "VIQR" },
-    { 2084, "KOI8-R" },
-    { 2085, "HZ-GB-2312" },
-    { 2086, "IBM866" },
-    { 2087, "IBM775" },
-    { 2088, "KOI8-U" },
-    { 2089, "IBM00858" },
-    { 2090, "IBM00924" },
-    { 2091, "IBM01140" },
-    { 2092, "IBM01141" },
-    { 2093, "IBM01142" },
-    { 2094, "IBM01143" },
-    { 2095, "IBM01144" },
-    { 2096, "IBM01145" },
-    { 2097, "IBM01146" },
-    { 2098, "IBM01147" },
-    { 2099, "IBM01148" },
-    { 2100, "IBM01149" },
-    { 2101, "Big5-HKSCS" },
-    { 2102, "IBM1047" },
-    { 2103, "PTCP154" },
-    { 2104, "Amiga-1251" },
-    { 2105, "KOI7-switched" },
-    { 2106, "BRF" },
-    { 2107, "TSCII" },
-    { 2108, "CP51932" },
-    { 2109, "windows-874" },
-
-    { 2250, "windows-1250" },
-    { 2251, "windows-1251" },
-    { 2252, "windows-1252" },
-    { 2253, "windows-1253" },
-    { 2254, "windows-1254" },
-    { 2255, "windows-1255" },
-    { 2256, "windows-1256" },
-    { 2257, "windows-1257" },
-    { 2258, "windows-1258" },
-    { 2259, "TIS-620" },
-    { 2260, "CP50220" },
-    { 0, NULL }
-};
-value_string_ext wap_mib_enum_vals_character_sets_ext = VALUE_STRING_EXT_INIT(wap_mib_enum_vals_character_sets);
-
-/*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
diff --git a/epan/dissectors/packet-wap.h b/epan/dissectors/packet-wap.h
index e380d12b03..cf627d31a1 100644
--- a/epan/dissectors/packet-wap.h
+++ b/epan/dissectors/packet-wap.h
@@ -71,12 +71,6 @@
 /* Utility function for reading Uintvar encoded values */
 guint tvb_get_guintvar (tvbuff_t *, guint , guint *);
 
-/* Map a charset to a Wireshark string encoding. */
-guint wap_charset_to_encoding (guint charset);
-
-/* Character set encoding */
-extern value_string_ext wap_mib_enum_vals_character_sets_ext;
-
 /*
  * Misc TODO:
  *
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index 4834044b38..2290eb40ac 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -48,7 +48,8 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/strutil.h>
-/* We need the functions tvb_get_guintvar() and wap_charset_to_encoding() */
+#include <epan/iana_charsets.h>
+/* We need the function tvb_get_guintvar() */
 #include "packet-wap.h"
 
 void proto_register_wbxml(void);
@@ -6949,7 +6950,7 @@ static void
 show_wbxml_string_table (proto_tree *tree, tvbuff_t *tvb, guint32 str_tbl,
 			 guint32 str_tbl_len, guint charset)
 {
-	guint encoding = wap_charset_to_encoding(charset);
+	guint encoding = mibenum_charset_to_encoding(charset);
 	guint32 off = str_tbl;
 	guint32 end = str_tbl + str_tbl_len;
 	proto_tree *item_tree;
@@ -7911,7 +7912,7 @@ proto_register_wbxml(void)
 		  { "Character Set",
 		    "wbxml.charset",
 		    FT_UINT32, BASE_DEC|BASE_EXT_STRING,
-		    &wap_mib_enum_vals_character_sets_ext, 0x00,
+		    &mibenum_vals_character_sets_ext, 0x00,
 		    "WBXML Character Set", HFILL }
 		},
 		{ &hf_wbxml_string_table_item_offset,
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 650e07201d..bef60dcc67 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -46,6 +46,7 @@
 #include <epan/to_str.h>
 #include <epan/expert.h>
 #include <epan/conversation.h>
+#include <epan/iana_charsets.h>
 
 #include <wsutil/str_util.h>
 
@@ -1752,7 +1753,7 @@ wkh_accept_x_q_header_func(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, p
  *  | ( Value-length ( Token-text | Integer-value ) [ Q-value ] )
  */
 wkh_accept_x_q_header(accept_charset, "Accept-Charset",
-        &wap_mib_enum_vals_character_sets_ext, "character set")
+        &mibenum_vals_character_sets_ext, "character set")
 /*
  * Accept-language-value =
  *    Short-integer
@@ -3342,7 +3343,7 @@ wkh_tod_value_header(openwave_x_up_proxy_tod,
 /* Openwave accept_x_q header */
 wkh_accept_x_q_header(openwave_x_up_proxy_trans_charset,
         "x-up-proxy-trans-charset",
-        &wap_mib_enum_vals_character_sets_ext, "character set")
+        &mibenum_vals_character_sets_ext, "character set")
 
 /* Openwave content type header */
 static guint32
@@ -3525,7 +3526,7 @@ parameter (proto_tree *tree, packet_info *pinfo, proto_item *ti, tvbuff_t *tvb,
         case 0x01:  /* WSP 1.1 encoding - Charset: Well-known-charset */
             get_integer_value(val, tvb, offset, val_len, ok);
             if (ok) {
-                val_str = val_to_str_ext(val, &wap_mib_enum_vals_character_sets_ext,
+                val_str = val_to_str_ext(val, &mibenum_vals_character_sets_ext,
                         "<Unknown character set Identifier %u>");
                 proto_tree_add_string(tree, hf_parameter_charset,
                         tvb, offset, val_len, val_str);
diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c
index dcc130db2a..3e51e55892 100644
--- a/epan/dissectors/packet-wtls.c
+++ b/epan/dissectors/packet-wtls.c
@@ -32,6 +32,7 @@
 #endif
 
 #include <epan/packet.h>
+#include <epan/iana_charsets.h>
 #include "packet-wap.h"
 #include "packet-wtls.h"
 
@@ -1229,7 +1230,7 @@ proto_register_wtls(void)
 		{ &hf_wtls_hands_cli_hello_key_identifier_charset,
 			{ 	"Identifier CharSet",
 				"wtls.handshake.client_hello.ident_charset",
-				 FT_UINT16, BASE_DEC|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00,
+				 FT_UINT16, BASE_DEC|BASE_EXT_STRING, &mibenum_vals_character_sets_ext, 0x00,
 				NULL, HFILL
 			}
 		},
@@ -1439,7 +1440,7 @@ proto_register_wtls(void)
 		{ &hf_wtls_hands_certificate_wtls_issuer_charset,
 			{ 	"Charset",
 				"wtls.handshake.certificate.issuer.charset",
-				 FT_UINT16, BASE_DEC|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00,
+				 FT_UINT16, BASE_DEC|BASE_EXT_STRING, &mibenum_vals_character_sets_ext, 0x00,
 				NULL, HFILL
 			}
 		},
@@ -1481,7 +1482,7 @@ proto_register_wtls(void)
 		{ &hf_wtls_hands_certificate_wtls_subject_charset,
 			{ 	"Charset",
 				"wtls.handshake.certificate.subject.charset",
-				 FT_UINT16, BASE_DEC|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00,
+				 FT_UINT16, BASE_DEC|BASE_EXT_STRING, &mibenum_vals_character_sets_ext, 0x00,
 				NULL, HFILL
 			}
 		},
diff --git a/epan/iana_charsets.c b/epan/iana_charsets.c
new file mode 100644
index 0000000000..5a61bac93b
--- /dev/null
+++ b/epan/iana_charsets.c
@@ -0,0 +1,410 @@
+/* iana_charsets.c
+ *
+ * Routines and tables for IANA-registered character sets
+ *
+ *    http://www.iana.org/assignments/character-sets/character-sets.xhtml
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * WAP dissector based on original work by Ben Fowler
+ * Updated by Neil Hunter <neil.hunter@energis-squared.com>
+ * WTLS support by Alexandre P. Ferreira (Splice IP)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+
+#include <epan/proto.h>
+#include <epan/value_string.h>
+
+#include <epan/iana_charsets.h>
+
+/*
+ * Map a MIBenum code for a charset to a Wireshark string encoding.
+ */
+guint
+mibenum_charset_to_encoding (guint charset)
+{
+    switch (charset) {
+        case 3:
+            return ENC_NA|ENC_ASCII;
+
+        case 4:
+            return ENC_NA|ENC_ISO_8859_1;
+
+        case 5:
+            return ENC_NA|ENC_ISO_8859_2;
+
+        case 6:
+            return ENC_NA|ENC_ISO_8859_3;
+
+        case 7:
+            return ENC_NA|ENC_ISO_8859_4;
+
+        case 8:
+            return ENC_NA|ENC_ISO_8859_5;
+
+        case 9:
+            return ENC_NA|ENC_ISO_8859_6;
+
+        case 10:
+            return ENC_NA|ENC_ISO_8859_7;
+
+        case 11:
+            return ENC_NA|ENC_ISO_8859_8;
+
+        case 12:
+            return ENC_NA|ENC_ISO_8859_9;
+
+        case 13:
+            return ENC_NA|ENC_ISO_8859_10;
+
+        case 106:
+            return ENC_NA|ENC_UTF_8;
+
+        case 109:
+            return ENC_NA|ENC_ISO_8859_13;
+
+        case 110:
+            return ENC_NA|ENC_ISO_8859_14;
+
+        case 111:
+            return ENC_NA|ENC_ISO_8859_15;
+
+        case 112:
+            return ENC_NA|ENC_ISO_8859_16;
+
+        case 1000:
+            /*
+             * The IANA page says:
+             *
+             *    this needs to specify network byte order: the
+             *    standard does not specify
+             *
+             * so presumably this means "big-endian UCS-2".
+             */
+            return ENC_BIG_ENDIAN|ENC_UCS_2;
+
+        case 1001:
+            /*
+             * The IANA page says the same thing as for UCS-2.
+             */
+            return ENC_BIG_ENDIAN|ENC_UCS_4;
+
+        case 1013:
+            return ENC_BIG_ENDIAN|ENC_UTF_16;
+
+        case 1014:
+            return ENC_LITTLE_ENDIAN|ENC_UTF_16;
+
+        case 1015:
+            /* XXX - UTF-16 with a BOM at the beginning */
+            return ENC_LITTLE_ENDIAN|ENC_UTF_16;
+
+        case 2011:
+            return ENC_NA|ENC_CP437;
+
+        case 2259:
+            return ENC_NA|ENC_ISO_8859_11;
+
+        default:
+            return ENC_NA|ENC_ASCII;
+    }
+}
+
+/* Updated from 10/04/2012 version */
+static const value_string mibenum_vals_character_sets[] = {
+    {    0, "*" },
+    {    3, "US-ASCII" },
+    {    4, "ISO-8859-1" },
+    {    5, "ISO-8859-2" },
+    {    6, "ISO-8859-3" },
+    {    7, "ISO-8859-4" },
+    {    8, "ISO-8859-5" },
+    {    9, "ISO-8859-6" },
+    {   10, "ISO-8859-7" },
+    {   11, "ISO-8859-8" },
+    {   12, "ISO-8859-9" },
+    {   13, "ISO-8859-10" },
+    {   14, "ISO_6937-2-add" },
+    {   15, "JIS_X0201" },
+    {   16, "JIS_Encoding" },
+    {   17, "Shift_JIS" },
+    {   18, "EUC-JP" },
+    {   19, "Extended_UNIX_Code_Fixed_Width_for_Japanese" },
+    {   20, "BS_4730" },
+    {   21, "SEN_850200_C" },
+    {   22, "IT" },
+    {   23, "ES" },
+    {   24, "DIN_66003" },
+    {   25, "NS_4551-1" },
+    {   26, "NF_Z_62-010" },
+    {   27, "ISO-10646-UTF-1" },
+    {   28, "ISO_646.basic:1983" },
+    {   29, "INVARIANT" },
+    {   30, "ISO_646.irv:1983" },
+    {   31, "NATS-SEFI" },
+    {   32, "NATS-SEFI-ADD" },
+    {   33, "NATS-DANO" },
+    {   34, "NATS-DANO-ADD" },
+    {   35, "SEN_850200_B" },
+    {   36, "KS_C_5601-1987" },
+    {   37, "ISO-2022-KR" },
+    {   38, "EUC-KR" },
+    {   39, "ISO-2022-JP" },
+    {   40, "ISO-2022-JP-2" },
+    {   41, "JIS_C6220-1969-jp" },
+    {   42, "JIS_C6220-1969-ro" },
+    {   43, "PT" },
+    {   44, "greek7-old" },
+    {   45, "latin-greek" },
+    {   46, "NF_Z_62-010_(1973)" },
+    {   47, "Latin-greek-1" },
+    {   48, "ISO_5427" },
+    {   49, "JIS_C6226-1978" },
+    {   50, "BS_viewdata" },
+    {   51, "INIS" },
+    {   52, "INIS-8" },
+    {   53, "INIS-cyrillic" },
+    {   54, "ISO_5427:1981" },
+    {   55, "ISO_5428:1980" },
+    {   56, "GB_1988-80" },
+    {   57, "GB_2312-80" },
+    {   58, "NS_4551-2" },
+    {   59, "videotex-suppl" },
+    {   60, "PT2" },
+    {   61, "ES2" },
+    {   62, "MSZ_7795.3" },
+    {   63, "JIS_C6226-1983" },
+    {   64, "greek7" },
+    {   65, "ASMO_449" },
+    {   66, "iso-ir-90" },
+    {   67, "JIS_C6229-1984-a" },
+    {   68, "JIS_C6229-1984-b" },
+    {   69, "JIS_C6229-1984-b-add" },
+    {   70, "JIS_C6229-1984-hand" },
+    {   71, "JIS_C6229-1984-hand-add" },
+    {   72, "JIS_C6229-1984-kana" },
+    {   73, "ISO_2033-1983" },
+    {   74, "ANSI_X3.110-1983" },
+    {   75, "T.61-7bit" },
+    {   76, "T.61-8bit" },
+    {   77, "ECMA-cyrillic" },
+    {   78, "CSA_Z243.4-1985-1" },
+    {   79, "CSA_Z243.4-1985-2" },
+    {   80, "CSA_Z243.4-1985-gr" },
+    {   81, "ISO-8859-6-E" },
+    {   82, "ISO-8859-6-I" },
+    {   83, "T.101-G2" },
+    {   84, "ISO-8859-8-E" },
+    {   85, "ISO-8859-8-I" },
+    {   86, "CSN_369103" },
+    {   87, "JUS_I.B1.002" },
+    {   88, "IEC_P27-1" },
+    {   89, "JUS_I.B1.003-serb" },
+    {   90, "JUS_I.B1.003-mac" },
+    {   91, "greek-ccitt" },
+    {   92, "NC_NC00-10:81" },
+    {   93, "ISO_6937-2-25" },
+    {   94, "GOST_19768-74" },
+    {   95, "ISO_8859-supp" },
+    {   96, "ISO_10367-box" },
+    {   97, "latin-lap" },
+    {   98, "JIS_X0212-1990" },
+    {   99, "DS_2089" },
+    {  100, "us-dk" },
+    {  101, "dk-us" },
+    {  102, "KSC5636" },
+    {  103, "UNICODE-1-1-UTF-7" },
+    {  104, "ISO-2022-CN" },
+    {  105, "ISO-2022-CN-EXT" },
+    {  106, "UTF-8" },
+    {  109, "ISO-8859-13" },
+    {  110, "ISO-8859-14" },
+    {  111, "ISO-8859-15" },
+    {  112, "ISO-8859-16" },
+    {  113, "GBK" },
+    {  114, "GB18030" },
+    {  115, "OSD_EBCDIC_DF04_15" },
+    {  116, "OSD_EBCDIC_DF03_IRV" },
+    {  117, "OSD_EBCDIC_DF04_1" },
+    {  118, "ISO-11548-1" },
+    {  119, "KZ-1048" },
+
+    { 1000, "ISO-10646-UCS-2" },
+    { 1001, "ISO-10646-UCS-4" },
+    { 1002, "ISO-10646-UCS-Basic" },
+    { 1003, "ISO-10646-Unicode-Latin1" },
+    { 1004, "ISO-10646-J-1" },
+    { 1005, "ISO-Unicode-IBM-1261" },
+    { 1006, "ISO-Unicode-IBM-1268" },
+    { 1007, "ISO-Unicode-IBM-1276" },
+    { 1008, "ISO-Unicode-IBM-1264" },
+    { 1009, "ISO-Unicode-IBM-1265" },
+    { 1010, "UNICODE-1-1" },
+    { 1011, "SCSU" },
+    { 1012, "UTF-7" },
+    { 1013, "UTF-16BE" },
+    { 1014, "UTF-16LE" },
+    { 1015, "UTF-16" },
+    { 1016, "CESU-8" },
+    { 1017, "UTF-32" },
+    { 1018, "UTF-32BE" },
+    { 1019, "UTF-32LE" },
+    { 1020, "BOCU-1" },
+
+    { 2000, "ISO-8859-1-Windows-3.0-Latin-1" },
+    { 2001, "ISO-8859-1-Windows-3.1-Latin-1" },
+    { 2002, "ISO-8859-2-Windows-Latin-2" },
+    { 2003, "ISO-8859-9-Windows-Latin-5" },
+    { 2004, "hp-roman8" },
+    { 2005, "Adobe-Standard-Encoding" },
+    { 2006, "Ventura-US" },
+    { 2007, "Ventura-International" },
+    { 2008, "DEC-MCS" },
+    { 2009, "IBM850" },
+    { 2010, "IBM852" },
+    { 2011, "IBM437" },
+    { 2012, "PC8-Danish-Norwegian" },
+    { 2013, "IBM862" },
+    { 2014, "PC8-Turkish" },
+    { 2015, "IBM-Symbols" },
+    { 2016, "IBM-Thai" },
+    { 2017, "HP-Legal" },
+    { 2018, "HP-Pi-font" },
+    { 2019, "HP-Math8" },
+    { 2020, "Adobe-Symbol-Encoding" },
+    { 2021, "HP-DeskTop" },
+    { 2022, "Ventura-Math" },
+    { 2023, "Microsoft-Publishing" },
+    { 2024, "Windows-31J" },
+    { 2025, "GB2312" },
+    { 2026, "Big5" },
+    { 2027, "macintosh" },
+    { 2028, "IBM037" },
+    { 2029, "IBM038" },
+    { 2030, "IBM273" },
+    { 2031, "IBM274" },
+    { 2032, "IBM275" },
+    { 2033, "IBM277" },
+    { 2034, "IBM278" },
+    { 2035, "IBM280" },
+    { 2036, "IBM281" },
+    { 2037, "IBM284" },
+    { 2038, "IBM285" },
+    { 2039, "IBM290" },
+    { 2040, "IBM297" },
+    { 2041, "IBM420" },
+    { 2042, "IBM423" },
+    { 2043, "IBM424" },
+    { 2044, "IBM500" },
+    { 2045, "IBM851" },
+    { 2046, "IBM855" },
+    { 2047, "IBM857" },
+    { 2048, "IBM860" },
+    { 2049, "IBM861" },
+    { 2050, "IBM863" },
+    { 2051, "IBM864" },
+    { 2052, "IBM865" },
+    { 2053, "IBM868" },
+    { 2054, "IBM869" },
+    { 2055, "IBM870" },
+    { 2056, "IBM871" },
+    { 2057, "IBM880" },
+    { 2058, "IBM891" },
+    { 2059, "IBM903" },
+    { 2060, "IBM904" },
+    { 2061, "IBM905" },
+    { 2062, "IBM918" },
+    { 2063, "IBM1026" },
+    { 2064, "EBCDIC-AT-DE" },
+    { 2065, "EBCDIC-AT-DE-A" },
+    { 2066, "EBCDIC-CA-FR" },
+    { 2067, "EBCDIC-DK-NO" },
+    { 2068, "EBCDIC-DK-NO-A" },
+    { 2069, "EBCDIC-FI-SE" },
+    { 2070, "EBCDIC-FI-SE-A" },
+    { 2071, "EBCDIC-FR" },
+    { 2072, "EBCDIC-IT" },
+    { 2073, "EBCDIC-PT" },
+    { 2074, "EBCDIC-ES" },
+    { 2075, "EBCDIC-ES-A" },
+    { 2076, "EBCDIC-ES-S" },
+    { 2077, "EBCDIC-UK" },
+    { 2078, "EBCDIC-US" },
+    { 2079, "UNKNOWN-8BIT" },
+    { 2080, "MNEMONIC" },
+    { 2081, "MNEM" },
+    { 2082, "VISCII" },
+    { 2083, "VIQR" },
+    { 2084, "KOI8-R" },
+    { 2085, "HZ-GB-2312" },
+    { 2086, "IBM866" },
+    { 2087, "IBM775" },
+    { 2088, "KOI8-U" },
+    { 2089, "IBM00858" },
+    { 2090, "IBM00924" },
+    { 2091, "IBM01140" },
+    { 2092, "IBM01141" },
+    { 2093, "IBM01142" },
+    { 2094, "IBM01143" },
+    { 2095, "IBM01144" },
+    { 2096, "IBM01145" },
+    { 2097, "IBM01146" },
+    { 2098, "IBM01147" },
+    { 2099, "IBM01148" },
+    { 2100, "IBM01149" },
+    { 2101, "Big5-HKSCS" },
+    { 2102, "IBM1047" },
+    { 2103, "PTCP154" },
+    { 2104, "Amiga-1251" },
+    { 2105, "KOI7-switched" },
+    { 2106, "BRF" },
+    { 2107, "TSCII" },
+    { 2108, "CP51932" },
+    { 2109, "windows-874" },
+
+    { 2250, "windows-1250" },
+    { 2251, "windows-1251" },
+    { 2252, "windows-1252" },
+    { 2253, "windows-1253" },
+    { 2254, "windows-1254" },
+    { 2255, "windows-1255" },
+    { 2256, "windows-1256" },
+    { 2257, "windows-1257" },
+    { 2258, "windows-1258" },
+    { 2259, "TIS-620" },
+    { 2260, "CP50220" },
+    { 0, NULL }
+};
+value_string_ext mibenum_vals_character_sets_ext = VALUE_STRING_EXT_INIT(mibenum_vals_character_sets);
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/iana_charsets.h b/epan/iana_charsets.h
new file mode 100644
index 0000000000..57f1128615
--- /dev/null
+++ b/epan/iana_charsets.h
@@ -0,0 +1,40 @@
+/* iana_charsets.h
+ *
+ * Declarations for IANA-registered character sets
+ *
+ *    http://www.iana.org/assignments/character-sets/character-sets.xhtml
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * WAP dissector based on original work by Ben Fowler
+ * Updated by Neil Hunter <neil.hunter@energis-squared.com>
+ * WTLS support by Alexandre P. Ferreira (Splice IP)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __IANA_CHARSETS_H__
+#define __IANA_CHARSETS_H__
+
+/* Map a MIBenum code for a charset to a Wireshark string encoding. */
+WS_DLL_PUBLIC guint mibenum_charset_to_encoding (guint charset);
+
+/* value_string_ext table of names for MIBenum codes */
+WS_DLL_PUBLIC value_string_ext mibenum_vals_character_sets_ext;
+
+#endif /* iana_charsets.h */
+