commit 40500 missed the asn1 directory

svn path=/trunk/; revision=40501

8 files changed, 2283 insertions, 0 deletions

diff --git a/asn1/c1222/Makefile.am b/asn1/c1222/Makefile.am
new file mode 100644
index 0000000000..462af31e88
--- /dev/null
+++ b/asn1/c1222/Makefile.am
@@ -0,0 +1,26 @@
+# $Id$
+#
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+include ../Makefile.preinc
+include Makefile.common
+include ../Makefile.inc
+
diff --git a/asn1/c1222/Makefile.common b/asn1/c1222/Makefile.common
new file mode 100644
index 0000000000..1fcf3e384a
--- /dev/null
+++ b/asn1/c1222/Makefile.common
@@ -0,0 +1,45 @@
+# $Id$
+#
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+PROTOCOL_NAME = c1222
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = $(PROTOCOL_NAME).asn
+
+# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn
+# files do not exist for all protocols: Please add/remove as required.
+EXTRA_DIST = \
+	Makefile.nmake \
+	$(ASN_FILE_LIST) \
+	packet-$(PROTOCOL_NAME)-template.c \
+	packet-$(PROTOCOL_NAME)-template.h \
+	$(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+	$(EXTRA_DIST) \
+	$(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b 
+
+EXTRA_CNF=
+
diff --git a/asn1/c1222/Makefile.in b/asn1/c1222/Makefile.in
new file mode 100644
index 0000000000..a8af65abe9
--- /dev/null
+++ b/asn1/c1222/Makefile.in
@@ -0,0 +1,635 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# $Id$
+#
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# To be included into the asn1 Makefiles
+#
+# $Id$
+#
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# $Id$
+#
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# To be included into the asn1 Makefiles
+#
+# $Id$
+#
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+DIST_COMMON = $(srcdir)/../Makefile.inc $(srcdir)/../Makefile.preinc \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.common \
+	$(srcdir)/Makefile.in
+subdir = asn1/c1222
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/aclocal-fallback/glib-2.0.m4 \
+	$(top_srcdir)/aclocal-fallback/gtk-2.0.m4 \
+	$(top_srcdir)/aclocal-fallback/gtk-3.0.m4 \
+	$(top_srcdir)/aclocal-fallback/libgcrypt.m4 \
+	$(top_srcdir)/aclocal-fallback/libsmi.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADNS_LIBS = @ADNS_LIBS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CORESERVICES_FRAMEWORKS = @CORESERVICES_FRAMEWORKS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+C_ARES_LIBS = @C_ARES_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DUMPCAP_GROUP = @DUMPCAP_GROUP@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ELINKS = @ELINKS@
+ENABLE_STATIC = @ENABLE_STATIC@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FOP = @FOP@
+GEOIP_LIBS = @GEOIP_LIBS@
+GETOPT_LO = @GETOPT_LO@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+HAVE_BLESS = @HAVE_BLESS@
+HAVE_DOXYGEN = @HAVE_DOXYGEN@
+HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
+HAVE_ELINKS = @HAVE_ELINKS@
+HAVE_FOP = @HAVE_FOP@
+HAVE_HDIUTIL = @HAVE_HDIUTIL@
+HAVE_HHC = @HAVE_HHC@
+HAVE_LYNX = @HAVE_LYNX@
+HAVE_OSX_PACKAGING = @HAVE_OSX_PACKAGING@
+HAVE_PKGMK = @HAVE_PKGMK@
+HAVE_PKGPROTO = @HAVE_PKGPROTO@
+HAVE_PKGTRANS = @HAVE_PKGTRANS@
+HAVE_RPM = @HAVE_RPM@
+HAVE_SVR4_PACKAGING = @HAVE_SVR4_PACKAGING@
+HAVE_XCODEBUILD = @HAVE_XCODEBUILD@
+HAVE_XMLLINT = @HAVE_XMLLINT@
+HAVE_XSLTPROC = @HAVE_XSLTPROC@
+HHC = @HHC@
+HTML_VIEWER = @HTML_VIEWER@
+INET_ATON_LO = @INET_ATON_LO@
+INET_NTOP_LO = @INET_NTOP_LO@
+INET_PTON_LO = @INET_PTON_LO@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KRB5_CONFIG = @KRB5_CONFIG@
+KRB5_LIBS = @KRB5_LIBS@
+LAUNCHSERVICES_FRAMEWORKS = @LAUNCHSERVICES_FRAMEWORKS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_SHAREDLIB = @LDFLAGS_SHAREDLIB@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAP_LIBS = @LIBCAP_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSMI_CFLAGS = @LIBSMI_CFLAGS@
+LIBSMI_LDFLAGS = @LIBSMI_LDFLAGS@
+LIBSMI_VERSION = @LIBSMI_VERSION@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LUA_INCLUDES = @LUA_INCLUDES@
+LUA_LIBS = @LUA_LIBS@
+LYNX = @LYNX@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NSL_LIBS = @NSL_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCAP_CONFIG = @PCAP_CONFIG@
+PCAP_LIBS = @PCAP_LIBS@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGIN_LIBS = @PLUGIN_LIBS@
+POD2HTML = @POD2HTML@
+POD2MAN = @POD2MAN@
+PORTAUDIO_INCLUDES = @PORTAUDIO_INCLUDES@
+PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
+PYTHON = @PYTHON@
+PY_CFLAGS = @PY_CFLAGS@
+PY_LIBS = @PY_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SETCAP = @SETCAP@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKET_LIBS = @SOCKET_LIBS@
+SSL_LIBS = @SSL_LIBS@
+STRIP = @STRIP@
+STRNCASECMP_LO = @STRNCASECMP_LO@
+STRPTIME_C = @STRPTIME_C@
+STRPTIME_LO = @STRPTIME_LO@
+VERSION = @VERSION@
+XMLLINT = @XMLLINT@
+XSLTPROC = @XSLTPROC@
+YACC = @YACC@
+YACCDUMMY = @YACCDUMMY@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
+ac_ws_python_config = @ac_ws_python_config@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+capinfos_bin = @capinfos_bin@
+capinfos_man = @capinfos_man@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dftest_bin = @dftest_bin@
+dftest_man = @dftest_man@
+docdir = @docdir@
+dumpcap_bin = @dumpcap_bin@
+dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
+editcap_bin = @editcap_bin@
+editcap_man = @editcap_man@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mergecap_bin = @mergecap_bin@
+mergecap_man = @mergecap_man@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+plugindir = @plugindir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pythondir = @pythondir@
+randpkt_bin = @randpkt_bin@
+randpkt_man = @randpkt_man@
+rawshark_bin = @rawshark_bin@
+rawshark_man = @rawshark_man@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+text2pcap_bin = @text2pcap_bin@
+text2pcap_man = @text2pcap_man@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+tshark_bin = @tshark_bin@
+tshark_man = @tshark_man@
+wireshark_SUBDIRS = @wireshark_SUBDIRS@
+wireshark_bin = @wireshark_bin@
+wireshark_man = @wireshark_man@
+wiresharkfilter_man = @wiresharkfilter_man@
+MAKE_CNF_EXPORT = $(MAKE) generate_export
+PROTOCOL_NAME = c1222
+EXT_ASN_FILE_LIST = 
+ASN_FILE_LIST = $(PROTOCOL_NAME).asn
+
+# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn
+# files do not exist for all protocols: Please add/remove as required.
+EXTRA_DIST = \
+	Makefile.nmake \
+	$(ASN_FILE_LIST) \
+	packet-$(PROTOCOL_NAME)-template.c \
+	packet-$(PROTOCOL_NAME)-template.h \
+	$(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+	$(EXTRA_DIST) \
+	$(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS = -b 
+EXTRA_CNF = 
+DISSECTOR = $(top_srcdir)/epan/dissectors/packet-$(PROTOCOL_NAME).c
+# This header file need not exist/get generated.  It is only used when cleaning.
+DISSECTOR_HEADER = $(top_srcdir)/epan/dissectors/packet-$(PROTOCOL_NAME).h
+
+# Don't clean these up until/unless we start building them...
+#$(DISSECTOR) \
+#$(DISSECTOR_HEADER)
+CLEANFILES = \
+	parsetab.py \
+	parsetab.pyc \
+	*-exp.cnf \
+	packet-*-{dis-tab,ettarr,ett,exp,fn,hfarr,hf,table*,val}.[hc]
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../Makefile.preinc $(srcdir)/Makefile.common $(srcdir)/../Makefile.inc $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu asn1/c1222/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu asn1/c1222/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
+
+all: generate_export $(DISSECTOR)
+
+generate_export: $(EXPORT_FILES)
+
+PROTO_OPT ?= -p $(PROTOCOL_NAME)
+
+$(DISSECTOR): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
+	$(PYTHON) $(top_srcdir)/tools/asn2wrs.py \
+		$(A2W_FLAGS) \
+		$(PROTO_OPT) \
+		-c $(srcdir)/$(PROTOCOL_NAME).cnf \
+		-s $(srcdir)/packet-$(PROTOCOL_NAME)-template \
+		-D $(srcdir) \
+		-O $(top_srcdir)/epan/dissectors \
+		$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
+
+$(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES)
+	$(PYTHON) $(top_srcdir)/tools/asn2wrs.py \
+		-E $(A2W_FLAGS) \
+		$(PROTO_OPT) \
+		-c $(srcdir)/$(PROTOCOL_NAME).cnf \
+		-D $(srcdir) \
+		$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/asn1/c1222/Makefile.nmake b/asn1/c1222/Makefile.nmake
new file mode 100644
index 0000000000..5a32997c60
--- /dev/null
+++ b/asn1/c1222/Makefile.nmake
@@ -0,0 +1,29 @@
+## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+#
+# $Id$
+#
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+include ../../config.nmake
+include ../Makefile.preinc.nmake
+include Makefile.common
+include ../Makefile.inc.nmake
+
diff --git a/asn1/c1222/c1222.asn b/asn1/c1222/c1222.asn
new file mode 100644
index 0000000000..40012c380e
--- /dev/null
+++ b/asn1/c1222/c1222.asn
@@ -0,0 +1,75 @@
+-- C1222 PROTOCOL
+--
+
+C1222-PROTOCOL DEFINITIONS ::=
+BEGIN
+
+C1222-MESSAGE  ::= [APPLICATION 0] IMPLICIT SEQUENCE {
+    aSO-context			    [1] ASO-qualifier OPTIONAL,
+    called-AP-title		    [2] Called-AP-title OPTIONAL,
+    called-AP-invocation-id	    [4] Called-AP-invocation-id OPTIONAL,
+    calling-AP-title		    [6] Calling-AP-title OPTIONAL,
+    calling-AE-qualifier	    [7] Calling-AE-qualifier OPTIONAL,
+    calling-AP-invocation-id	    [8] Calling-AP-invocation-id,
+    mechanism-name		    [11] IMPLICIT Mechanism-name OPTIONAL,
+    calling-authentication-value    [12] Calling-authentication-value OPTIONAL,
+    user-information		    [30] User-information
+}
+
+ASO-qualifier ::= OBJECT IDENTIFIER
+AP-title ::= OBJECT IDENTIFIER
+Called-AP-title ::= AP-title
+Calling-AP-title ::= AP-title
+AP-invocation-id ::= INTEGER
+Called-AP-invocation-id ::= AP-invocation-id
+Calling-AP-invocation-id ::= AP-invocation-id
+AE-qualifier ::= INTEGER
+Calling-AE-qualifier ::= AE-qualifier
+Mechanism-name ::= OBJECT IDENTIFIER
+
+-- this is all of the authentication mechanism related stuff 
+
+Calling-authentication-value ::= [2] IMPLICIT SEQUENCE {
+    calling-authentication-value-indirect   INTEGER DEFAULT 0,
+    calling-authentication-value-encoding   Authentication-value-encoding
+}
+
+Authentication-value-encoding ::= CHOICE { 
+    calling-authentication-value-single-asn1	[0] Calling-authentication-value-single-asn1, 
+    calling-authentication-value-octet-aligned	[1] IMPLICIT OCTET STRING
+}
+
+Calling-authentication-value-single-asn1 ::= CHOICE { 
+    calling-authentication-value-c1222   Calling-authentication-value-c1222,
+    calling-authentication-value-c1221   Calling-authentication-value-c1221
+}
+
+Calling-authentication-value-c1222 ::= [1] IMPLICIT SEQUENCE {
+    key-id-element	[0] IMPLICIT Key-id-element OPTIONAL,
+    iv-element		[1] IMPLICIT Iv-element OPTIONAL
+}
+
+Key-id-element ::= OCTET STRING (SIZE(1))
+Iv-element ::= OCTET STRING (SIZE(4))
+
+Calling-authentication-value-c1221 ::= [0] IMPLICIT CHOICE {
+    c1221-auth-identification	[0] IMPLICIT OCTET STRING (SIZE(3|5..259)),
+    c1221-auth-request		[0] IMPLICIT OCTET STRING (SIZE(1..255)),
+    c1221-auth-response		[0] IMPLICIT OCTET STRING (SIZE(0|1..255)),
+    ...
+}
+
+-- now the user information (EPSEM) 
+User-information ::= EXTERNAL 
+
+--User-information EPSEM-TYPE ::= { ... }
+
+--EPSEM-TYPE ::= CLASS {
+--  &direct-reference OBJECT IDENTIFIER OPTIONAL,
+--  &octet-aligned [1] IMPLICIT OCTET STRING
+--}
+
+
+END
+
+
diff --git a/asn1/c1222/c1222.cnf b/asn1/c1222/c1222.cnf
new file mode 100644
index 0000000000..f57ecd5d1a
--- /dev/null
+++ b/asn1/c1222/c1222.cnf
@@ -0,0 +1,99 @@
+# c1222.cnf
+# C1222 conformation file
+# Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com
+
+# $Id$
+
+#.MODULE_IMPORT
+IMPORT ../acse/acse.inf
+
+#.EXPORTS
+
+#.PDU
+C1222-MESSAGE
+
+#.NO_EMIT
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.TYPE_ATTR 
+Calling-authentication-value-c1222/_untag/iv-element  BLURB="c1222.iv-element"
+Calling-authentication-value-c1222/_untag/key-id-element BLURB = "c1222.key-id-element"
+
+#.FN_BODY User-information
+  gint8 class;
+  gboolean pc, ind;
+  gint32 tag;
+  guint32 len;
+  proto_item *tf = NULL;
+  proto_tree *epsem_tree = NULL;
+  FILL_START;
+  
+  /* get Tag and Length */
+  offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
+  offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
+  FILL_TABLE_TRUNCATE(user_information, len+offset-start_offset);
+  if (tag == 0x8) {  /* BER_TAG_EXTERNAL */
+    offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
+    offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
+    if (tag == 0x1) { /* implicit octet string */
+      tf = proto_tree_add_item(tree, hf_c1222_user_information, tvb, offset, len, FALSE);
+      epsem_tree = proto_item_add_subtree(tf, ett_c1222_epsem);
+      dissect_epsem(tvb, offset, len, actx->pinfo, epsem_tree);
+      offset += len;
+    }
+  }
+
+#.FN_BODY ASO-qualifier
+  FILL_START;
+  %(DEFAULT_BODY)s
+  FILL_TABLE(aSO_context);
+
+#.FN_BODY Called-AP-title
+  FILL_START;
+  %(DEFAULT_BODY)s
+  FILL_TABLE(called_AP_title);
+
+#.FN_BODY Called-AP-invocation-id
+  FILL_START;
+  %(DEFAULT_BODY)s
+  FILL_TABLE(called_AP_invocation_id);
+
+#.FN_BODY Calling-AE-qualifier
+  FILL_START;
+  %(DEFAULT_BODY)s
+  FILL_TABLE(calling_AE_qualifier);
+
+#.FN_BODY Calling-AP-invocation-id
+  FILL_START;
+  %(DEFAULT_BODY)s
+  FILL_TABLE(calling_AP_invocation_id);
+
+#.FN_BODY Mechanism-name
+  FILL_START;
+  %(DEFAULT_BODY)s
+  FILL_TABLE(mechanism_name);
+
+#.FN_BODY Calling-authentication-value
+  FILL_START;
+  %(DEFAULT_BODY)s
+  FILL_TABLE(calling_authentication_value);
+
+#.FN_BODY Calling-AP-title
+  FILL_START;
+  %(DEFAULT_BODY)s
+  FILL_TABLE(calling_AP_title);
+
+#.FN_BODY Key-id-element
+  FILL_START;
+  %(DEFAULT_BODY)s
+  FILL_TABLE(key_id_element);
+
+#.FN_BODY Iv-element
+  FILL_START;
+  %(DEFAULT_BODY)s
+  FILL_TABLE(iv_element);
+
+#.END
diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c
new file mode 100644
index 0000000000..1692451a7d
--- /dev/null
+++ b/asn1/c1222/packet-c1222-template.c
@@ -0,0 +1,1343 @@
+/* packet-c1222.c
+ * Routines for ANSI C12.22 packet dissection
+ * Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <glib.h>
+#include <epan/conversation.h>
+#include <wsutil/crc16.h>
+#include <epan/expert.h>
+#include <epan/packet.h>
+#include <epan/prefs.h>
+#include <epan/strutil.h>
+#include <epan/dissectors/packet-ber.h>
+#include <epan/dissectors/packet-tcp.h>
+#include <epan/uat.h>
+#include <epan/crypt/eax.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include "packet-c1222.h"
+
+#define PNAME  "ANSI C12.22"
+#define PSNAME "C12.22"
+#define PFNAME "c1222"
+#define C1222_PORT 1153    /* TCP port */
+
+/* C12.22 flag definitions */
+#define C1222_EPSEM_FLAG_RESERVED 0x80
+#define C1222_EPSEM_FLAG_RECOVERY_SESSION 0x40
+#define C1222_EPSEM_FLAG_PROXY_SERVICE_USED 0x20
+#define C1222_EPSEM_FLAG_ED_CLASS_INCLUDED 0x10
+#define C1222_EPSEM_FLAG_SECURITY_MODE 0x0c
+#define C1222_EPSEM_FLAG_RESPONSE_CONTROL 0x03
+
+/* if the packet is encrypted, it can be
+ * good, bad, or simply not checked
+ */
+#define C1222_EPSEM_CRYPTO_GOOD 0x01
+#define C1222_EPSEM_CRYPTO_BAD 0x02
+
+/* these defines are for each of the C12.22 services */
+#define C1222_CMD_IDENTIFY 0x20
+#define C1222_CMD_TERMINATE 0x21
+#define C1222_CMD_DISCONNECT 0x22
+#define C1222_CMD_FULL_READ 0x30
+#define C1222_CMD_DEFAULT_READ 0x3E
+#define C1222_CMD_PARTIAL_READ_OFFSET 0x3F
+#define C1222_CMD_FULL_WRITE 0x40
+#define C1222_CMD_DEFAULT_WRITE 0x4E
+#define C1222_CMD_PARTIAL_WRITE_OFFSET 0x4F
+#define C1222_CMD_LOGON 0x50
+#define C1222_CMD_SECURITY 0x51
+#define C1222_CMD_LOGOFF 0x52
+#define C1222_CMD_AUTHENTICATE 0x53
+#define C1222_CMD_NEGOTIATE 0x60
+#define C1222_CMD_WAIT 0x70
+#define C1222_CMD_TIMING_SETUP 0x71
+
+static dissector_handle_t c1222_handle=NULL;
+
+/* Initialize the protocol and registered fields */
+static int proto_c1222 = -1;
+static int global_c1222_port = C1222_PORT;
+static gboolean c1222_desegment = TRUE;
+static gboolean c1222_decrypt = TRUE;
+
+#include "packet-c1222-hf.c"
+/* These are the EPSEM pieces */
+/* first, the flag components */
+static int hf_c1222_epsem_flags = -1;
+static int hf_c1222_epsem_flags_reserved = -1;
+static int hf_c1222_epsem_flags_recovery = -1;
+static int hf_c1222_epsem_flags_proxy = -1;
+static int hf_c1222_epsem_flags_ed_class = -1;
+static int hf_c1222_epsem_flags_security_modes = -1;
+static int hf_c1222_epsem_flags_response_control = -1;
+/* and the structure of the flag components */
+/* 
+static const int *c1222_flags[] = {
+  &hf_c1222_epsem_flags_reserved,
+  &hf_c1222_epsem_flags_recovery,
+  &hf_c1222_epsem_flags_proxy,
+  &hf_c1222_epsem_flags_ed_class,
+  &hf_c1222_epsem_flags_security_modes,
+  &hf_c1222_epsem_flags_response_control,
+  NULL
+};
+*/
+/* next the optional ed_class */
+static int hf_c1222_epsem_ed_class = -1;
+/* now the aggregate epsem */
+static int hf_c1222_epsem_total = -1;
+/* generic command */
+static int hf_c1222_cmd = -1;
+static int hf_c1222_err = -1;
+static int hf_c1222_data = -1;
+static int hf_c1222_crc = -1;
+/* individual epsem fields */
+static int hf_c1222_logon_id = -1;
+static int hf_c1222_logon_user = -1;
+static int hf_c1222_security_password = -1;
+static int hf_c1222_auth_len = -1;
+static int hf_c1222_auth_data = -1;
+static int hf_c1222_read_table = -1;
+static int hf_c1222_read_offset = -1;
+static int hf_c1222_read_count = -1;
+static int hf_c1222_write_table = -1;
+static int hf_c1222_write_offset = -1;
+static int hf_c1222_write_size = -1;
+static int hf_c1222_write_data = -1;
+static int hf_c1222_write_chksum = -1;
+static int hf_c1222_wait_secs = -1;
+static int hf_c1222_neg_pkt_size = -1;
+static int hf_c1222_neg_nbr_pkts = -1;
+static int hf_c1222_timing_setup_traffic = -1;
+static int hf_c1222_timing_setup_inter_char = -1;
+static int hf_c1222_timing_setup_resp_to = -1;
+static int hf_c1222_timing_setup_nbr_retries = -1;
+
+/* the MAC */
+static int hf_c1222_epsem_mac = -1;
+
+/* crypto result flags */
+static int hf_c1222_epsem_crypto_good = -1;
+static int hf_c1222_epsem_crypto_bad = -1;
+
+/* Initialize the subtree pointers */
+static int ett_c1222 = -1;
+static int ett_c1222_epsem = -1;
+static int ett_c1222_flags = -1;
+static int ett_c1222_crypto = -1;
+static int ett_c1222_cmd = -1;
+
+#ifdef HAVE_LIBGCRYPT
+/* these pointers are for the header elements that may be needed to verify the crypto */
+static guint8 *aSO_context = NULL;
+static guint8 *called_AP_title = NULL;
+static guint8 *called_AP_invocation_id = NULL;
+static guint8 *calling_AE_qualifier = NULL;
+static guint8 *calling_AP_invocation_id = NULL;
+static guint8 *mechanism_name = NULL;
+static guint8 *calling_authentication_value = NULL;
+static guint8 *user_information = NULL;
+static guint8 *calling_AP_title = NULL;
+static guint8 *key_id_element = NULL;
+static guint8 *iv_element = NULL;
+
+/* these are the related lengths */
+static guint32 aSO_context_len = 0;
+static guint32 called_AP_title_len = 0;
+static guint32 called_AP_invocation_id_len = 0;
+static guint32 calling_AE_qualifier_len = 0;
+static guint32 calling_AP_invocation_id_len = 0;
+static guint32 mechanism_name_len = 0;
+static guint32 calling_authentication_value_len = 0;
+static guint32 user_information_len = 0;
+static guint32 calling_AP_title_len = 0;
+static guint32 key_id_element_len = 0;
+static guint32 iv_element_len = 0;
+#endif /* HAVE_LIBGCRYPT */
+
+#include "packet-c1222-ett.c"
+
+
+/*------------------------------
+ * Data Structures 
+ *------------------------------
+ */
+typedef struct _c1222_uat_data {
+  guint keynum;
+  guchar *key;
+  guint  keylen;
+} c1222_uat_data_t;
+
+static const value_string c1222_security_modes[] = {
+  { 0x00, "Cleartext"}, 
+  { 0x01, "Cleartext with authentication"}, 
+  { 0x02, "Ciphertext with authentication"}, 
+  { 0, NULL }
+};
+
+static const value_string c1222_response_control[] = {
+  { 0x00, "Always respond"}, 
+  { 0x01, "Respond on exception"}, 
+  { 0x02, "Never respond"}, 
+  { 0, NULL }
+};
+
+static const value_string tableflags[] = {
+  { 0x00, "ST" },
+  { 0x08, "MT" },
+  { 0x10, "Pending ST" },
+  { 0x18, "Pending MT" },
+  { 0, NULL }
+};
+
+static const value_string procflags[] = {
+  { 0x00, "SF" },
+  { 0x01, "MF" },
+  { 0, NULL }
+};
+
+static const value_string commandnames[] = {
+/* error codes are in the range 0x00 - 0x1f inclusive */
+  { 0x00, "OK" },
+  { 0x01, "Error" },
+  { 0x02, "Service Not Supported" },
+  { 0x03, "Insufficient Security Clearance" },
+  { 0x04, "Operation Not Possible" },
+  { 0x05, "Inappropriate Action Requested" },
+  { 0x06, "Device Busy" },
+  { 0x07, "Data Not Ready" },
+  { 0x08, "Data Locked" },
+  { 0x09, "Renegotiate Request" },
+  { 0x0A, "Invalid Service Sequence State" },
+  { 0x0B, "Security Mechanism Error" },
+  { 0x0C, "Unknown Application Title" },
+  { 0x0D, "Network Time-out" },
+  { 0x0E, "Network Not Reachable" },
+  { 0x0F, "Request Too Large" },
+  { 0x10, "Response Too Large" },
+  { 0x11, "Segmentation Not Possible" },
+  { 0x12, "Segmentation Error" },
+/* commands are in the range 0x20 - 0x7f inclusive */
+  {C1222_CMD_IDENTIFY, "Identify" },
+  {C1222_CMD_TERMINATE, "Terminate" },
+  {C1222_CMD_DISCONNECT, "Disconnect" },
+  {C1222_CMD_FULL_READ, "Full Read" },
+  {C1222_CMD_DEFAULT_READ, "Default Read" },
+  {C1222_CMD_PARTIAL_READ_OFFSET, "Partial Read Offset" },
+  {C1222_CMD_FULL_WRITE, "Full Write" },
+  {C1222_CMD_DEFAULT_WRITE, "Default Write" },
+  {C1222_CMD_PARTIAL_WRITE_OFFSET, "Partial Write Offset" },
+  {C1222_CMD_LOGON, "Logon" },
+  {C1222_CMD_SECURITY, "Security" },
+  {C1222_CMD_LOGOFF, "Logoff" },
+  {C1222_CMD_AUTHENTICATE, "Authenticate" },
+  {C1222_CMD_NEGOTIATE, "Negotiate" },
+  {C1222_CMD_NEGOTIATE | 0x1, "Negotiate w/ 1 Baud Rate" },
+  {C1222_CMD_NEGOTIATE | 0x2, "Negotiate w/ 2 Baud Rates" },
+  {C1222_CMD_NEGOTIATE | 0x3, "Negotiate w/ 3 Baud Rates" },
+  {C1222_CMD_NEGOTIATE | 0x4, "Negotiate w/ 4 Baud Rates" },
+  {C1222_CMD_NEGOTIATE | 0x5, "Negotiate w/ 5 Baud Rates" },
+  {C1222_CMD_NEGOTIATE | 0x6, "Negotiate w/ 6 Baud Rates" },
+  {C1222_CMD_NEGOTIATE | 0x7, "Negotiate w/ 7 Baud Rates" },
+  {C1222_CMD_NEGOTIATE | 0x8, "Negotiate w/ 8 Baud Rates" },
+  {C1222_CMD_NEGOTIATE | 0x9, "Negotiate w/ 9 Baud Rates" },
+  {C1222_CMD_NEGOTIATE | 0xA, "Negotiate w/ 10 Baud Rates" },
+  {C1222_CMD_NEGOTIATE | 0xB, "Negotiate w/ 11 Baud Rates" },
+  {C1222_CMD_WAIT, "Wait" },
+  {C1222_CMD_TIMING_SETUP, "Timing Setup" },
+  { 0, NULL }
+};
+
+#ifdef HAVE_LIBGCRYPT
+/* these are for the key tables */
+UAT_HEX_CB_DEF(c1222_users, keynum, c1222_uat_data_t)
+UAT_BUFFER_CB_DEF(c1222_users, key, c1222_uat_data_t, key, keylen)
+
+static c1222_uat_data_t *c1222_uat_data = NULL;
+static guint num_c1222_uat_data = 0;
+static uat_t *c1222_uat;
+
+/* these macros ares used to populate fields needed to verify crypto */
+#define FILL_START int length, start_offset = offset; 
+#define FILL_TABLE(fieldname)  \
+  length = offset - start_offset; \
+  fieldname = tvb_memdup(tvb, start_offset, length); \
+  fieldname##_len = length; 
+#define FILL_TABLE_TRUNCATE(fieldname, len)  \
+  length = 1 + 2*(offset - start_offset); \
+  fieldname = tvb_memdup(tvb, start_offset, length); \
+  fieldname##_len = len; 
+#else /* HAVE_LIBGCRYPT */
+#define FILL_TABLE(fieldname) 
+#define FILL_TABLE_TRUNCATE(fieldname, len)  
+#define FILL_START
+#endif /* HAVE_LIBGCRYPT */
+
+/*------------------------------
+ * Function Prototypes 
+ *------------------------------
+ */
+void proto_reg_handoff_c1222(void);
+
+
+/*------------------------------
+ * Code 
+ *------------------------------
+ */
+
+/**
+ * Calculates simple one's complement checksum.
+ *
+ * \param tvb pointer to tvbuff containing data to be checksummed 
+ * \param offset offset within tvbuff to beginning of data
+ * \param len length of data to be checksummed
+ * \returns calculated checksum
+ */
+static guint8
+c1222_cksum(tvbuff_t *tvb, gint offset, int len)
+{
+  guint8 sum;
+  for (sum = 0; len; offset++, len--)
+    sum += tvb_get_guint8(tvb, offset);
+  return ~sum + 1;
+}
+/**
+ * Dissects C12.22 packet in detail (with a tree).
+ *
+ * \param tvb input buffer containing packet to be dissected
+ * \param pinfo
+ * \param tree
+ * \param length
+ * \param offset
+ */
+static void
+parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cmd, guint32 *length, int *offset)
+{
+  guint16 user_id = 0;
+  guint8 *user_name = NULL;
+  guint8 *password = NULL;
+  guint8 auth_len = 0;
+  gchar *auth_req = NULL;
+  guint16 table = 0;
+  guint16 tblsize = 0;
+  guint8 chksum = 0;
+  guint16 calcsum = 0;
+  guint8 wait_seconds = 0;
+  int numrates = 0;
+  guint16 packet_size;
+  guint8 nbr_packet;
+  /* timing setup parameters */
+  guint8 traffic; 
+  guint8 inter_char; 
+  guint8 resp_to; 
+  guint8 nbr_retries;
+  proto_item *item = NULL;
+
+  /* special case to simplify handling of Negotiate service */
+  if ((cmd & 0xF0) == C1222_CMD_NEGOTIATE) {
+    numrates = cmd & 0x0F;
+    cmd = C1222_CMD_NEGOTIATE;
+  }
+  proto_tree_add_uint(tree, cmd >= 0x20 ? hf_c1222_cmd : hf_c1222_err, tvb, *offset, 1, cmd);
+  (*offset)++;
+  (*length)--;
+  switch (cmd) {
+    case C1222_CMD_LOGON:
+	if (*length >= 12) {
+	    user_id = tvb_get_ntohs(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_logon_id, tvb, *offset, 2, user_id);
+	    *offset += 2;
+	    user_name = tvb_get_ephemeral_string(tvb, *offset, 10);
+	    proto_tree_add_string(tree, hf_c1222_logon_user, tvb, *offset, 10, user_name);
+	    *offset += 10;
+	    *length -= 12;
+	    proto_item_set_text(tree, "C12.22 EPSEM: %s (id %d, user \"%s\")", 
+		    val_to_str(cmd,commandnames,"Unknown (0x%02x)"), user_id, user_name);
+	} else {
+	    expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 LOGON command truncated");
+	}
+	break;
+    case C1222_CMD_SECURITY:
+	if (*length >= 20) {
+	    password = tvb_get_ephemeral_string(tvb, *offset, 20);
+	    proto_tree_add_string(tree, hf_c1222_security_password, tvb, *offset, 20, password);
+	    *offset += 20;
+	    *length -= 20;
+	    if (*length >= 2) {
+	      user_id = tvb_get_ntohs(tvb, *offset);
+	      proto_tree_add_uint(tree, hf_c1222_logon_id, tvb, *offset, 2, user_id);
+	      *offset += 2;
+	      *length -= 2;
+	      proto_item_set_text(tree, "C12.22 EPSEM: %s (password \"%s\", id %d)",
+		      val_to_str(cmd,commandnames,"Unknown (0x%02x)"), password, user_id);
+	    } else {
+	      proto_item_set_text(tree, "C12.22 EPSEM: %s (password \"%s\")",
+		      val_to_str(cmd,commandnames,"Unknown (0x%02x)"), password);
+	    }
+	} else {
+	    expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 SECURITY command truncated");
+	}
+	break;
+    case C1222_CMD_AUTHENTICATE:
+	if (*length >= 1) {
+	    auth_len = tvb_get_guint8(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_auth_len, tvb, *offset, 1, auth_len);
+	    *offset += 1;
+	    if (*length >= auth_len) {
+		auth_req = tvb_bytes_to_str(tvb, *offset, auth_len);
+		proto_tree_add_item(tree, hf_c1222_auth_data, tvb, *offset, auth_len, ENC_NA);
+		*offset += auth_len;
+		*length -= auth_len + 1;
+		proto_item_set_text(tree, "C12.22 EPSEM: %s (%d bytes: %s)", 
+		    val_to_str(cmd,commandnames,"Unknown (0x%02x)"), auth_len, auth_req);
+	    } else {
+		expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 AUTHENTICATE command truncated");
+	    }
+	} else {
+	    expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 AUTHENTICATE command truncated");
+	}
+	break;
+    case C1222_CMD_FULL_READ:
+	if (*length >= 2) {
+	    table = tvb_get_ntohs(tvb, *offset);
+	    item = proto_tree_add_uint(tree, hf_c1222_read_table, tvb, *offset, 2, table);
+	    proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d)",
+		    val_to_str(cmd,commandnames,"Unknown (0x%02x)"), 
+		    val_to_str((table >> 8) & 0xF8, tableflags,"Unknown (0x%04x)"), table & 0x7FF);
+	    *offset += 2;
+	    *length -= 2;
+	} else {
+	    expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 READ command truncated");
+	}
+	break;
+    case C1222_CMD_PARTIAL_READ_OFFSET:
+	if (*length >= 7) {
+	    table = tvb_get_ntohs(tvb, *offset);
+	    item = proto_tree_add_uint(tree, hf_c1222_read_table, tvb, *offset, 2, table);
+	    *offset += 2;
+	    *length -= 2;
+	    proto_tree_add_item(tree, hf_c1222_read_offset, tvb, *offset, 3, ENC_BIG_ENDIAN);
+	    *offset += 3;
+	    *length -= 3;
+	    proto_tree_add_item(tree, hf_c1222_read_count, tvb, *offset, 2, ENC_BIG_ENDIAN);
+	    *offset += 2;
+	    *length -= 2;
+	    proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d)",
+		    val_to_str(cmd,commandnames,"Unknown (0x%02x)"), 
+		    val_to_str((table >> 8) & 0xF8, tableflags,"Unknown (0x%04x)"), table & 0x7FF);
+	} else {
+	    expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 READ command truncated");
+	}
+	break;
+    case C1222_CMD_FULL_WRITE:
+	if (*length >= 5) {
+	    table = tvb_get_ntohs(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_write_table, tvb, *offset, 2, table);
+	    *offset += 2;
+	    *length -= 2;
+	    tblsize = tvb_get_ntohs(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_write_size, tvb, *offset, 2, tblsize);
+	    *offset += 2;
+	    *length -= 2;
+	    if (*length >= tblsize+1U) {
+		proto_tree_add_item(tree, hf_c1222_write_data, tvb, *offset, tblsize, ENC_NA);
+		*offset += tblsize;
+		*length -= tblsize;
+		chksum = tvb_get_guint8(tvb, *offset);
+		item = proto_tree_add_uint(tree, hf_c1222_write_chksum, tvb, *offset, 1, chksum);
+		calcsum = c1222_cksum(tvb, (*offset)-tblsize, tblsize);
+		if (chksum != calcsum) {
+		  expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_ERROR, "Bad checksum [should be 0x%02x]", calcsum);
+		}
+		proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d)",
+			val_to_str(cmd,commandnames,"Unknown (0x%02x)"), 
+			val_to_str((table >> 8) & 0xF8, tableflags,"Unknown (0x%04x)"), table & 0x7FF);
+		*offset += 1;
+		*length -= 1;
+	    } else {
+		expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 WRITE command truncated");
+	    }
+	} else {
+	    expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 WRITE command truncated");
+	}
+	break;
+    case C1222_CMD_PARTIAL_WRITE_OFFSET:
+	if (*length >= 8) {
+	    table = tvb_get_ntohs(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_write_table, tvb, *offset, 2, table);
+	    *offset += 2;
+	    *length -= 2;
+	    proto_tree_add_item(tree, hf_c1222_write_offset, tvb, *offset, 3, ENC_BIG_ENDIAN);
+	    *offset += 3;
+	    *length -= 3;
+	    tblsize = tvb_get_ntohs(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_write_size, tvb, *offset, 2, tblsize);
+	    *offset += 2;
+	    *length -= 2;
+	    if (*length >= tblsize+1U) {
+		proto_tree_add_item(tree, hf_c1222_write_data, tvb, *offset, tblsize, ENC_NA);
+		*offset += tblsize;
+		*length -= tblsize;
+		chksum = tvb_get_guint8(tvb, *offset);
+		item = proto_tree_add_uint(tree, hf_c1222_write_chksum, tvb, *offset, 1, chksum);
+		calcsum = c1222_cksum(tvb, (*offset)-tblsize, tblsize);
+		if (chksum != calcsum) {
+		  expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_ERROR, "Bad checksum [should be 0x%02x]", calcsum);
+		}
+		proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d)",
+			val_to_str(cmd,commandnames,"Unknown (0x%02x)"), 
+			val_to_str((table >> 8) & 0xF8, tableflags,"Unknown (0x%04x)"), table & 0x7FF);
+		*offset += 1;
+		*length -= 1;
+	    } else {
+		expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 WRITE command truncated");
+	    }
+	} else {
+	    expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 WRITE command truncated");
+	}
+	break;
+    case C1222_CMD_WAIT:
+	if (*length >= 1) {
+	    wait_seconds = tvb_get_guint8(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_wait_secs, tvb, *offset, 1, wait_seconds);
+	    *offset += 1;
+	    *length -= 1;
+	    proto_item_set_text(tree, "C12.22 EPSEM: %s (%d seconds)",
+		val_to_str(cmd,commandnames,"Unknown (0x%02x)"), wait_seconds);
+	} else {
+	    expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 WAIT command truncated");
+	}
+	break;
+    case C1222_CMD_NEGOTIATE:
+	if (*length >= 3) {
+	    packet_size = tvb_get_ntohs(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_neg_pkt_size, tvb, *offset, 2, packet_size);
+	    *offset += 2;
+	    *length -= 2;
+	    nbr_packet = tvb_get_guint8(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_neg_nbr_pkts, tvb, *offset, 1, nbr_packet);
+	    *offset += 1;
+	    *length -= 1;
+	    proto_item_set_text(tree, "C12.22 EPSEM: %s (pkt size %d, num pkts %d, with %d baud rates)",
+		    val_to_str(cmd,commandnames,"Unknown (0x%02x)"), packet_size, nbr_packet, numrates);
+	} else {
+	    expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 NEGOTIATE command truncated");
+	}
+	break;
+    case C1222_CMD_TIMING_SETUP:
+	if (*length >= 4) {
+	    traffic = tvb_get_guint8(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_timing_setup_traffic, tvb, *offset, 1, traffic);
+	    *offset += 1;
+	    *length -= 1;
+	    inter_char = tvb_get_guint8(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_timing_setup_inter_char, tvb, *offset, 1, inter_char);
+	    *offset += 1;
+	    *length -= 1;
+	    resp_to = tvb_get_guint8(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_timing_setup_resp_to, tvb, *offset, 1, resp_to);
+	    *offset += 1;
+	    *length -= 1;
+	    nbr_retries = tvb_get_guint8(tvb, *offset);
+	    proto_tree_add_uint(tree, hf_c1222_timing_setup_nbr_retries, tvb, *offset, 1, nbr_retries);
+	    *offset += 1;
+	    *length -= 1;
+	    proto_item_set_text(tree, "C12.22 EPSEM: %s (traffic to %d s, inter-char to %d s, response to %d s, %d retries)",
+		    val_to_str(cmd,commandnames,"Unknown (0x%02x)"), traffic, inter_char, resp_to, nbr_retries);
+	} else {
+	    expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 NEGOTIATE command truncated");
+	}
+	break;
+
+    default:
+	/* don't do anything */
+	proto_item_set_text(tree, "C12.22 EPSEM: %s", val_to_str(cmd, commandnames, "Unknown (0x%02x)"));
+	if (*length) {
+	    if (*length >= *length) {
+	      proto_tree_add_item(tree, hf_c1222_data, tvb, *offset, *length, ENC_NA);
+	    } else {
+		expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 unknown command truncated");
+	    }
+	}
+	break;
+  }
+}
+
+#ifdef HAVE_LIBGCRYPT
+typedef struct tagTOP_ELEMENT_CONTROL 
+{
+  /* TRUE if this tag is required */
+  gboolean required;
+  /* TRUE if we must truncate this tag */
+  gboolean truncate;
+  /* actual hex value of the tag we're seeking */
+  guint8 tag;
+  /* if TRUE, add tag and length before copying */
+  gboolean addtag;
+  /* pointer to pointer to memory copy of element */
+  guint8 **element;
+  /* pointer to element length */
+  guint32 *length;
+} TOP_ELEMENT_CONTROL;
+
+static const TOP_ELEMENT_CONTROL canonifyTable[] = {
+  { FALSE, FALSE, 0xA1, TRUE, &aSO_context, &aSO_context_len },
+  { TRUE , FALSE, 0xA2, TRUE, &called_AP_title, &called_AP_title_len },
+  { FALSE, FALSE, 0xA4, TRUE, &called_AP_invocation_id, &called_AP_invocation_id_len },
+  { FALSE, FALSE, 0xA3, TRUE, &calling_AE_qualifier, &calling_AE_qualifier_len },
+  { TRUE,  FALSE, 0xA8, TRUE, &calling_AP_invocation_id, &calling_AP_invocation_id_len },
+  { FALSE, FALSE, 0x8B, TRUE, &mechanism_name, &mechanism_name_len },
+  { FALSE, FALSE, 0xAC, TRUE, &calling_authentication_value, &calling_authentication_value_len },
+  { TRUE , TRUE , 0xBE, TRUE, &user_information, &user_information_len },
+  { FALSE, FALSE, 0xA6, TRUE, &calling_AP_title, &calling_AP_title_len },
+  { FALSE, FALSE, 0xAC, FALSE, &key_id_element, &key_id_element_len },
+  { FALSE, FALSE, 0xAC, FALSE, &iv_element, &iv_element_len },
+  { FALSE, FALSE, 0x0,  TRUE, NULL, NULL }
+};
+
+/**
+ * Calculates the size of the passed number n as encoded as a BER length field.
+ *
+ * \param n is the length value to be BER encoded
+ * \returns the sized of the encoding
+ */
+static guint32
+get_ber_len_size(guint32 n)
+{
+  guint32 len = 1;
+  if (n > 0x7f) len++;
+  if (n > 0xff) len++;
+  if (n > 0xffff) len++;
+  if (n > 0xffffff) len++;
+  return len;
+}
+/**
+ * Encodes the passed value n as a BER-encoded length at puts it in memory.
+ *
+ * \param ptr points to the buffer to be written
+ * \param n is the length to be BER encoded
+ * \maxsize is the maximum number of bytes we're allowed to write
+ * \returns length of encoded value in bytes
+ */
+static int
+encode_ber_len(guint8 *ptr, guint32 n, int maxsize)
+{
+  int len = get_ber_len_size(n);
+  if (len > maxsize) return 0;
+  if (len == 1) {
+    *ptr = 0x7f & n;
+  } else {
+    *ptr = (len -1) | 0x80;
+    for (ptr += len-1; n; n >>= 8)
+      *ptr-- = n & 0xff;
+  } 
+  return len;
+
+}
+    
+/**
+ * Checks a new encryption table item for validity.
+ *
+ * \param n points to the new record
+ * \param err is updated to point to an error string if needed
+ */
+static void
+c1222_uat_data_update_cb(void* n, const char** err) 
+{
+  c1222_uat_data_t* new_rec = n;
+
+  if (new_rec->keynum > 0xff) {
+    *err = "Invalid key number; must be less than 256";
+  }
+  if (new_rec->keylen != EAX_SIZEOF_KEY) {
+    *err = "Invalid key size; must be 16 bytes";
+  }
+}
+
+/**
+ * Canonifies header fields in preparation for authenticating and/or decrypting the packet.
+ *
+ * \param buff points to the allocated canonization buffer
+ * \param offset points to start of unallocated space in buffer and 
+      is updated as we put bytes into buffer
+ * \param buffsize total size of allocated buffer
+ * \return FALSE if element is required and not present; otherwise TRUE 
+ */
+static gboolean
+canonify_unencrypted_header(guchar *buff, guint32 *offset, guint32 buffsize)
+{
+  const TOP_ELEMENT_CONTROL *t = canonifyTable;
+  guint32 len;
+
+  for (t = canonifyTable; t->element != NULL; t++) 
+  {
+    len = *(t->length);
+    if (t->required && *(t->element) == NULL) 
+      return FALSE;
+    if (*(t->element) != NULL) {
+      if (t->addtag) { 
+	/* recreate original tag and length */
+	buff[(*offset)++] = t->tag;
+	(*offset) += encode_ber_len(&buff[*offset], len, 4);
+      } 
+      if (t->truncate) {
+        len = 3+2*get_ber_len_size(len);
+      }
+      /* bail out if the cannonization buffer is too small */
+      /* this should never happen! */
+      if (buffsize < *offset + len) {
+	return FALSE;
+      }
+      memcpy(&buff[*offset], *(t->element), len);
+      (*offset) += len;
+      g_free(*(t->element));
+      *(t->element) = NULL;
+    }
+  }
+  return TRUE;
+}
+
+/**
+ * Looks up the required key in the key table.
+ *
+ * \param keybuf is updated with a copy of the key data if successful lookup.
+ * \param keyid is the ID number of the desired key
+ * \returns TRUE if key was found; otherwise FALSE
+ */
+static gboolean 
+keylookup(guint8 *keybuff, guint8 keyid)
+{
+  guint i;
+
+  if (c1222_uat_data == NULL)
+    return FALSE;
+  for (i = 0; i < num_c1222_uat_data; i++) {
+    if (c1222_uat_data[i].keynum == keyid) {
+      memcpy(keybuff, c1222_uat_data[i].key, EAX_SIZEOF_KEY);
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+#endif /* HAVE_LIBGCRYPT */
+
+/**
+ * Authenticates and decrypts the passed packet.
+ *
+ * \param buffer points to a memory copy of the packet to be authenticated/decrypted 
+ *	and contains the decrypted value on successful return.
+ * \param length lenth of input packet
+ * \param decrypt TRUE if packet is to be authenticated and decrypted; FALSE if authentication only is requested
+ * \returns TRUE if the requested operation was successful; otherwise FALSE
+ */
+static gboolean 
+decrypt_packet(guchar *buffer, guint32 length, gboolean decrypt)
+{
+#ifdef HAVE_LIBGCRYPT
+#define CANONBUFFSIZE 300U
+  guchar canonbuff[CANONBUFFSIZE];
+  guint8 c1222_key[EAX_SIZEOF_KEY];
+  guchar key_id = 0;
+  guint32 offset = 0;
+  gboolean status = FALSE;
+
+  /* must be at least 4 bytes long to include the MAC */
+  if (length < 4) 
+    return status;
+  if (key_id_element != NULL)
+    key_id = key_id_element[0];
+  /* extract unencrypted header information */
+  if (!canonify_unencrypted_header(canonbuff, &offset, CANONBUFFSIZE))
+    return status;
+  /* decrypt and authenticate in place */
+/* PARAMETERS:     pN     : Pointer to ClearText (Input, Canonified form).    */
+/*                 pK     : Pointer to secret key (Input).                    */
+/*                 pC     : Pointer to CipherText (Input/Output).             */
+/*                 SizeN  : Byte length of ClearText buffer.                  */
+/*                 SizeK  : Byte length of secret key.                        */
+/*                 SizeC  : Byte length of CipherText buffer.                 */
+/*                 pMac   : Four byte Message Authentication Code.            */
+/*                 Mode   : Operating mode (See EAX_MODE_xxx).                */
+/* RETURNS:        TRUE if message has been authenticated.                    */
+/*                 FALSE if not authenticated, invalid Mode, or error.        */
+  if (offset) {
+    if (!keylookup((guint8 *)&c1222_key, key_id)) 
+      return FALSE;
+    status = Eax_Decrypt(canonbuff, c1222_key, buffer,
+		  offset, EAX_SIZEOF_KEY, length-4, 
+		  (MAC_T *)&buffer[length-4], 
+		  decrypt ? EAX_MODE_CIPHERTEXT_AUTH : EAX_MODE_CLEARTEXT_AUTH);
+  }
+  return status;
+#else /* HAVE_LIBCRYPT */  
+  /* these are to silence compiler unreferenced variable warnings */
+  buffer=buffer;
+  length=length;
+  decrypt=decrypt;
+  return FALSE;
+#endif /* HAVE_LIBGCRYPT */
+}
+
+/**
+ * Checks to make sure that a complete, valid BER-encoded length is in the buffer.
+ *
+ * \param tvb contains the buffer to be examined
+ * \param offset is the offset within the buffer at which the BER-encded length begins
+ * \returns TRUE if a complete, valid BER-encoded length is in the buffer; otherwise FALSE
+ */
+static gboolean
+ber_len_ok(tvbuff_t *tvb, int offset)
+{
+  guint8 ch;
+
+  if (tvb_offset_exists(tvb, offset)) {
+    ch = tvb_get_guint8(tvb, offset);
+    offset++;
+    if (!(ch & 0x80)) {
+      return TRUE;
+    } else if (tvb_offset_exists(tvb, offset)) {
+      ch = tvb_get_guint8(tvb, offset);
+      offset++;
+      if (!(ch & 0x80)) {
+	return TRUE;
+      } else if (tvb_offset_exists(tvb, offset)) {
+	ch = tvb_get_guint8(tvb, offset);
+	offset++;
+	if (!(ch & 0x80)) {
+	  return TRUE;
+	} else if (tvb_offset_exists(tvb, offset)) {
+	  ch = tvb_get_guint8(tvb, offset);
+	  offset++;
+	  if (!(ch & 0x80)) {
+	    return TRUE;
+	  }
+	}
+      }
+    }
+  }
+  return FALSE;
+}
+
+/**
+ * Dissects the EPSEM portion of the User-information part of a C12.22 message.
+ *
+ * \param tvb
+ * \param offset
+ * \param len
+ * \param pinfo
+ * \param tree
+ */
+static int
+dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_tree *tree)
+{
+  /* proto_tree *ft = NULL; */
+  proto_tree *cmd_tree = NULL;
+  proto_tree *ct = NULL;
+  proto_tree *crypto_tree = NULL;
+  proto_tree *yt = NULL;
+  proto_item *item = NULL;
+  guint8 flags;
+  int local_offset;
+  guint32 len2;
+  int cmd_err;
+  gboolean ind;
+  guchar *buffer;
+  tvbuff_t *epsem_buffer = NULL;
+  gboolean crypto_good = FALSE;
+  gboolean crypto_bad = FALSE;
+  gboolean hasmac = FALSE;
+  gboolean encrypted = FALSE;
+
+  if ((tvb == NULL) && (len == 0)) {
+      expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 EPSEM missing");
+      return offset;
+  }
+  /* parse the flags byte which is always unencrypted */
+  flags = tvb_get_guint8(tvb, offset);
+  /* ft = proto_tree_add_bitmask(tree, tvb, offset, hf_c1222_epsem_flags, ett_c1222_flags, c1222_flags, FALSE);  */
+  offset++;
+  switch ((flags & C1222_EPSEM_FLAG_SECURITY_MODE) >> 2) {
+    case EAX_MODE_CIPHERTEXT_AUTH:
+      /* mode is ciphertext with authentication */
+      hasmac = TRUE;
+      len2 = tvb_length_remaining(tvb, offset);
+      encrypted = TRUE;
+      if (c1222_decrypt) {
+	buffer = tvb_memdup(tvb, offset, len2);
+	if (!decrypt_packet(buffer, len2, TRUE)) {
+	  g_free(buffer);
+	  crypto_bad = TRUE;
+	} else {
+	  epsem_buffer = tvb_new_real_data(buffer, len2, len2);
+	  tvb_set_child_real_data_tvbuff(tvb, epsem_buffer);
+	  add_new_data_source(pinfo, epsem_buffer, "Decrypted EPSEM Data");
+	  crypto_good = TRUE;
+	  encrypted = FALSE;
+	}
+      }
+      break;
+    case EAX_MODE_CLEARTEXT_AUTH:
+      /* mode is cleartext with authentication */
+      hasmac = TRUE;
+      len2 = tvb_length_remaining(tvb, offset);
+      buffer = tvb_memdup(tvb, offset, len2);
+      epsem_buffer = tvb_new_subset(tvb, offset, -1, -1);
+      if (c1222_decrypt) {
+	if (!decrypt_packet(buffer, len2, FALSE)) {
+#ifdef HAVE_LIBGCRYPT
+	  crypto_bad = TRUE;
+	  expert_add_info_format(pinfo, tree, PI_SECURITY, PI_ERROR, "C12.22 EPSEM failed authentication");
+#else /* HAVE_LIBGCRYPT */
+	  expert_add_info_format(pinfo, tree, PI_SECURITY, PI_WARN, "C12.22 EPSEM could not be authenticated");
+#endif /* HAVE_LIBGCRYPT */
+	} else {
+	  crypto_good = TRUE;
+	}
+      }
+      break;
+    default:
+      /* it's not encrypted */
+      epsem_buffer = tvb_new_subset(tvb, offset, -1, -1);
+  }
+  /* it's only encrypted if we have an undecrypted payload */
+  if (encrypted) {
+    proto_tree_add_item(tree, hf_c1222_epsem_total, tvb, offset, -1, ENC_NA); 
+    expert_add_info_format(pinfo, tree, PI_UNDECODED, PI_WARN, "C12.22 EPSEM could not be decrypted");
+    local_offset = offset+len2-4;
+    epsem_buffer = tvb;
+  } else {  /* it's not (now) encrypted */
+    local_offset = 0;
+    /* retrieve the ed_class if it's there */
+    if (flags & C1222_EPSEM_FLAG_ED_CLASS_INCLUDED) {
+      if (tvb_offset_exists(epsem_buffer, local_offset+4-1)) {
+	proto_tree_add_item(tree, hf_c1222_epsem_ed_class, epsem_buffer, local_offset, 4, ENC_NA);
+	local_offset += 4;
+      } else {
+	expert_add_info_format(pinfo, tree, PI_SECURITY, PI_ERROR, "C12.22 ED Class missing");
+      }
+    }
+    /* what follows are one or more <epsem-data> elements possibly followed by
+     * a <mac>.  Each <epsem-data> element is defined as <service-length><res-req>, 
+     * so we fetch such pairs until there isn't anything left (except possibly
+     * the <mac>).
+     */
+    while (tvb_offset_exists(epsem_buffer, local_offset+(hasmac?5:1))) {
+      if (ber_len_ok(epsem_buffer, local_offset)) {
+	local_offset = dissect_ber_length(pinfo, tree, epsem_buffer, local_offset, &len2, &ind);
+      } else {
+	expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 EPSEM BER length error");
+	return offset+len;
+      }
+      if (tvb_offset_exists(epsem_buffer, local_offset+len2-1)) {
+	cmd_err = tvb_get_guint8(epsem_buffer, local_offset);
+	ct = proto_tree_add_item(tree, hf_c1222_epsem_total, epsem_buffer, local_offset, len2, ENC_NA);
+	cmd_tree = proto_item_add_subtree(ct, ett_c1222_cmd);
+	parse_c1222_detailed(epsem_buffer, pinfo, cmd_tree, cmd_err, &len2, &local_offset);
+	local_offset += len2;
+      } else {
+	expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 EPSEM field length error");
+	return offset+len;
+      }
+    }
+  }
+  if (hasmac) {
+    if (tvb_offset_exists(epsem_buffer, local_offset+4-1)) { 
+      yt = proto_tree_add_item(tree, hf_c1222_epsem_mac, epsem_buffer, local_offset, 4, ENC_NA);
+      /* now we have enough information to fill in the crypto subtree */
+      crypto_tree = proto_item_add_subtree(yt, ett_c1222_crypto);
+      item = proto_tree_add_boolean(crypto_tree, hf_c1222_epsem_crypto_good, tvb, local_offset, 4, crypto_good);
+      PROTO_ITEM_SET_GENERATED(item);
+      item = proto_tree_add_boolean(crypto_tree, hf_c1222_epsem_crypto_bad, tvb, local_offset, 4, crypto_bad);
+      PROTO_ITEM_SET_GENERATED(item);
+    } else {
+      expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR, "C12.22 MAC missing");
+      return offset+len;
+    }
+  }
+  return offset;
+}
+
+#include "packet-c1222-fn.c"
+
+/**
+ * Dissects a a full (reassembled) C12.22 message.
+ *
+ * \param tvb
+ * \param pinfo
+ * \param tree
+ */
+static void
+dissect_c1222_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+    proto_item      *c1222_item = NULL;
+    proto_tree	    *c1222_tree = NULL;
+
+    /* make entry in the Protocol column on summary display */
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME);
+
+    /* create the c1222 protocol tree */
+    if (tree) {
+        c1222_item = proto_tree_add_item(tree, proto_c1222, tvb, 0, -1, ENC_NA);
+        c1222_tree = proto_item_add_subtree(c1222_item, ett_c1222);
+        dissect_C1222_MESSAGE_PDU(tvb, pinfo, c1222_tree);
+    }
+}
+
+/**
+ * Fetches the length of an entire C12.22 message to assist in reassembly.
+ *
+ * \param pinfo
+ * \param tvb
+ * \param offset
+ * \returns length of entire C12.22 message
+ */
+static guint
+get_c1222_message_len(packet_info *pinfo, tvbuff_t *tvb, int offset)
+{
+  int orig_offset;
+  guint length;
+  gboolean ind;
+
+  orig_offset = offset;
+  /* note that this assumes a Tag length of 1 which is always valid for C12.22 */
+  offset = dissect_ber_length(pinfo, NULL, tvb, offset+1, &length, &ind);
+  return length+(offset - orig_offset);
+}
+
+/**
+ * Reassembles and dissects C12.22 messages.
+ *
+ * \param tvb
+ * \param pinfo
+ * \param tree
+ */
+static void 
+dissect_c1222(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+    tcp_dissect_pdus(tvb, pinfo, tree, c1222_desegment, 5, 
+	    get_c1222_message_len, dissect_c1222_full);
+}
+
+/*--- proto_register_c1222 -------------------------------------------*/
+void proto_register_c1222(void) {
+
+  /* List of fields */
+  static hf_register_info hf[] = {
+   { &hf_c1222_epsem_flags,
+    { "C12.22 EPSEM Flags", "c1222.epsem.flags",
+    FT_UINT8, BASE_HEX,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_epsem_flags_reserved,
+    { "C12.22 Reserved Flag", "c1222.epsem.flags.reserved",
+    FT_BOOLEAN, 8,
+    NULL, C1222_EPSEM_FLAG_RESERVED,
+    NULL, HFILL }
+   },
+   { &hf_c1222_epsem_flags_recovery,
+    { "C12.22 Recovery Flag", "c1222.epsem.flags.recovery",
+    FT_BOOLEAN, 8,
+    NULL, C1222_EPSEM_FLAG_RECOVERY_SESSION,
+    NULL, HFILL }
+   },
+   { &hf_c1222_epsem_flags_proxy,
+    { "C12.22 Proxy Service Used Flag", "c1222.epsem.flags.proxy",
+    FT_BOOLEAN, 8,
+    NULL, C1222_EPSEM_FLAG_PROXY_SERVICE_USED,
+    NULL, HFILL }
+   },
+   { &hf_c1222_epsem_flags_ed_class,
+    { "C12.22 ED Class Flag", "c1222.epsem.flags.ed_class",
+    FT_BOOLEAN, 8,
+    NULL, C1222_EPSEM_FLAG_ED_CLASS_INCLUDED,
+    NULL, HFILL }
+   },
+   { &hf_c1222_epsem_flags_security_modes,
+    { "C12.22 Security Mode Flags", "c1222.epsem.flags.security",
+    FT_UINT8, BASE_HEX,
+    VALS(c1222_security_modes), C1222_EPSEM_FLAG_SECURITY_MODE,
+    NULL, HFILL }
+   },
+   { &hf_c1222_epsem_flags_response_control,
+    { "C12.22 Response Control Flags", "c1222.epsem.flags.response_control",
+    FT_UINT8, BASE_HEX,
+    VALS(c1222_response_control), C1222_EPSEM_FLAG_RESPONSE_CONTROL,
+    NULL, HFILL }
+   },
+   { &hf_c1222_epsem_ed_class,
+    { "C12.22 EPSEM ED Class", "c1222.epsem.edclass",
+    FT_BYTES, BASE_NONE,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_epsem_total,
+    { "C12.22 EPSEM", "c1222.epsem.data",
+    FT_BYTES, BASE_NONE,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_epsem_mac,
+    { "C12.22 EPSEM MAC", "c1222.epsem.mac",
+    FT_BYTES, BASE_NONE,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_cmd,
+    { "C12.22 Command", "c1222.cmd",
+    FT_UINT8, BASE_HEX,
+    VALS(commandnames), 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_err,
+    { "C12.22 Response", "c1222.err",
+    FT_UINT8, BASE_HEX,
+    VALS(commandnames), 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_logon_id,
+    { "C12.22 Logon User-Id", "c1222.logon.id",
+    FT_UINT16, BASE_DEC,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_logon_user,
+    { "C12.22 Logon User", "c1222.logon.user",
+    FT_STRING, BASE_NONE,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_security_password,
+    { "C12.22 Security Password", "c1222.security.password",
+    FT_STRING, BASE_NONE,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_auth_len,
+    { "C12.22 Authenticate Request Length", "c1222.authenticate.len",
+    FT_UINT8, BASE_DEC,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_auth_data,
+    { "C12.22 Authenticate Data", "c1222.authenticate.data",
+    FT_BYTES, BASE_NONE,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_read_table,
+    { "C12.22 Table", "c1222.read.table",
+    FT_UINT16, BASE_HEX,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_read_offset,
+    { "C12.22 Offset", "c1222.read.offset",
+    FT_UINT24, BASE_HEX,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_read_count,
+    { "C12.22 Count", "c1222.read.count",
+    FT_UINT16, BASE_DEC,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_write_table,
+    { "C12.22 Table", "c1222.write.table",
+    FT_UINT16, BASE_HEX,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_write_offset,
+    { "C12.22 Offset", "c1222.write.offset",
+    FT_UINT24, BASE_HEX,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_write_size,
+    { "C12.22 Table Size", "c1222.write.size",
+    FT_UINT16, BASE_HEX,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_write_data,
+    { "C12.22 Table Data", "c1222.write.data",
+    FT_BYTES, BASE_NONE,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_write_chksum,
+    { "C12.22 Table Data Checksum", "c1222.write.chksum",
+    FT_UINT8, BASE_HEX,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_neg_pkt_size,
+    { "C12.22 Negotiate Packet Size", "c1222.negotiate.pktsize",
+    FT_UINT16, BASE_DEC,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_neg_nbr_pkts,
+    { "C12.22 Negotiate Number of Packets", "c1222.negotiate.numpkts",
+    FT_UINT8, BASE_DEC,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_wait_secs,
+    { "C12.22 Wait Seconds", "c1222.wait.seconds",
+    FT_UINT8, BASE_DEC,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_timing_setup_traffic,
+    { "C12.22 Timing Setup Channel Traffic Timeout", "c1222.timingsetup.traffic",
+    FT_UINT8, BASE_DEC,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_timing_setup_inter_char,
+    { "C12.22 Timing Setup Intercharacter Timeout", "c1222.timingsetup.interchar",
+    FT_UINT8, BASE_DEC,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_timing_setup_resp_to,
+    { "C12.22 Timing Setup Response Timeout", "c1222.timingsetup.respto",
+    FT_UINT8, BASE_DEC,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_timing_setup_nbr_retries,
+    { "C12.22 Timing Setup Number of Retries", "c1222.timingsetup.nbrretries",
+    FT_UINT8, BASE_DEC,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_data,
+    { "C12.22 data", "c1222.data",
+    FT_BYTES, BASE_NONE,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_crc,
+    { "C12.22 CRC", "c1222.crc",
+    FT_UINT16, BASE_HEX,
+    NULL, 0x0,
+    NULL, HFILL }
+   },
+   { &hf_c1222_epsem_crypto_good,
+    { "Crypto good", "c1222.crypto_good",
+    FT_BOOLEAN, BASE_NONE,
+    NULL, 0x0,
+    "True: crypto ok; False: doesn't match or not checked", HFILL }
+   },
+   { &hf_c1222_epsem_crypto_bad,
+    { "Crypto bad", "c1222.crypto_bad",
+    FT_BOOLEAN, BASE_NONE,
+    NULL, 0x0,
+    "True: crypto bad; False: crypto ok or not checked", HFILL }
+   },
+#include "packet-c1222-hfarr.c"
+  };
+
+  /* List of subtrees */
+  static gint *ett[] = {
+                  &ett_c1222,
+  		  &ett_c1222_epsem,
+  		  &ett_c1222_flags,
+		  &ett_c1222_crypto,
+  		  &ett_c1222_cmd,
+#include "packet-c1222-ettarr.c"
+  };
+
+  module_t *c1222_module;
+
+#ifdef HAVE_LIBGCRYPT
+  static uat_field_t c1222_uat_flds[] = {
+    UAT_FLD_HEX(c1222_users,keynum,"Key ID","Key identifier in hexadecimal"),
+    UAT_FLD_BUFFER(c1222_users, key, "Key", "Encryption key as 16-byte hex string"),
+    UAT_END_FIELDS
+  };
+#endif /* HAVE_LIBGCRYPT */
+
+  /* Register protocol */
+  proto_c1222 = proto_register_protocol(PNAME, PSNAME, PFNAME);
+  /* Register fields and subtrees */
+  proto_register_field_array(proto_c1222, hf, array_length(hf));
+  proto_register_subtree_array(ett, array_length(ett));
+  c1222_module = prefs_register_protocol(proto_c1222, proto_reg_handoff_c1222);
+  prefs_register_bool_preference(c1222_module, "desegment",
+	"Reassemble all C12.22 messages spanning multiple TCP segments",
+	"Whether the C12.22 dissector should reassemble all messages spanning multiple TCP segments",
+	&c1222_desegment);
+#ifdef HAVE_LIBGCRYPT
+  prefs_register_bool_preference(c1222_module, "decrypt",
+	"Verify crypto for all applicable C12.22 messages",
+	"Whether the C12.22 dissector should verify the crypto for all relevant messages",
+	&c1222_decrypt);
+
+  c1222_uat = uat_new("Decryption Table",
+      sizeof(c1222_uat_data_t),		/* record size */
+      "c1222_decryption_table",		/* filename */
+      TRUE,				/* from_profile */
+      (void*)&c1222_uat_data,		/* data_ptr */
+      &num_c1222_uat_data,		/* numitems_ptr */
+      UAT_CAT_CRYPTO,			/* category */
+      NULL,				/* help */
+      NULL,				/* copy callback */
+      c1222_uat_data_update_cb,		/* update callback */
+      NULL,				/* free callback */
+      NULL,				/* post update callback */
+      c1222_uat_flds);			/* UAT field definitions */
+
+  prefs_register_uat_preference(c1222_module,
+      "decryption_table",
+      "Decryption Table",
+      "Table of security parameters for decryption of C12.22 packets",
+      c1222_uat);
+#endif /* HAVE_LIBGCRYPT */
+}
+
+/*--- proto_reg_handoff_c1222 ---------------------------------------*/
+void
+proto_reg_handoff_c1222(void)
+{
+    static gboolean initialized = FALSE;
+
+    if( !initialized ) {
+        c1222_handle = create_dissector_handle(dissect_c1222, proto_c1222);
+        dissector_add_uint("tcp.port", global_c1222_port, c1222_handle);
+        initialized = TRUE;
+    }
+}
diff --git a/asn1/c1222/packet-c1222-template.h b/asn1/c1222/packet-c1222-template.h
new file mode 100644
index 0000000000..f11c00081f
--- /dev/null
+++ b/asn1/c1222/packet-c1222-template.h
@@ -0,0 +1,31 @@
+/* packet-c1222.h
+ * Routines for ANSI C12.22 packet dissection
+ * Copyright 2010, Edward J. Beroset, edward.j.beroset@us.elster.com
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef PACKET_C1222_H
+#define PACKET_C1222_H
+
+#endif  /* PACKET_C1222_H */
+
+