From 868825629a3a824a230947fc9a20beecabebc8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Wed, 10 Oct 2007 17:57:33 +0000 Subject: Finish conversion (well, almost, need to add the generation stuff to the x.../Makefile.common. I love circular dependencies. svn path=/trunk/; revision=23138 --- asn1/x509af/Makefile | 16 ------------ asn1/x509af/Makefile.am | 25 +++++++++++++++++++ asn1/x509af/Makefile.common | 52 ++++++++++++++++++++++++++++++++++++++ asn1/x509af/Makefile.nmake | 61 ++++++++++++++++----------------------------- asn1/x509af/x509af-exp.cnf | 59 ------------------------------------------- 5 files changed, 99 insertions(+), 114 deletions(-) delete mode 100644 asn1/x509af/Makefile create mode 100644 asn1/x509af/Makefile.am create mode 100644 asn1/x509af/Makefile.common delete mode 100644 asn1/x509af/x509af-exp.cnf (limited to 'asn1/x509af') diff --git a/asn1/x509af/Makefile b/asn1/x509af/Makefile deleted file mode 100644 index 3e860587a2..0000000000 --- a/asn1/x509af/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ - -DISSECTOR_FILES=packet-x509af.c packet-x509af.h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py AuthenticationFramework.asn packet-x509af-template.c packet-x509af-template.h x509af.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509ce/x509ce-exp.cnf - python ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn - -clean: - rm -f parsetab.py $(DISSECTOR_FILES) - -copy_files: generate_dissector - cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/x509af/Makefile.am b/asn1/x509af/Makefile.am new file mode 100644 index 0000000000..a034690647 --- /dev/null +++ b/asn1/x509af/Makefile.am @@ -0,0 +1,25 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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.common +include ../Makefile.inc + diff --git a/asn1/x509af/Makefile.common b/asn1/x509af/Makefile.common new file mode 100644 index 0000000000..29727eba22 --- /dev/null +++ b/asn1/x509af/Makefile.common @@ -0,0 +1,52 @@ +# $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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=x509af + +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +NEED_PACKET_PROTO_H = 1 + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = AuthenticationFramework.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 = \ + $(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 -e + +EXTRA_CNF= \ + ../x509ce/x509ce-exp.cnf \ + ../x509if/x509if-exp.cnf \ + ../x509sat/x509sat-exp.cnf + diff --git a/asn1/x509af/Makefile.nmake b/asn1/x509af/Makefile.nmake index 739c0219f4..b3fa922696 100644 --- a/asn1/x509af/Makefile.nmake +++ b/asn1/x509af/Makefile.nmake @@ -1,45 +1,28 @@ ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # # $Id$ +# +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# 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 - -UNIX2DOS=$(PERL) ../../tools/unix2dos.pl - -PROTOCOL_NAME=x509af -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h - -all: generate_dissector - -generate_dissector: $(DISSECTOR_FILES) - -$(DISSECTOR_FILES): ../../tools/asn2wrs.py AuthenticationFramework.asn packet-x509af-template.c packet-x509af-template.h x509af.cnf ../x509if/x509if-exp.cnf ../x509sat/x509sat-exp.cnf ../x509ce/x509ce-exp.cnf -!IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn -!ELSE - @echo Error: You need Python to use asn2wrs.py - @exit 1 -!ENDIF - -clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". -fix_eol: generate_dissector - move packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).c.tmp - move packet-$(PROTOCOL_NAME).h packet-$(PROTOCOL_NAME).h.tmp - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).c.tmp > packet-$(PROTOCOL_NAME).c - $(UNIX2DOS) < packet-$(PROTOCOL_NAME).h.tmp > packet-$(PROTOCOL_NAME).h - del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp +include Makefile.common +include ../../config.nmake +include ../Makefile.inc.nmake -copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y diff --git a/asn1/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf deleted file mode 100644 index 817623089f..0000000000 --- a/asn1/x509af/x509af-exp.cnf +++ /dev/null @@ -1,59 +0,0 @@ -# Do not modify this file. -# It is created automatically by the ASN.1 to Wireshark dissector compiler -# ./x509af-exp.cnf -# ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn - -#.MODULE -AuthenticationFramework x509af -#.END - -#.IMPORT_TAG -Certificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Version BER_CLASS_UNI BER_UNI_TAG_INTEGER -CertificateSerialNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER -AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Validity BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -SubjectPublicKeyInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Time BER_CLASS_ANY/*choice*/ -1/*choice*/ -Extensions BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Extension BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -Certificates BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -ForwardCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CrossCertificates BER_CLASS_UNI BER_UNI_TAG_SET -CertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertificatePair BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -CertificateList BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -AttributeCertificationPath BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -ACPathData BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -AttributeCertificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -AttributeCertificateInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -IssuerSerial BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -AttCertValidityPeriod BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -AttributeCertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE -#.END - -#.TYPE_ATTR -Certificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -Version TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(x509af_Version_vals) BITMASK = 0 -CertificateSerialNumber TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -AlgorithmIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -Validity TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -SubjectPublicKeyInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -Time TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x509af_Time_vals) BITMASK = 0 -Extensions TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -Extension TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -Certificates TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -ForwardCertificationPath TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -CrossCertificates TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -CertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertificatePair TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertificateList TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -AttributeCertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -ACPathData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -AttributeCertificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -AttributeCertificateInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -IssuerSerial TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -AttCertValidityPeriod TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -AttributeCertificateAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -#.END - -- cgit v1.2.1