diff options
author | Jörg Mayer <jmayer@loplof.de> | 2013-09-15 15:00:03 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-15 15:00:03 +0000 |
commit | c5ffff76d87088bd66834af0ce8f2694d53fd54b (patch) | |
tree | 11f6eb0a9f43bcbb8f9964bb4d2bc39e35d20b71 /asn1 | |
parent | 05ba7d3afcd5b010f1f324f8e8ced78d01dd4180 (diff) |
Fix checkapi warnings (missing id)
Replace Makefile.{am,nmake,common} that did not conform by
their asn1/c133/ version.
svn path=/trunk/; revision=52062
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/acp133/acp133.cnf | 15 | ||||
-rw-r--r-- | asn1/atn-cm/Makefile.am | 29 | ||||
-rw-r--r-- | asn1/atn-cm/Makefile.common | 31 | ||||
-rw-r--r-- | asn1/atn-cm/Makefile.nmake | 23 | ||||
-rw-r--r-- | asn1/atn-cm/atn-cm.cnf | 1 | ||||
-rw-r--r-- | asn1/atn-cpdlc/Makefile.am | 28 | ||||
-rw-r--r-- | asn1/atn-cpdlc/Makefile.common | 33 | ||||
-rw-r--r-- | asn1/atn-cpdlc/Makefile.nmake | 23 | ||||
-rw-r--r-- | asn1/atn-cpdlc/atn-cpdlc.cnf | 6 | ||||
-rw-r--r-- | asn1/atn-ulcs/Makefile.am | 25 | ||||
-rw-r--r-- | asn1/atn-ulcs/Makefile.common | 30 | ||||
-rw-r--r-- | asn1/atn-ulcs/Makefile.nmake | 23 | ||||
-rw-r--r-- | asn1/atn-ulcs/atn-ulcs.cnf | 13 | ||||
-rw-r--r-- | asn1/disp/disp.cnf | 6 | ||||
-rw-r--r-- | asn1/dop/dop.cnf | 12 | ||||
-rw-r--r-- | asn1/dsp/dsp.cnf | 14 | ||||
-rw-r--r-- | asn1/gsm_map/gsm_map.cnf | 11 | ||||
-rw-r--r-- | asn1/h450-ros/h450-ros.cnf | 3 | ||||
-rw-r--r-- | asn1/pkix1explicit/pkix1explicit_exp.cnf | 1 | ||||
-rw-r--r-- | asn1/pkix1implicit/pkix1implicit.cnf | 56 | ||||
-rw-r--r-- | asn1/pkix1implicit/pkix1implicit_exp.cnf | 1 | ||||
-rw-r--r-- | asn1/q932-ros/q932-ros.cnf | 3 | ||||
-rw-r--r-- | asn1/ros/ros.cnf | 8 | ||||
-rw-r--r-- | asn1/x509sat/x509sat.cnf | 26 |
24 files changed, 295 insertions, 126 deletions
diff --git a/asn1/acp133/acp133.cnf b/asn1/acp133/acp133.cnf index 45c5310368..3505a70cc7 100644 --- a/asn1/acp133/acp133.cnf +++ b/asn1/acp133/acp133.cnf @@ -1,5 +1,6 @@ # acp133.cnf # ACP133 conformation file +# $Id$ #.IMPORT ../p1/p1-exp.cnf #.IMPORT ../x509af/x509af-exp.cnf @@ -22,7 +23,7 @@ Kmid ##.CLASS OBJECT-CLASS #&Superclasses ClassReference OBJECT-CLASS -#&kind +#&kind #&MandatoryAttributes ClassReference ATTRIBUTE #&OptionalAttributes ClassReference ATTRIBUTE #&id ObjectIdentifierType @@ -30,27 +31,27 @@ Kmid ##.CLASS ATTRIBUTE #&derivation ClassReference ATTRIBUTE -#&Type +#&Type #&equality-match ClassReference MATCHING-RULE #&ordering-match ClassReference MATCHING-RULE #&substrings-match ClassReference MATCHING-RULE #&single-valued BooleanType #&collective BooleanType #&no-user-modification BooleanType -#&usage +#&usage #&id ObjectIdentifierType ##.END #.CLASS MATCHING-RULE &ParentMatchingRules ClassReference MATCHING-RULE -&AssertionType +&AssertionType &uniqueMatchIndicator ClassReference ATTRIBUTE &id ObjectIdentifierType #.END #.CLASS CONTEXT -&Type -&Assertion +&Type +&Assertion &id ObjectIdentifierType #.END @@ -90,7 +91,7 @@ AddressCapabilities B "2.6.5.2.16" "id-at-mhs-or-addresses-with-capabilities" Capability B "2.6.5.2.19" "id-at-mhs-deliverable-classes" -# SDN.701 +# SDN.701 Kmid B "2.16.840.1.101.2.1.5.14" "id-at-alid" MonthlyUKMs B "2.16.840.1.101.2.1.5.20" "id-at-janUKMs" MonthlyUKMs B "2.16.840.1.101.2.1.5.21" "id-at-febUKMs" diff --git a/asn1/atn-cm/Makefile.am b/asn1/atn-cm/Makefile.am index b252c3329f..b3289801b2 100644 --- a/asn1/atn-cm/Makefile.am +++ b/asn1/atn-cm/Makefile.am @@ -1,12 +1,25 @@ -# Makefile.am -# ASN.1-based plugin atn-cm -# Contact Management (CM) version 1 -# ICAO doc doc9705 Ed. 2 -# Aereonautical Telecommunications Network (ATN) -# -# (c) 2013 Mathias Guettler guettler@web.de +# $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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + include ../Makefile.preinc include Makefile.common include ../Makefile.inc - diff --git a/asn1/atn-cm/Makefile.common b/asn1/atn-cm/Makefile.common index 4f4af95c4e..7b13bd4fe4 100644 --- a/asn1/atn-cm/Makefile.common +++ b/asn1/atn-cm/Makefile.common @@ -1,15 +1,30 @@ -# ASN.1-based plugin atn-cm -# Contact Management (CM) version 1 -# ICAO doc doc9705 Ed. 2 -# Aereonautical Telecommunications Network (ATN) -# -# (c) 2013 Mathias Guettler guettler@web.de +# $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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + PROTOCOL_NAME = atn-cm EXT_ASN_FILE_LIST = -ASN_FILE_LIST = $(PROTOCOL_NAME).asn +ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ Makefile.nmake \ @@ -22,7 +37,7 @@ SRC_FILES = \ $(EXT_ASN_FILE_LIST) # ASN1 PER unaligned encoding -A2W_FLAGS= -u -L +A2W_FLAGS= -u -L EXTRA_CNF= diff --git a/asn1/atn-cm/Makefile.nmake b/asn1/atn-cm/Makefile.nmake index 78b3419d2b..25f75f5105 100644 --- a/asn1/atn-cm/Makefile.nmake +++ b/asn1/atn-cm/Makefile.nmake @@ -1,3 +1,26 @@ +## 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + include ../../config.nmake include ../Makefile.preinc.nmake diff --git a/asn1/atn-cm/atn-cm.cnf b/asn1/atn-cm/atn-cm.cnf index e38195f1c4..476b25a881 100644 --- a/asn1/atn-cm/atn-cm.cnf +++ b/asn1/atn-cm/atn-cm.cnf @@ -1,6 +1,7 @@ # c-basic-offset: 2; tab-width: 2; indent-tabs-mode: t # vi: set shiftwidth=2 tabstop=2 noexpandtab: # :indentSize=2:tabSize=2:noTabs=false: +# $Id$ #.MODULE_IMPORT diff --git a/asn1/atn-cpdlc/Makefile.am b/asn1/atn-cpdlc/Makefile.am index 7a03acb19a..d357a4d4df 100644 --- a/asn1/atn-cpdlc/Makefile.am +++ b/asn1/atn-cpdlc/Makefile.am @@ -1,12 +1,24 @@ -# Makefile.am -# ASN.1-based plugin atn-cpdlc -# Controller Pilot DataLink Communication (CPDLC) version 1 -# (Plain Old CPDLC and Protected Mode CPDLC) -# ICAO doc doc9705 Ed. 2 -# Aereonautical Telecommunications Network (ATN) -# -# (c) 2013 Mathias Guettler guettler@web.de +# $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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + include ../Makefile.preinc include Makefile.common diff --git a/asn1/atn-cpdlc/Makefile.common b/asn1/atn-cpdlc/Makefile.common index 3c222c7b7a..5768d2c052 100644 --- a/asn1/atn-cpdlc/Makefile.common +++ b/asn1/atn-cpdlc/Makefile.common @@ -1,17 +1,30 @@ -# Makefile.common -# ASN.1-based plugin atn-cpdlc -# Controller Pilot DataLink Communication (CPDLC) version 1 -# (Plain Old CPDLC and Protected Mode CPDLC) -# ICAO doc doc9705 Ed. 2 -# Aereonautical Telecommunications Network (ATN) -# -# (c) 2013 Mathias Guettler guettler@web.de +# $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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + PROTOCOL_NAME = atn-cpdlc EXT_ASN_FILE_LIST = -ASN_FILE_LIST = $(PROTOCOL_NAME).asn +ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ Makefile.nmake \ @@ -24,7 +37,7 @@ SRC_FILES = \ $(EXT_ASN_FILE_LIST) # ASN1 PER unaligned encoding -A2W_FLAGS= -u -L +A2W_FLAGS= -u -L EXTRA_CNF= diff --git a/asn1/atn-cpdlc/Makefile.nmake b/asn1/atn-cpdlc/Makefile.nmake index 78b3419d2b..25f75f5105 100644 --- a/asn1/atn-cpdlc/Makefile.nmake +++ b/asn1/atn-cpdlc/Makefile.nmake @@ -1,3 +1,26 @@ +## 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + include ../../config.nmake include ../Makefile.preinc.nmake diff --git a/asn1/atn-cpdlc/atn-cpdlc.cnf b/asn1/atn-cpdlc/atn-cpdlc.cnf index 3f7efbb4e8..cc8b96124f 100644 --- a/asn1/atn-cpdlc/atn-cpdlc.cnf +++ b/asn1/atn-cpdlc/atn-cpdlc.cnf @@ -45,7 +45,7 @@ Winds/speed winds_speed LevelSpeed/speed levelspeed_speed ProtectedGroundPDUs/abortProvider pmcpdlcproviderabortreason ProtectedAircraftPDUs/abortProvider pmcpdlcproviderabortreason -ProtectedGroundPDUs/abortUser pmcpdlcuserabortreason +ProtectedGroundPDUs/abortUser pmcpdlcuserabortreason ProtectedAircraftPDUs/abortUser pmcpdlcuserabortreason ProtectedStartDownMessage/mode protectedmode ProtectedGroundPDUs/send protecteduplinkmessage @@ -65,8 +65,8 @@ ProtectedAircraftPDUs/startdown protectedstartDownmessage case dm: dissect_atn_cpdlc_ATCDownlinkMessage(tvb_new_subset_remaining(tvb_usr, 0), 0, actx, tree, hf_index); break; - case um: - dissect_atn_cpdlc_ATCUplinkMessage(tvb_new_subset_remaining(tvb_usr, 0), 0, actx , tree, hf_index); + case um: + dissect_atn_cpdlc_ATCUplinkMessage(tvb_new_subset_remaining(tvb_usr, 0), 0, actx , tree, hf_index); break; default: break; diff --git a/asn1/atn-ulcs/Makefile.am b/asn1/atn-ulcs/Makefile.am index 4347512508..d357a4d4df 100644 --- a/asn1/atn-ulcs/Makefile.am +++ b/asn1/atn-ulcs/Makefile.am @@ -1,9 +1,24 @@ -# Makefile.am -# ASN.1-based plugin atn-pres -# presentation layer for the Aereonautical Telecommunications Network (ATN) -# -# (c) 2012 Mathias Guettler guettler@web.de +# $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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + include ../Makefile.preinc include Makefile.common diff --git a/asn1/atn-ulcs/Makefile.common b/asn1/atn-ulcs/Makefile.common index 91a5c092fa..ed11207140 100644 --- a/asn1/atn-ulcs/Makefile.common +++ b/asn1/atn-ulcs/Makefile.common @@ -1,14 +1,30 @@ -# Makefile.common -# ASN.1-based plugin atn-pres -# presentation layer for the Aereonautical Telecommunications Network (ATN) -# -# (c) 2012 Mathias Guettler guettler@web.de +# $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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + PROTOCOL_NAME = atn-ulcs EXT_ASN_FILE_LIST = -ASN_FILE_LIST = $(PROTOCOL_NAME).asn +ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ Makefile.nmake \ @@ -22,7 +38,7 @@ SRC_FILES = \ $(EXT_ASN_FILE_LIST) # default behavoiur ASN1 PER encoding -A2W_FLAGS= -u -L +A2W_FLAGS= -u -L EXTRA_CNF= diff --git a/asn1/atn-ulcs/Makefile.nmake b/asn1/atn-ulcs/Makefile.nmake index 78b3419d2b..25f75f5105 100644 --- a/asn1/atn-ulcs/Makefile.nmake +++ b/asn1/atn-ulcs/Makefile.nmake @@ -1,3 +1,26 @@ +## 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + include ../../config.nmake include ../Makefile.preinc.nmake diff --git a/asn1/atn-ulcs/atn-ulcs.cnf b/asn1/atn-ulcs/atn-ulcs.cnf index d765411201..f8cc43b04b 100644 --- a/asn1/atn-ulcs/atn-ulcs.cnf +++ b/asn1/atn-ulcs/atn-ulcs.cnf @@ -1,6 +1,7 @@ # c-basic-offset: 2; tab-width: 2; indent-tabs-mode: t # vi: set shiftwidth=2 tabstop=2 noexpandtab: # :indentSize=2:tabSize=2:noTabs=false: +# $Id$ #.MODULE_IMPORT @@ -18,7 +19,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar #.PDU Fully-encoded-data - ACSE-apdu + ACSE-apdu #.END @@ -45,8 +46,8 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar #.FN_BODY PDV-list/presentation-data-values/arbitrary packet_info * pinfo = actx->pinfo; - tvbuff_t *tvb_usr = NULL; - proto_item *ti = NULL; + tvbuff_t *tvb_usr = NULL; + proto_item *ti = NULL; proto_tree *atn_ulcs_tree = NULL; atn_conversation_t *atn_cv = NULL; @@ -291,7 +292,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar memset(aarq_data,0,sizeof(aarq_data_t)); aarq_data->cv = atn_cv; - aarq_data-> aarq_pending = TRUE; + aarq_data-> aarq_pending = TRUE; } #.END @@ -475,7 +476,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar atn_cv = find_atn_conversation( &pinfo->dst, - pinfo->clnp_dstref, + pinfo->clnp_dstref, &pinfo->src); } /* CR: srcref present, dstref always zero */ @@ -536,7 +537,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar NULL); } } - + offset += tvb_length_remaining(tvb, offset); #.END diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf index f55fcbb8b9..2dac0f40bb 100644 --- a/asn1/disp/disp.cnf +++ b/asn1/disp/disp.cnf @@ -1,3 +1,5 @@ +# $Id$ + #.TYPE_ATTR Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 @@ -28,8 +30,8 @@ Information/signedInformation/information information-data ShadowingAgreementInfo S dop.oid "agreement.2.5.19.1" EstablishParameter S dop.oid "establish.rolea.2.5.19.1" EstablishParameter S dop.oid "establish.roleb.2.5.19.1" -ModificationParameter S dop.oid "modify.rolea.2.5.19.1" -ModificationParameter S dop.oid "modify.roleb.2.5.19.1" +ModificationParameter S dop.oid "modify.rolea.2.5.19.1" +ModificationParameter S dop.oid "modify.roleb.2.5.19.1" diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf index b4318750b2..bb6f148ae5 100644 --- a/asn1/dop/dop.cnf +++ b/asn1/dop/dop.cnf @@ -1,3 +1,5 @@ +# $Id$ + #.IMPORT ../x509sat/x509sat-exp.cnf #.IMPORT ../x509if/x509if-exp.cnf #.IMPORT ../x509af/x509af-exp.cnf @@ -65,10 +67,10 @@ TerminateOperationalBindingResultData/terminateAt terminateAtGeneralizedTime #.REGISTER -DSEType B "2.5.12.0" "id-doa-dseType" -SupplierInformation B "2.5.12.5" "id-doa-supplierKnowledge" -ConsumerInformation B "2.5.12.6" "id-doa-consumerKnowledge" -SupplierAndConsumers B "2.5.12.7" "id-doa-secondaryShadows" +DSEType B "2.5.12.0" "id-doa-dseType" +SupplierInformation B "2.5.12.5" "id-doa-supplierKnowledge" +ConsumerInformation B "2.5.12.6" "id-doa-consumerKnowledge" +SupplierAndConsumers B "2.5.12.7" "id-doa-secondaryShadows" HierarchicalAgreement S dop.oid "agreement.2.5.19.2" SuperiorToSubordinate S dop.oid "establish.rolea.2.5.19.2" @@ -145,7 +147,7 @@ OpBindingErrorParam/bindingType BindingType #.FN_BODY EstablishOperationalBindingResult/initiator/symmetric - offset = call_dop_oid_callback("establish.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); + offset = call_dop_oid_callback("establish.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); #.FN_BODY EstablishOperationalBindingResult/initiator/roleA-replies diff --git a/asn1/dsp/dsp.cnf b/asn1/dsp/dsp.cnf index f85a0f40f9..fd80a71f12 100644 --- a/asn1/dsp/dsp.cnf +++ b/asn1/dsp/dsp.cnf @@ -1,3 +1,5 @@ +# $Id$ + #.MODULE_IMPORT DirectoryAccessProtocol dap ServiceAdministration x509if @@ -12,7 +14,7 @@ AccessPoint AccessPointInformation EXTERN WS_DLL ContinuationReference Exclusions -MasterAndShadowAccessPoints +MasterAndShadowAccessPoints OperationProgress ReferenceType #.TYPE_RENAME @@ -29,8 +31,8 @@ AccessPoint MasterAndShadowAccessPoints #.REGISTER -AccessPoint B "2.5.12.1" "id-doa-myAccessPoint" -AccessPoint B "2.5.12.2" "id-doa-superiorKnowledge" -MasterAndShadowAccessPoints B "2.5.12.3" "id-doa-specificKnowledge" -MasterAndShadowAccessPoints B "2.5.12.4" "id-doa-nonSpecificKnowledge" -DitBridgeKnowledge B "2.5.12.8" "id-doa-ditBridgeKnowledge" +AccessPoint B "2.5.12.1" "id-doa-myAccessPoint" +AccessPoint B "2.5.12.2" "id-doa-superiorKnowledge" +MasterAndShadowAccessPoints B "2.5.12.3" "id-doa-specificKnowledge" +MasterAndShadowAccessPoints B "2.5.12.4" "id-doa-nonSpecificKnowledge" +DitBridgeKnowledge B "2.5.12.8" "id-doa-ditBridgeKnowledge" diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf index a87c01878f..3b9989e1f7 100644 --- a/asn1/gsm_map/gsm_map.cnf +++ b/asn1/gsm_map/gsm_map.cnf @@ -1,3 +1,4 @@ +# $Id$ #.OPT -b @@ -278,7 +279,7 @@ MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS" call_dissector(dtap_handle, next_tvb, actx->pinfo, subtree); } break; - /* ts3G-25413 */ + /* ts3G-25413 */ case 2: call_dissector(ranap_handle, parameter_tvb, actx->pinfo, tree); break; @@ -344,7 +345,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV; return offset; /* Detailed diagnostic information contains either a SMS-SUBMIT-REPORT or a SMS-DELIVERY-REPORT */ oct = tvb_get_guint8((tvbuff_t*)actx->value_ptr, 0); - actx->pinfo->p2p_dir = ((oct & 0x03) == 0) ? P2P_DIR_RECV : P2P_DIR_SENT; + actx->pinfo->p2p_dir = ((oct & 0x03) == 0) ? P2P_DIR_RECV : P2P_DIR_SENT; dissector_try_uint(sms_dissector_table, 0, (tvbuff_t*)actx->value_ptr, actx->pinfo, top_tree); #.FN_BODY ForwardSM-Arg @@ -718,7 +719,7 @@ if (!actx->value_ptr) }/* switch(octet) */ break; case 2: - /* gsm-0806 */ + /* gsm-0806 */ octet = tvb_get_guint8((tvbuff_t*)actx->value_ptr,0); /* Discrimination parameter */ proto_tree_add_item(subtree, hf_gsm_map_disc_par, (tvbuff_t*)actx->value_ptr, 0,1,ENC_BIG_ENDIAN); @@ -798,7 +799,7 @@ if (!actx->value_ptr) }/* switch(octet) */ break; case 2: - /* gsm-0806 */ + /* gsm-0806 */ octet = tvb_get_guint8((tvbuff_t*)actx->value_ptr,0); /* Discrimination parameter */ proto_tree_add_item(subtree, hf_gsm_map_disc_par, (tvbuff_t*)actx->value_ptr, 0,1,ENC_BIG_ENDIAN); @@ -876,7 +877,7 @@ if (!actx->value_ptr) %(DEFAULT_BODY)s if (!parameter_tvb) return offset; - + length = tvb_length(parameter_tvb); name_len = tvb_get_guint8(parameter_tvb, 0); apn_str = tvb_get_ephemeral_string(parameter_tvb, 1, length - 1); diff --git a/asn1/h450-ros/h450-ros.cnf b/asn1/h450-ros/h450-ros.cnf index 1900694a1a..02bfe0303d 100644 --- a/asn1/h450-ros/h450-ros.cnf +++ b/asn1/h450-ros/h450-ros.cnf @@ -1,3 +1,4 @@ +# $Id$ #.EXPORTS @@ -7,7 +8,7 @@ ROS Priority RejectProblem - + #.TYPE_RENAME Invoke/argument InvokeArgument diff --git a/asn1/pkix1explicit/pkix1explicit_exp.cnf b/asn1/pkix1explicit/pkix1explicit_exp.cnf index 53824f5294..196e21c74a 100644 --- a/asn1/pkix1explicit/pkix1explicit_exp.cnf +++ b/asn1/pkix1explicit/pkix1explicit_exp.cnf @@ -1,3 +1,4 @@ +# $Id$ #.IMPORT_TAG AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf index 3a9335145b..f4c9682d81 100644 --- a/asn1/pkix1implicit/pkix1implicit.cnf +++ b/asn1/pkix1implicit/pkix1implicit.cnf @@ -35,34 +35,34 @@ Dummy B "1.3.6.1.5.5.7.3.9" "OCSPSigning" # Additional MS Enhanced Key Usage OIDs (see http://msdn2.microsoft.com/en-us/library/aa378155.aspx) -Dummy B "1.3.6.1.4.1.311.10.12.1" "id-ms-any-application-policy" -Dummy B "1.3.6.1.4.1.311.10.3.1" "id-ms-kp-ctl-usage-signing" -Dummy B "1.3.6.1.4.1.311.10.3.2" "id-ms-kp-time-stamp-signing" -Dummy B "1.3.6.1.4.1.311.10.3.4" "id-ms-kp-efs" -Dummy B "1.3.6.1.4.1.311.10.3.4.1" "id-ms-efs-recovery" -Dummy B "1.3.6.1.4.1.311.10.3.5" "id-ms-whql-crypto" -Dummy B "1.3.6.1.4.1.311.10.3.6" "id-ms-nt5-crypto" -Dummy B "1.3.6.1.4.1.311.10.3.7" "id-ms-oem-whql-crypto" -Dummy B "1.3.6.1.4.1.311.10.3.8" "id-ms-embedded-nt-crypto" -Dummy B "1.3.6.1.4.1.311.10.3.9" "id-ms-root-list-signer" -Dummy B "1.3.6.1.4.1.311.10.3.10" "id-ms-kp-qualified-subordination" -Dummy B "1.3.6.1.4.1.311.10.3.11" "id-ms-kp-key-recovery" -Dummy B "1.3.6.1.4.1.311.10.3.12" "id-ms-kp-document-signing" -Dummy B "1.3.6.1.4.1.311.10.3.13" "id-ms-kp-lifetime-signing" - -Dummy B "1.3.6.1.4.1.311.10.5.1" "id-ms-drm" - -Dummy B "1.3.6.1.4.1.311.10.6.1" "id-ms-licenses" -Dummy B "1.3.6.1.4.1.311.10.6.2" "id-ms-license-server" - -Dummy B "1.3.6.1.4.1.311.20.1" "id-ms-auto-enroll-ctl-usage" -Dummy B "1.3.6.1.4.1.311.20.2.1" "id-ms-enrollment-agent" -Dummy B "1.3.6.1.4.1.311.20.2.2" "id-ms-kp-smartcard-logon" -Dummy B "1.3.6.1.4.1.311.21.5" "id-ms-kp-ca-exchange" -Dummy B "1.3.6.1.4.1.311.21.6" "id-ms-kp-key-recovery-agent" -Dummy B "1.3.6.1.4.1.311.21.19" "id-ms-ds-email-replication" - -Dummy B "1.3.6.1.5.5.8.2.2" "id-ms-ipsec-kp-ike-intermediate" +Dummy B "1.3.6.1.4.1.311.10.12.1" "id-ms-any-application-policy" +Dummy B "1.3.6.1.4.1.311.10.3.1" "id-ms-kp-ctl-usage-signing" +Dummy B "1.3.6.1.4.1.311.10.3.2" "id-ms-kp-time-stamp-signing" +Dummy B "1.3.6.1.4.1.311.10.3.4" "id-ms-kp-efs" +Dummy B "1.3.6.1.4.1.311.10.3.4.1" "id-ms-efs-recovery" +Dummy B "1.3.6.1.4.1.311.10.3.5" "id-ms-whql-crypto" +Dummy B "1.3.6.1.4.1.311.10.3.6" "id-ms-nt5-crypto" +Dummy B "1.3.6.1.4.1.311.10.3.7" "id-ms-oem-whql-crypto" +Dummy B "1.3.6.1.4.1.311.10.3.8" "id-ms-embedded-nt-crypto" +Dummy B "1.3.6.1.4.1.311.10.3.9" "id-ms-root-list-signer" +Dummy B "1.3.6.1.4.1.311.10.3.10" "id-ms-kp-qualified-subordination" +Dummy B "1.3.6.1.4.1.311.10.3.11" "id-ms-kp-key-recovery" +Dummy B "1.3.6.1.4.1.311.10.3.12" "id-ms-kp-document-signing" +Dummy B "1.3.6.1.4.1.311.10.3.13" "id-ms-kp-lifetime-signing" + +Dummy B "1.3.6.1.4.1.311.10.5.1" "id-ms-drm" + +Dummy B "1.3.6.1.4.1.311.10.6.1" "id-ms-licenses" +Dummy B "1.3.6.1.4.1.311.10.6.2" "id-ms-license-server" + +Dummy B "1.3.6.1.4.1.311.20.1" "id-ms-auto-enroll-ctl-usage" +Dummy B "1.3.6.1.4.1.311.20.2.1" "id-ms-enrollment-agent" +Dummy B "1.3.6.1.4.1.311.20.2.2" "id-ms-kp-smartcard-logon" +Dummy B "1.3.6.1.4.1.311.21.5" "id-ms-kp-ca-exchange" +Dummy B "1.3.6.1.4.1.311.21.6" "id-ms-kp-key-recovery-agent" +Dummy B "1.3.6.1.4.1.311.21.19" "id-ms-ds-email-replication" + +Dummy B "1.3.6.1.5.5.8.2.2" "id-ms-ipsec-kp-ike-intermediate" UserNotice B "1.3.6.1.5.5.7.2.2" "id-qt-unotice" diff --git a/asn1/pkix1implicit/pkix1implicit_exp.cnf b/asn1/pkix1implicit/pkix1implicit_exp.cnf index fc2faf22db..c4ab99b029 100644 --- a/asn1/pkix1implicit/pkix1implicit_exp.cnf +++ b/asn1/pkix1implicit/pkix1implicit_exp.cnf @@ -1,3 +1,4 @@ +# $Id$ #.IMPORT_TAG AuthorityInfoAccessSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE diff --git a/asn1/q932-ros/q932-ros.cnf b/asn1/q932-ros/q932-ros.cnf index 144942018c..0e8c0d92fe 100644 --- a/asn1/q932-ros/q932-ros.cnf +++ b/asn1/q932-ros/q932-ros.cnf @@ -1,3 +1,4 @@ +# $Id$ #.PDU_NEW @@ -9,7 +10,7 @@ Priority RejectProblem Components GFPInvokeIDSet - + #.TYPE_RENAME Invoke/argument InvokeArgument diff --git a/asn1/ros/ros.cnf b/asn1/ros/ros.cnf index 3ad482bbcc..6f7ebfda9c 100644 --- a/asn1/ros/ros.cnf +++ b/asn1/ros/ros.cnf @@ -1,3 +1,5 @@ +# $Id$ + #.EXPORTS OPERATION ERROR @@ -34,7 +36,7 @@ Reject/problem/returnResult rejectResult proto_tree_add_text(tree, tvb, offset,-1, "invoke argument"); ros_match_call_response(tvb, actx->pinfo, tree, invokeid, TRUE); - + if(session && session->pres_ctx_id && (oid = find_oid_by_pres_ctx_id(actx->pinfo, session->pres_ctx_id))) { /* this should be ROS! */ session->ros_op = (ROS_OP_INVOKE | ROS_OP_ARGUMENT); @@ -51,7 +53,7 @@ Reject/problem/returnResult rejectResult proto_tree_add_text(tree, tvb, offset,-1, "return result"); ros_match_call_response(tvb, actx->pinfo, tree, invokeid, FALSE); - + if(session && session->pres_ctx_id && (oid = find_oid_by_pres_ctx_id(actx->pinfo, session->pres_ctx_id))) { /* this should be ROS! */ session->ros_op = (ROS_OP_INVOKE | ROS_OP_RESULT); @@ -68,7 +70,7 @@ Reject/problem/returnResult rejectResult proto_tree_add_text(tree, tvb, offset,-1, "return result"); ros_match_call_response(tvb, actx->pinfo, tree, invokeid, FALSE); - + if(session && session->pres_ctx_id && (oid = find_oid_by_pres_ctx_id(actx->pinfo, session->pres_ctx_id))) { /* this should be ROS! */ session->ros_op = (ROS_OP_INVOKE | ROS_OP_ERROR); diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index d88df7f4f4..0f3f5166b9 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -10,13 +10,13 @@ GUID TYPE = FT_GUID DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 #.IMPORT ../p1/p1-exp.cnf #.CLASS CONTEXT -&Type -&Assertion +&Type +&Assertion &id ObjectIdentifierType #.END #.CLASS ATTRIBUTE &derivation ClassReference ATTRIBUTE -&Type +&Type &equality-match ClassReference MATCHING-RULE &ordering-match ClassReference MATCHING-RULE &substrings-match ClassReference MATCHING-RULE @@ -28,7 +28,7 @@ GUID TYPE = FT_GUID DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 #.END #.CLASS MATCHING-RULE &ParentMatchingRules ClassReference MATCHING-RULE -&AssertionType +&AssertionType &uniqueMatchIndicator ClassReference ATTRIBUTE &id ObjectIdentifierType #.END @@ -179,7 +179,7 @@ ObjectIdentifier B "2.5.4.56" "id-at-defaultDirQop" # 60 "id-at-confKeyInfo" - what syntax? # 61 ? aACertificate(61) # 62 ? attributeDescriptorCertificate(62) -# 63 ? attributeAuthorityRevocationList(63) +# 63 ? attributeAuthorityRevocationList(63) # 64 "id-at-familyInformation" - what syntax? DirectoryString B "2.5.4.65" "id-at-pseudonym" ObjectIdentifier B "2.5.4.66" "id-at-communuicationsService" @@ -190,11 +190,11 @@ CaseIgnoreListMatch B "2.5.13.11" "id-mr-caseIgnoreListMatch" BitString B "2.5.13.16" "id-mr-bitStringMatch" SyntaxUTCTime B "2.5.13.26" "id-mr-uTCTimeOrderingMatch" -SyntaxGeneralizedTime B "2.5.18.1" "id-oa-createTimeStamp" -SyntaxGeneralizedTime B "2.5.18.2" "id-oa-modifyTimeStamp" +SyntaxGeneralizedTime B "2.5.18.1" "id-oa-createTimeStamp" +SyntaxGeneralizedTime B "2.5.18.2" "id-oa-modifyTimeStamp" ObjectIdentifier B "2.5.18.5" "id-oa-administrativeRole" ObjectIdentifier B "2.5.18.7" "id-oa-collectiveExclusions" -SyntaxGeneralizedTime B "2.5.18.8" "id-oa-subschemaTimeStamp" +SyntaxGeneralizedTime B "2.5.18.8" "id-oa-subschemaTimeStamp" Boolean B "2.5.18.9" "id-oa-hasSubordinates" #id-oa-subschemaSubentryList OBJECT IDENTIFIER ::= {id-oa 10} #id-oa-accessControlSubentryList OBJECT IDENTIFIER ::= {id-oa 11} @@ -336,8 +336,8 @@ DirectoryString B "2.16.840.1.113730.3.1.241" "displayName" # Microsoft-specific # GeneralName other-name SyntaxBMPString B "1.3.6.1.4.1.311.20.2" "id-ms-certificate-template-name" -SyntaxUTF8String B "1.3.6.1.4.1.311.20.2.3" "id-ms-user-principal-name" -SyntaxBMPString B "1.3.6.1.4.1.311.17.1" "id-ms-local-machine-keyset" +SyntaxUTF8String B "1.3.6.1.4.1.311.20.2.3" "id-ms-user-principal-name" +SyntaxBMPString B "1.3.6.1.4.1.311.17.1" "id-ms-local-machine-keyset" Integer B "1.3.6.1.4.1.311.21.1" "id-ms-ca-version" OctetString B "1.3.6.1.4.1.311.21.2" "id-ms-previous-cert-hash" Integer B "1.3.6.1.4.1.311.21.3" "id-ms-virtual-base" @@ -353,7 +353,7 @@ SyntaxIA5String B "1.2.826.0.1004.10.1.1" "nexor-originating-ua" Boolean B "2.6.1.6.3" "id-sat-ipm-auto-discarded" # RFC 4530 -GUID B "1.3.6.1.1.16.4" "entryUUID" +GUID B "1.3.6.1.1.16.4" "entryUUID" # Guidelines for Extended Validation Certificates (http://www.cabforum.org/EV_Certificate_Guidelines_draft11.pdf) DirectoryString B "1.3.6.1.4.1.311.60.2.1.1" "jurisdictionOfIncorporationLocalityName" @@ -380,13 +380,13 @@ XDayOf/fifth fifth_dayof tvbuff_t *wide_tvb = NULL; char *string; #.END - + #.FN_FTR SyntaxBMPString if (! wide_tvb) { return offset; } string = tvb_get_ephemeral_unicode_string (wide_tvb, 0, tvb_length(wide_tvb), ENC_BIG_ENDIAN); - proto_item_append_text(actx->created_item, " %s", string); + proto_item_append_text(actx->created_item, " %s", string); #.END |