diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-09 21:50:10 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-10 17:06:02 +0000 |
| commit | a33209d69e95d025466f4efaebe22f6ae686c214 (patch) | |
| tree | b54114223af7e8b9abd93dca58b8673bc8bbc823 /asn1 | |
| parent | 1ffbd2ae9d4e839460717e9886aeb2661dd1e3ea (diff) | |
Convert ASN.1 dissectors to remove "new" from "new-style" dissector function names that were generated from asn2wrs.py
This includes:
1. new_create_dissector_handle -> create_dissector_handle
2. new_register_dissector -> register_dissector
3. new_register_ber_oid_dissector -> register_ber_oid_dissector
4. new_register_ber_syntax_dissector -> register_ber_syntax_dissector
Also remove PDU_NEW, SYNTAX_NEW and REGISTER_NEW as there is no need for the distinction anymore.
Change-Id: I82c7de7c8ffeeab3259d1b55bb4afc5f6a1e0329
Reviewed-on: https://code.wireshark.org/review/12491
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1')
107 files changed, 220 insertions, 220 deletions
diff --git a/asn1/HI2Operations/HI2Operations.cnf b/asn1/HI2Operations/HI2Operations.cnf index d2c191478c..e7ca5113d3 100644 --- a/asn1/HI2Operations/HI2Operations.cnf +++ b/asn1/HI2Operations/HI2Operations.cnf @@ -10,9 +10,9 @@ EN301040 EN301040 #.EXPORTS -#.REGISTER_NEW +#.REGISTER -#.PDU_NEW +#.PDU IRIsContent #.NO_EMIT diff --git a/asn1/acp133/acp133.cnf b/asn1/acp133/acp133.cnf index 40ff196cc1..194a10df4d 100644 --- a/asn1/acp133/acp133.cnf +++ b/asn1/acp133/acp133.cnf @@ -7,7 +7,7 @@ #.IMPORT ../x509if/x509if-exp.cnf #.IMPORT ../x509sat/x509sat-exp.cnf -#.PDU_NEW +#.PDU ACPPreferredDelivery ALType Community @@ -65,7 +65,7 @@ Kmid &id ObjectIdentifierType #.END -#.REGISTER_NEW +#.REGISTER # X.402 diff --git a/asn1/atn-cm/atn-cm.cnf b/asn1/atn-cm/atn-cm.cnf index 4f7d282f6d..d3eef8551d 100644 --- a/asn1/atn-cm/atn-cm.cnf +++ b/asn1/atn-cm/atn-cm.cnf @@ -2,7 +2,7 @@ #.EXPORTS -#.PDU_NEW +#.PDU CMAircraftMessage CMGroundMessage #.END diff --git a/asn1/atn-cpdlc/atn-cpdlc.cnf b/asn1/atn-cpdlc/atn-cpdlc.cnf index f9a16b8821..ac10fbcf6a 100644 --- a/asn1/atn-cpdlc/atn-cpdlc.cnf +++ b/asn1/atn-cpdlc/atn-cpdlc.cnf @@ -7,7 +7,7 @@ #.OMIT_ASSIGNMENT #.END -#.PDU_NEW +#.PDU AircraftPDUs GroundPDUs ProtectedAircraftPDUs diff --git a/asn1/atn-ulcs/atn-ulcs.cnf b/asn1/atn-ulcs/atn-ulcs.cnf index e24abe7a7b..a25be95f3e 100644 --- a/asn1/atn-ulcs/atn-ulcs.cnf +++ b/asn1/atn-ulcs/atn-ulcs.cnf @@ -12,7 +12,7 @@ PDV-list/presentation-data-values/single-ASN1-type pdv-list_presentation-data-v PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_arbitrary #.END -#.PDU_NEW +#.PDU Fully-encoded-data ACSE-apdu #.END diff --git a/asn1/c1222/c1222.cnf b/asn1/c1222/c1222.cnf index fdf4c3e244..d3d4fb8da5 100644 --- a/asn1/c1222/c1222.cnf +++ b/asn1/c1222/c1222.cnf @@ -7,7 +7,7 @@ IMPORT ../acse/acse.inf #.EXPORTS -#.PDU_NEW +#.PDU MESSAGE #.NO_EMIT diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index 15734ae91e..a298179964 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -34,14 +34,14 @@ TariffSwitchInterval Priority #.END -#.PDU_NEW +#.PDU ERROR.&ParameterType OPERATION.&ArgumentType OPERATION.&ResultType #.END -#.REGISTER_NEW +#.REGISTER CAP-GPRS-ReferenceNumber B "0.4.0.0.1.1.5.2" "id-CAP-GPRS-ReferenceNumber" CAP-U-ABORT-REASON B "0.4.0.0.1.1.2.2" "id-CAP-U-ABORT-Reason" diff --git a/asn1/cdt/cdt.cnf b/asn1/cdt/cdt.cnf index d0499c624f..a3b8e0a7e2 100644 --- a/asn1/cdt/cdt.cnf +++ b/asn1/cdt/cdt.cnf @@ -4,7 +4,7 @@ #.EXPORTS CompressedData -#.REGISTER_NEW +#.REGISTER CompressedData B "1.3.26.0.4406.0.4.2" "cdt" #.FN_BODY CompressedData diff --git a/asn1/charging_ase/charging_ase.cnf b/asn1/charging_ase/charging_ase.cnf index 4ae1241d21..661c68f234 100644 --- a/asn1/charging_ase/charging_ase.cnf +++ b/asn1/charging_ase/charging_ase.cnf @@ -6,7 +6,7 @@ ChargingMessageType ChargingMessageType_PDU -#.PDU_NEW +#.PDU ChargingMessageType #.FN_BODY ExtensionField/value diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index 7e33004634..0e94b3b607 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -91,7 +91,7 @@ static const value_string cmip_error_code_vals[] = { # X.721 -#.REGISTER_NEW +#.REGISTER BaseManagedObjectId B "2.9.2.21.7.13" "BaseManagedObjectId(13)" # X.721 SimpleNameType B "2.9.3.2.7.1" "discriminatorId(1)" @@ -216,7 +216,7 @@ Priority RejectProblem -#.PDU_NEW +#.PDU #.FN_HDR CMIPAbortInfo diff --git a/asn1/cmp/cmp.cnf b/asn1/cmp/cmp.cnf index 877f0d308f..3c9b7f804a 100644 --- a/asn1/cmp/cmp.cnf +++ b/asn1/cmp/cmp.cnf @@ -50,7 +50,7 @@ RevDetails RevRepContent RevReqContent -#.REGISTER_NEW +#.REGISTER PBMParameter B "1.2.840.113533.7.66.13" "id-PasswordBasedMac" DHBMParameter B "1.2.640.113533.7.66.30" "id-DHBasedMac" CAProtEncCertValue B "1.3.6.1.5.5.7.4.1" "id-it-caProtEncCert" diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 69bc9a6cb2..2f965acb28 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -31,7 +31,7 @@ SignerInfos SignatureValue UnsignedAttributes -#.REGISTER_NEW +#.REGISTER ContentInfo B "1.2.840.113549.1.9.16.1.6" "id-ct-contentInfo" #OctetString B "1.2.840.113549.1.7.1" "id-data" see x509sat.cnf SignedData B "1.2.840.113549.1.7.2" "id-signedData" diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 0d07bd78a3..62e2b2f144 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -154,8 +154,8 @@ void proto_register_cms(void) { proto_register_field_array(proto_cms, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - new_register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU); - new_register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU); + register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU); + register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU); register_ber_oid_syntax(".p7s", NULL, "ContentInfo"); register_ber_oid_syntax(".p7m", NULL, "ContentInfo"); register_ber_oid_syntax(".p7c", NULL, "ContentInfo"); diff --git a/asn1/credssp/credssp.cnf b/asn1/credssp/credssp.cnf index 5e943ac693..6a2f301c04 100644 --- a/asn1/credssp/credssp.cnf +++ b/asn1/credssp/credssp.cnf @@ -1,7 +1,7 @@ # credssp.cnf # Credential Security Support Provider (CredSSP) conformance file -#.PDU_NEW +#.PDU TSRequest #.FN_PARS TSRequest/authInfo VAL_PTR = &auth_tvb diff --git a/asn1/crmf/crmf.cnf b/asn1/crmf/crmf.cnf index 1919a543f7..42e6563f85 100644 --- a/asn1/crmf/crmf.cnf +++ b/asn1/crmf/crmf.cnf @@ -42,7 +42,7 @@ SinglePubInfo SubsequentMessage UTF8Pairs -#.REGISTER_NEW +#.REGISTER EncKeyWithID B "1.2.840.113549.1.9.16.1.21" "id-ct-encKeyWithID" PBMParameter B "1.2.840.113533.7.66.13" "PasswordBasedMac" RegToken B "1.3.6.1.5.5.7.5.1.1" "id-regCtrl-regToken" diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf index 6e5ea08ca7..622734ece4 100644 --- a/asn1/dap/dap.cnf +++ b/asn1/dap/dap.cnf @@ -226,7 +226,7 @@ static const ros_err_t dap_err_tab[] = { #.END -#.PDU_NEW +#.PDU ERROR.&ParameterType OPERATION.&ArgumentType OPERATION.&ResultType diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf index f7f9c248d8..f4437b20fa 100644 --- a/asn1/disp/disp.cnf +++ b/asn1/disp/disp.cnf @@ -29,7 +29,7 @@ ModificationParameter/secondaryShadows modifiedSecondaryShadows CoordinateShadowUpdateArgumentData/updateStrategy/standard standardUpdate Information/signedInformation/information information-data -#.REGISTER_NEW +#.REGISTER 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" diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf index 32f3ab7a98..e6629be715 100644 --- a/asn1/dop/dop.cnf +++ b/asn1/dop/dop.cnf @@ -71,7 +71,7 @@ TerminateOperationalBindingArgumentData/terminateAt terminateAtTime TerminateOperationalBindingResultData/terminateAt terminateAtGeneralizedTime -#.REGISTER_NEW +#.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" diff --git a/asn1/dsp/dsp.cnf b/asn1/dsp/dsp.cnf index 4d085856cc..c10743b340 100644 --- a/asn1/dsp/dsp.cnf +++ b/asn1/dsp/dsp.cnf @@ -43,11 +43,11 @@ MasterOrShadowAccessPoint/category access-point-category ChainingArguments/targetObject targetObjectDN -#.PDU_NEW +#.PDU AccessPoint MasterAndShadowAccessPoints -#.REGISTER_NEW +#.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" diff --git a/asn1/ess/ess.cnf b/asn1/ess/ess.cnf index 4073e8db60..85d040dad1 100644 --- a/asn1/ess/ess.cnf +++ b/asn1/ess/ess.cnf @@ -8,9 +8,9 @@ #.EXPORTS ESSSecurityLabel_PDU -#.PDU_NEW +#.PDU -#.REGISTER_NEW +#.REGISTER ReceiptRequest B "1.2.840.113549.1.9.16.2.1" "id-aa-receiptRequest" ContentIdentifier B "1.2.840.113549.1.9.16.2.7" "id-aa-contentIdentifier" Receipt B "1.2.840.113549.1.9.16.1.1" "id-ct-receipt" diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index d095757af5..d473b842a5 100644 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -20,7 +20,7 @@ F-CHECK-response Other-Pattern #.END -#.PDU_NEW +#.PDU #.NO_EMIT ONLY_VALS PDU diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index 878251ce69..7f4ed6a06c 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -155,12 +155,12 @@ void proto_register_ftam(void) { /*--- proto_reg_handoff_ftam --- */ void proto_reg_handoff_ftam(void) { - new_register_ber_oid_dissector("1.0.8571.1.1", dissect_ftam, proto_ftam,"iso-ftam(1)"); - new_register_ber_oid_dissector("1.0.8571.2.1", dissect_ftam, proto_ftam,"ftam-pci(1)"); - new_register_ber_oid_dissector("1.3.14.5.2.2", dissect_ftam, proto_ftam,"NIST file directory entry abstract syntax"); + register_ber_oid_dissector("1.0.8571.1.1", dissect_ftam, proto_ftam,"iso-ftam(1)"); + register_ber_oid_dissector("1.0.8571.2.1", dissect_ftam, proto_ftam,"ftam-pci(1)"); + register_ber_oid_dissector("1.3.14.5.2.2", dissect_ftam, proto_ftam,"NIST file directory entry abstract syntax"); /* Unstructured text file document type FTAM-1 */ - new_register_ber_oid_dissector("1.0.8571.5.1", dissect_ftam_unstructured_text, proto_ftam,"ISO FTAM unstructured text"); + register_ber_oid_dissector("1.0.8571.5.1", dissect_ftam_unstructured_text, proto_ftam,"ISO FTAM unstructured text"); oid_add_from_string("ISO FTAM sequential text","1.0.8571.5.2"); oid_add_from_string("FTAM unstructured text abstract syntax","1.0.8571.2.3"); oid_add_from_string("FTAM simple-hierarchy","1.0.8571.2.5"); @@ -168,7 +168,7 @@ void proto_reg_handoff_ftam(void) { oid_add_from_string("FTAM unstructured constraint set","1.0.8571.4.1"); /* Unstructured binary file document type FTAM-3 */ - new_register_ber_oid_dissector("1.0.8571.5.3", dissect_ftam_unstructured_binary, proto_ftam,"ISO FTAM unstructured binary"); + register_ber_oid_dissector("1.0.8571.5.3", dissect_ftam_unstructured_binary, proto_ftam,"ISO FTAM unstructured binary"); oid_add_from_string("FTAM unstructured binary abstract syntax","1.0.8571.2.4"); /* Filedirectory file document type NBS-9 */ diff --git a/asn1/goose/goose.cnf b/asn1/goose/goose.cnf index 4aaad2c574..3331736ca2 100644 --- a/asn1/goose/goose.cnf +++ b/asn1/goose/goose.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.PDU_NEW +#.PDU #.NO_EMIT ONLY_VALS GOOSEpdu diff --git a/asn1/gprscdr/gprscdr.cnf b/asn1/gprscdr/gprscdr.cnf index 8f6fda1289..bac6db2ed3 100644 --- a/asn1/gprscdr/gprscdr.cnf +++ b/asn1/gprscdr/gprscdr.cnf @@ -57,7 +57,7 @@ GPRSRecord_PDU &id ObjectIdentifierType &Value -#.PDU_NEW +#.PDU GPRSCallEventRecord GPRSRecord diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf index 53f7724776..262184ae82 100644 --- a/asn1/gsm_map/gsm_map.cnf +++ b/asn1/gsm_map/gsm_map.cnf @@ -73,7 +73,7 @@ CustomerGroupID SubGroupID ClassOfServiceID #.END -#.PDU_NEW +#.PDU LCS-ClientID ISDN-AddressString @@ -178,7 +178,7 @@ USSD-Res UU-Data VelocityEstimate #.END -#.REGISTER_NEW +#.REGISTER MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS" # This table creates the value_sting to name GSM MAP operation codes and errors diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index aee74a3f69..83046c891d 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -2713,35 +2713,35 @@ void proto_reg_handoff_gsm_map(void) { register_ber_oid_dissector_handle("0.4.0.0.1.0.44.3", map_handle, proto_gsm_map,"resourceManagementContext-v3" ); register_ber_oid_dissector_handle("0.4.0.0.1.0.45.3", map_handle, proto_gsm_map,"groupCallInfoRetrievalContext-v3" ); /* Private extension container */ - new_register_ber_oid_dissector("1.3.12.2.1006.53.2.1.3", dissect_gsm_mapext_PlmnContainer, proto_gsm_map,"alcatel-E10-MAP-extension-PlmnContainer" ); - new_register_ber_oid_dissector("0.34.0",dissect_NokiaMAP_ext_IsdArgExtension,proto_gsm_map,"Nokia ISD Extension"); - new_register_ber_oid_dissector("0.34.1",dissect_NokiaMAP_ext_DsdArgExt,proto_gsm_map,"Nokia Dsd Extension"); - new_register_ber_oid_dissector("0.34.2",dissect_NokiaMAP_ext_UlResExtension,proto_gsm_map,"Nokia Location Update Extension"); - new_register_ber_oid_dissector("0.34.4",dissect_NokiaMAP_ext_SS_DataExtension,proto_gsm_map,"Nokia SS Data Extension"); - new_register_ber_oid_dissector("0.34.5",dissect_NokiaMAP_ext_SriExtension,proto_gsm_map,"Nokia SRI Request Extension"); - new_register_ber_oid_dissector("0.34.6",dissect_NokiaMAP_ExtraSignalInfo,proto_gsm_map,"Nokia ExtraSignalInfo Extension"); - new_register_ber_oid_dissector("0.34.7",dissect_NokiaMAP_ext_SriResExtension,proto_gsm_map,"Nokia SRI Response Extension"); - new_register_ber_oid_dissector("0.34.10",dissect_NokiaMAP_ext_CanLocArgExt,proto_gsm_map,"Nokia Cancel Location Extension"); - new_register_ber_oid_dissector("0.34.11",dissect_NokiaMAP_ext_ATMargExt,proto_gsm_map,"Nokia ATM Extension"); - new_register_ber_oid_dissector("0.34.12",dissect_NokiaMAP_ext_DTMargExt,proto_gsm_map,"Nokia DTM Extension"); - new_register_ber_oid_dissector("0.34.13",dissect_NokiaMAP_ext_NumberPorted,proto_gsm_map,"Nokia NumberPorted Extension"); - new_register_ber_oid_dissector("0.34.15",dissect_NokiaMAP_ext_HOExtension,proto_gsm_map,"Nokia HandOver Extension"); - new_register_ber_oid_dissector("0.34.16",dissect_NokiaMAP_ext_ATMresExt,proto_gsm_map,"Nokia ATMres Extension"); - new_register_ber_oid_dissector("0.34.17",dissect_NokiaMAP_ext_AbsentSubscriberExt,proto_gsm_map,"Nokia AbsentSubscriber Extension"); - new_register_ber_oid_dissector("0.34.18",dissect_NokiaMAP_ext_SriForSMArgExt,proto_gsm_map,"Nokia SriForSM Extension"); - new_register_ber_oid_dissector("0.34.19",dissect_NokiaMAP_ext_ReportSMDelStatArgExt,proto_gsm_map,"Nokia ReportSMDelStatt Extension"); - new_register_ber_oid_dissector("0.34.20",dissect_NokiaMAP_ext_UdlArgExt,proto_gsm_map,"Nokia Udl Extension"); - new_register_ber_oid_dissector("0.34.21",dissect_NokiaMAP_ext_RoamNotAllowedExt,proto_gsm_map,"Nokia RoamNotAllowed Extension"); - new_register_ber_oid_dissector("0.34.22",dissect_NokiaMAP_ext_MO_ForwardSM_ArgExt,proto_gsm_map,"Nokia MO-ForwardSM Extension"); - new_register_ber_oid_dissector("0.34.23",dissect_NokiaMAP_ext_ErrOlcmInfoTableExt,proto_gsm_map,"Nokia ErrOlcmInfoTable Extension"); - new_register_ber_oid_dissector("0.34.25",dissect_NokiaMAP_ext_RoutingCategoryExt,proto_gsm_map,"Nokia Routing Category Extension"); - new_register_ber_oid_dissector("0.34.26",dissect_NokiaMAP_ext_AnyTimeModArgExt,proto_gsm_map,"Nokia AnyTimeMod Extension"); - - new_register_ber_oid_dissector("1.2.826.0.1249.58.1.0",dissect_NokiaMAP_ext_ExtensionType,proto_gsm_map,"Nokia ExtensionType Extension"); - - new_register_ber_oid_dissector("1.3.12.2.1107.3.66.1.1",dissect_NokiaMAP_ext_AccessTypeExt,proto_gsm_map,"Nokia AccessTypeExt Extension"); - new_register_ber_oid_dissector("1.3.12.2.1107.3.66.1.3",dissect_NokiaMAP_ext_AccessSubscriptionListExt,proto_gsm_map,"Nokia AccessSubscriptionListExt Extension"); - new_register_ber_oid_dissector("1.3.12.2.1107.3.66.1.6",dissect_NokiaMAP_ext_AllowedServiceData,proto_gsm_map,"Nokia AllowedServiceData Extension"); + register_ber_oid_dissector("1.3.12.2.1006.53.2.1.3", dissect_gsm_mapext_PlmnContainer, proto_gsm_map,"alcatel-E10-MAP-extension-PlmnContainer" ); + register_ber_oid_dissector("0.34.0",dissect_NokiaMAP_ext_IsdArgExtension,proto_gsm_map,"Nokia ISD Extension"); + register_ber_oid_dissector("0.34.1",dissect_NokiaMAP_ext_DsdArgExt,proto_gsm_map,"Nokia Dsd Extension"); + register_ber_oid_dissector("0.34.2",dissect_NokiaMAP_ext_UlResExtension,proto_gsm_map,"Nokia Location Update Extension"); + register_ber_oid_dissector("0.34.4",dissect_NokiaMAP_ext_SS_DataExtension,proto_gsm_map,"Nokia SS Data Extension"); + register_ber_oid_dissector("0.34.5",dissect_NokiaMAP_ext_SriExtension,proto_gsm_map,"Nokia SRI Request Extension"); + register_ber_oid_dissector("0.34.6",dissect_NokiaMAP_ExtraSignalInfo,proto_gsm_map,"Nokia ExtraSignalInfo Extension"); + register_ber_oid_dissector("0.34.7",dissect_NokiaMAP_ext_SriResExtension,proto_gsm_map,"Nokia SRI Response Extension"); + register_ber_oid_dissector("0.34.10",dissect_NokiaMAP_ext_CanLocArgExt,proto_gsm_map,"Nokia Cancel Location Extension"); + register_ber_oid_dissector("0.34.11",dissect_NokiaMAP_ext_ATMargExt,proto_gsm_map,"Nokia ATM Extension"); + register_ber_oid_dissector("0.34.12",dissect_NokiaMAP_ext_DTMargExt,proto_gsm_map,"Nokia DTM Extension"); + register_ber_oid_dissector("0.34.13",dissect_NokiaMAP_ext_NumberPorted,proto_gsm_map,"Nokia NumberPorted Extension"); + register_ber_oid_dissector("0.34.15",dissect_NokiaMAP_ext_HOExtension,proto_gsm_map,"Nokia HandOver Extension"); + register_ber_oid_dissector("0.34.16",dissect_NokiaMAP_ext_ATMresExt,proto_gsm_map,"Nokia ATMres Extension"); + register_ber_oid_dissector("0.34.17",dissect_NokiaMAP_ext_AbsentSubscriberExt,proto_gsm_map,"Nokia AbsentSubscriber Extension"); + register_ber_oid_dissector("0.34.18",dissect_NokiaMAP_ext_SriForSMArgExt,proto_gsm_map,"Nokia SriForSM Extension"); + register_ber_oid_dissector("0.34.19",dissect_NokiaMAP_ext_ReportSMDelStatArgExt,proto_gsm_map,"Nokia ReportSMDelStatt Extension"); + register_ber_oid_dissector("0.34.20",dissect_NokiaMAP_ext_UdlArgExt,proto_gsm_map,"Nokia Udl Extension"); + register_ber_oid_dissector("0.34.21",dissect_NokiaMAP_ext_RoamNotAllowedExt,proto_gsm_map,"Nokia RoamNotAllowed Extension"); + register_ber_oid_dissector("0.34.22",dissect_NokiaMAP_ext_MO_ForwardSM_ArgExt,proto_gsm_map,"Nokia MO-ForwardSM Extension"); + register_ber_oid_dissector("0.34.23",dissect_NokiaMAP_ext_ErrOlcmInfoTableExt,proto_gsm_map,"Nokia ErrOlcmInfoTable Extension"); + register_ber_oid_dissector("0.34.25",dissect_NokiaMAP_ext_RoutingCategoryExt,proto_gsm_map,"Nokia Routing Category Extension"); + register_ber_oid_dissector("0.34.26",dissect_NokiaMAP_ext_AnyTimeModArgExt,proto_gsm_map,"Nokia AnyTimeMod Extension"); + + register_ber_oid_dissector("1.2.826.0.1249.58.1.0",dissect_NokiaMAP_ext_ExtensionType,proto_gsm_map,"Nokia ExtensionType Extension"); + + register_ber_oid_dissector("1.3.12.2.1107.3.66.1.1",dissect_NokiaMAP_ext_AccessTypeExt,proto_gsm_map,"Nokia AccessTypeExt Extension"); + register_ber_oid_dissector("1.3.12.2.1107.3.66.1.3",dissect_NokiaMAP_ext_AccessSubscriptionListExt,proto_gsm_map,"Nokia AccessSubscriptionListExt Extension"); + register_ber_oid_dissector("1.3.12.2.1107.3.66.1.6",dissect_NokiaMAP_ext_AllowedServiceData,proto_gsm_map,"Nokia AllowedServiceData Extension"); } else { range_foreach(ssn_range, range_delete_callback); diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 9a15e11c9e..825b92041d 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -62,7 +62,7 @@ ReleaseCompleteReason EXTERN WS_DLL ExtendedAliasAddress_PDU #.END -#.PDU_NEW +#.PDU H323-UserInformation RasMessage ExtendedAliasAddress diff --git a/asn1/h235/h235.cnf b/asn1/h235/h235.cnf index b4060e4583..fdf0994d35 100644 --- a/asn1/h235/h235.cnf +++ b/asn1/h235/h235.cnf @@ -17,7 +17,7 @@ AuthenticationMechanism SrtpKeys #.END -#.PDU_NEW +#.PDU SrtpCryptoCapability #.END diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index e2a3ceb62f..35d642f1cf 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -20,7 +20,7 @@ MulticastAddress Capability #.END -#.PDU_NEW +#.PDU OpenLogicalChannel #.MAKE_ENUM diff --git a/asn1/h248/h248.cnf b/asn1/h248/h248.cnf index f2bef14fa5..ded860ef76 100644 --- a/asn1/h248/h248.cnf +++ b/asn1/h248/h248.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.PDU_NEW +#.PDU #.NO_EMIT MtpAddress diff --git a/asn1/h282/h282.cnf b/asn1/h282/h282.cnf index af6654c08f..7697c4a8c4 100644 --- a/asn1/h282/h282.cnf +++ b/asn1/h282/h282.cnf @@ -11,7 +11,7 @@ ALIGNED IrisContinuous #.END -#.PDU_NEW +#.PDU RDCPDU NonCollapsingCapabilities #.END diff --git a/asn1/h283/h283.cnf b/asn1/h283/h283.cnf index 1e4f949462..0f7577ccc8 100644 --- a/asn1/h283/h283.cnf +++ b/asn1/h283/h283.cnf @@ -7,7 +7,7 @@ PER ALIGNED #.END -#.PDU_NEW +#.PDU LCTPDU #.END diff --git a/asn1/h323/h323.cnf b/asn1/h323/h323.cnf index 828e80c46c..51d33734b0 100644 --- a/asn1/h323/h323.cnf +++ b/asn1/h323/h323.cnf @@ -9,7 +9,7 @@ PER ALIGNED #.END -#.PDU_NEW +#.PDU RasTunnelledSignallingMessage RobustnessData #.END diff --git a/asn1/h450/h450.cnf b/asn1/h450/h450.cnf index caf504eebd..27c586b57a 100644 --- a/asn1/h450/h450.cnf +++ b/asn1/h450/h450.cnf @@ -44,7 +44,7 @@ Address InvokeIDs #.END -#.PDU_NEW +#.PDU H4501SupplementaryService OPERATION.&ArgumentType OPERATION.&ResultType diff --git a/asn1/h460/h460.cnf b/asn1/h460/h460.cnf index 21d03f9145..2d8c8793db 100644 --- a/asn1/h460/h460.cnf +++ b/asn1/h460/h460.cnf @@ -32,7 +32,7 @@ MEDIA-TRAVERSAL h460.19 MESSAGE-BROADCAST h460.21 #.END -#.PDU_NEW +#.PDU # H.460.2 NumberPortabilityInfo # H.460.3 diff --git a/asn1/h501/h501.cnf b/asn1/h501/h501.cnf index 6185f92650..0664c39596 100644 --- a/asn1/h501/h501.cnf +++ b/asn1/h501/h501.cnf @@ -10,7 +10,7 @@ PER ALIGNED #.END -#.PDU_NEW +#.PDU Message #.END diff --git a/asn1/hnbap/hnbap.cnf b/asn1/hnbap/hnbap.cnf index bce8da84db..d37a952120 100644 --- a/asn1/hnbap/hnbap.cnf +++ b/asn1/hnbap/hnbap.cnf @@ -7,7 +7,7 @@ PER ALIGNED #.END -#.PDU_NEW +#.PDU HNBAP-PDU ##.MAKE_DEFINES @@ -201,7 +201,7 @@ id-HNB-Cell-Identifier ProtocolIE-ID #.END -#.REGISTER_NEW +#.REGISTER #HNBAP-PROTOCOL-IES Cause N hnbap.ies id-Cause diff --git a/asn1/ilp/ilp.cnf b/asn1/ilp/ilp.cnf index fdc0118917..594efe44d3 100644 --- a/asn1/ilp/ilp.cnf +++ b/asn1/ilp/ilp.cnf @@ -7,7 +7,7 @@ PER UNALIGNED #.END -#.PDU_NEW +#.PDU ILP-PDU #.END diff --git a/asn1/inap/inap.cnf b/asn1/inap/inap.cnf index 1abc2955a9..3f4e59a435 100644 --- a/asn1/inap/inap.cnf +++ b/asn1/inap/inap.cnf @@ -41,7 +41,7 @@ Bind Unbind #.END -#.PDU_NEW +#.PDU ERROR.&ParameterType OPERATION.&ArgumentType OPERATION.&ResultType diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c index 0a5ec89f1c..2a2170afe4 100644 --- a/asn1/inap/packet-inap-template.c +++ b/asn1/inap/packet-inap-template.c @@ -244,7 +244,7 @@ void proto_register_inap(void) { expert_inap = expert_register_protocol(proto_inap); expert_register_field_array(expert_inap, ei, array_length(ei)); - new_register_ber_oid_dissector("0.4.0.1.1.1.0.0", dissect_inap, proto_inap, "cs1-ssp-to-scp"); + register_ber_oid_dissector("0.4.0.1.1.1.0.0", dissect_inap, proto_inap, "cs1-ssp-to-scp"); /* Set default SSNs */ range_convert_str(&global_ssn_range, "106,241", MAX_SSN); diff --git a/asn1/isdn-sup/isdn-sup.cnf b/asn1/isdn-sup/isdn-sup.cnf index e50a4bff65..adf1092715 100644 --- a/asn1/isdn-sup/isdn-sup.cnf +++ b/asn1/isdn-sup/isdn-sup.cnf @@ -18,7 +18,7 @@ Closed-User-Group-Service-Operations isdn-sup Advice-of-Charge-Operations isdn-sup MLPP-operations isdn-sup -#.PDU_NEW +#.PDU OPERATION.&ArgumentType OPERATION.&ResultType diff --git a/asn1/lcsap/lcsap.cnf b/asn1/lcsap/lcsap.cnf index 71cda7a482..5b6fb8636d 100644 --- a/asn1/lcsap/lcsap.cnf +++ b/asn1/lcsap/lcsap.cnf @@ -9,7 +9,7 @@ ALIGNED #.EXPORTS Correlation-ID_PDU -#.PDU_NEW +#.PDU LCS-AP-PDU #.MAKE_ENUM @@ -250,7 +250,7 @@ id-Destination-ID ProtocolIE-ID id-LCS-Service-Type-ID ProtocolIE-ID -#.REGISTER_NEW +#.REGISTER #LCS-AP-PROTOCOL-IES Accuracy-Fulfillment-Indicator N lcsap.ies id-Accuracy-Fulfillment-Indicator diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index a7af368dd0..c21fb81473 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -6,7 +6,7 @@ DirSyncFlagsSubEntry PasswdModifyResponseValue -#.PDU_NEW +#.PDU #.TYPE_RENAME @@ -32,7 +32,7 @@ Mechanism TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL AssertionValue TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL DirSyncFlags TYPE = FT_UINT32 DISPLAY = BASE_HEX STRINGS = NULL -#.REGISTER_NEW +#.REGISTER SearchControlValue B "1.2.840.113556.1.4.319" "pagedResultsControl" SortKeyList B "1.2.840.113556.1.4.473" "sortKeyList" SortResult B "1.2.840.113556.1.4.474" "sortResult" diff --git a/asn1/logotypecertextn/logotypecertextn.cnf b/asn1/logotypecertextn/logotypecertextn.cnf index c633cc0dea..d3c6906be9 100644 --- a/asn1/logotypecertextn/logotypecertextn.cnf +++ b/asn1/logotypecertextn/logotypecertextn.cnf @@ -5,9 +5,9 @@ #.EXPORTS -#.PDU_NEW +#.PDU -#.REGISTER_NEW +#.REGISTER LogotypeExtn B "1.3.6.1.5.5.7.1.12" "id-pe-logotype" LogotypeExtn B "1.3.6.1.5.5.7.20.1" "id-pe-logo-loyalty" LogotypeExtn B "1.3.6.1.5.5.7.20.2" "id-pe-logo-background" diff --git a/asn1/lpp/lpp.cnf b/asn1/lpp/lpp.cnf index b542ee98d3..37068fc415 100644 --- a/asn1/lpp/lpp.cnf +++ b/asn1/lpp/lpp.cnf @@ -41,7 +41,7 @@ EllipsoidArc Polygon #.END -#.PDU_NEW +#.PDU LPP-Message Ellipsoid-Point EllipsoidPointWithAltitude diff --git a/asn1/lppa/lppa.cnf b/asn1/lppa/lppa.cnf index 11508fbd95..bea26c30e2 100644 --- a/asn1/lppa/lppa.cnf +++ b/asn1/lppa/lppa.cnf @@ -18,7 +18,7 @@ ProtocolIE-ContainerPairList ProtocolIE-ContainerPair ProtocolIE-FieldPair -#.PDU_NEW +#.PDU LPPA-PDU #.TYPE_RENAME @@ -88,7 +88,7 @@ id-OTDOA-Information-Type-Item ProtocolIE-ID id-MeasurementQuantities-Item ProtocolIE-ID id-RequestedSRSTransmissionCharacteristics ProtocolIE-ID id-ULConfiguration ProtocolIE-ID -#.REGISTER_NEW +#.REGISTER #LPPA-PROTOCOL-IES MeasurementQuantities-Item N lppa.ies id-MeasurementQuantities-Item diff --git a/asn1/lppe/lppe.cnf b/asn1/lppe/lppe.cnf index 3601d56474..f279eead30 100644 --- a/asn1/lppe/lppe.cnf +++ b/asn1/lppe/lppe.cnf @@ -9,7 +9,7 @@ UNALIGNED #.IMPORT ../lpp/lpp-exp.cnf -#.PDU_NEW +#.PDU OMA-LPPe-MessageExtension #.END diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index 7471f0a6c0..7c16217ba7 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -32,7 +32,7 @@ UE-EUTRA-Capability UE-EUTRA-Capability_PDU #.END -#.PDU_NEW +#.PDU HandoverCommand HandoverPreparationInformation UERadioAccessCapabilityInformation diff --git a/asn1/m3ap/m3ap.cnf b/asn1/m3ap/m3ap.cnf index 6044163826..64410d3e1a 100644 --- a/asn1/m3ap/m3ap.cnf +++ b/asn1/m3ap/m3ap.cnf @@ -12,7 +12,7 @@ ProtocolIE-ID #.EXPORTS -#.PDU_NEW +#.PDU M3AP-PDU #.MAKE_ENUM @@ -273,7 +273,7 @@ id-MBMSServiceAreaList ProtocolIE-ID id-Time-ofMBMS-DataTransfer ProtocolIE-ID id-Time-ofMBMS-DataStop ProtocolIE-ID -#.REGISTER_NEW +#.REGISTER #M3AP-PROTOCOL-IES MME-MBMS-M3AP-ID N m3ap.ies id-MME-MBMS-M3AP-ID diff --git a/asn1/mms/mms.cnf b/asn1/mms/mms.cnf index 42cdc6434d..b348c6ad6b 100644 --- a/asn1/mms/mms.cnf +++ b/asn1/mms/mms.cnf @@ -9,7 +9,7 @@ ISO-8650-ACSE-1 acse #.EXPORTS MMSpdu -#.PDU_NEW +#.PDU #.NO_EMIT diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c index a2eb98b11d..2d0341b169 100644 --- a/asn1/mms/packet-mms-template.c +++ b/asn1/mms/packet-mms-template.c @@ -171,8 +171,8 @@ dissect_mms_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi /*--- proto_reg_handoff_mms --- */ void proto_reg_handoff_mms(void) { - new_register_ber_oid_dissector("1.0.9506.2.3", dissect_mms, proto_mms,"MMS"); - new_register_ber_oid_dissector("1.0.9506.2.1", dissect_mms, proto_mms,"mms-abstract-syntax-version1(1)"); + register_ber_oid_dissector("1.0.9506.2.3", dissect_mms, proto_mms,"MMS"); + register_ber_oid_dissector("1.0.9506.2.1", dissect_mms, proto_mms,"mms-abstract-syntax-version1(1)"); heur_dissector_add("cotp", dissect_mms_heur, "MMS over COTP", "mms_cotp", proto_mms, HEURISTIC_ENABLE); heur_dissector_add("cotp_is", dissect_mms_heur, "MMS over COTP (inactive subset)", "mms_cotp_is", proto_mms, HEURISTIC_ENABLE); } diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index 79f2df4099..c1089ab1dd 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -9,7 +9,7 @@ PER ALIGNED #.END -#.PDU_NEW +#.PDU NBAP-PDU #.MAKE_DEFINES @@ -2147,7 +2147,7 @@ int i; #.FN_BODY CFN VAL_PTR = &cfn %(DEFAULT_BODY)s -#.REGISTER_NEW +#.REGISTER #NBAP-PROTOCOL-IES TUTRANGPSMeasurementValueInformation N nbap.ies id-TUTRANGPSMeasurementValueInformation diff --git a/asn1/novell_pkis/novell_pkis.cnf b/asn1/novell_pkis/novell_pkis.cnf index 6c5d22e36d..b1f9231faa 100644 --- a/asn1/novell_pkis/novell_pkis.cnf +++ b/asn1/novell_pkis/novell_pkis.cnf @@ -4,11 +4,11 @@ #.EXPORTS -#.REGISTER_NEW +#.REGISTER SecurityAttributes B "2.16.840.1.113719.1.9.4.1" "pa-sa" RelianceLimits B "2.16.840.1.113719.1.9.4.2" "pa-rl" -#.PDU_NEW +#.PDU # PKIS-MESSAGE diff --git a/asn1/ns_cert_exts/ns_cert_exts.cnf b/asn1/ns_cert_exts/ns_cert_exts.cnf index 9847554eba..c8d8998bd9 100644 --- a/asn1/ns_cert_exts/ns_cert_exts.cnf +++ b/asn1/ns_cert_exts/ns_cert_exts.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.REGISTER_NEW +#.REGISTER CertType B "2.16.840.1.113730.1.1" "ns_cert_exts.cert_type" BaseUrl B "2.16.840.1.113730.1.2" "ns_cert_exts.base_url" RevocationUrl B "2.16.840.1.113730.1.3" "ns_cert_exts.revocation-url" diff --git a/asn1/ocsp/ocsp.cnf b/asn1/ocsp/ocsp.cnf index 002f515d00..551b4583cc 100644 --- a/asn1/ocsp/ocsp.cnf +++ b/asn1/ocsp/ocsp.cnf @@ -18,9 +18,9 @@ PKIX1Explicit88 pkix1explicit #.EXPORTS OCSPResponse -#.PDU_NEW +#.PDU -#.REGISTER_NEW +#.REGISTER BasicOCSPResponse B "1.3.6.1.5.5.7.48.1.1" "id-pkix-ocsp-basic" ReOcspNonce B "1.3.6.1.5.5.7.48.1.2" "id-pkix-ocsp-nonce" CrlID B "1.3.6.1.5.5.7.48.1.3" "id-pkix-ocsp-crl" diff --git a/asn1/p1/p1.cnf b/asn1/p1/p1.cnf index 99c97b9bf7..88df12e59d 100644 --- a/asn1/p1/p1.cnf +++ b/asn1/p1/p1.cnf @@ -106,7 +106,7 @@ UniversalOrBMPString NonDeliveryReasonCode NonDeliveryDiagnosticCode -#.SYNTAX_NEW +#.SYNTAX ORAddress ORName @@ -340,14 +340,14 @@ static const ros_err_t p3_err_tab[] = { }; #.END -#.PDU_NEW +#.PDU ERROR.&ParameterType OPERATION.&ArgumentType OPERATION.&ResultType #.END -#.REGISTER_NEW +#.REGISTER RecipientReassignmentProhibited N p1.extension 1 OriginatorRequestedAlternateRecipient N p1.extension 2 DLExpansionProhibited N p1.extension 3 diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index 09d0c0245c..8858abee70 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -386,7 +386,7 @@ void proto_register_p1(void) { " than the default of 102)", 10, &global_p1_tcp_port); - new_register_ber_syntax_dissector("P1 Message", proto_p1, dissect_p1_mts_apdu); + register_ber_syntax_dissector("P1 Message", proto_p1, dissect_p1_mts_apdu); #include "packet-p1-syn-reg.c" } diff --git a/asn1/p22/p22.cnf b/asn1/p22/p22.cnf index f4a1bda42e..6374a9db77 100644 --- a/asn1/p22/p22.cnf +++ b/asn1/p22/p22.cnf @@ -81,7 +81,7 @@ ForwardedContentToken/_item/body-part-choice/message-or-content-body-part forwar ForwardedContentToken/_item/body-part-choice T_body_part_token_choice -#.REGISTER_NEW +#.REGISTER AbsenceAdvice B "2.6.1.19.0" "id-on-absence-advice" ChangeOfAddressAdvice B "2.6.1.19.1" "id-on-change-of-address-advice" IPMAssemblyInstructions B "2.6.1.17.2" "id-mst-assembly-instructions" diff --git a/asn1/p22/packet-p22-template.c b/asn1/p22/packet-p22-template.c index 0cde0195c4..77dc230e1c 100644 --- a/asn1/p22/packet-p22-template.c +++ b/asn1/p22/packet-p22-template.c @@ -140,8 +140,8 @@ void proto_reg_handoff_p22(void) { #include "packet-p22-dis-tab.c" - new_register_ber_oid_dissector("2.6.1.10.0", dissect_p22, proto_p22, "InterPersonal Message (1984)"); - new_register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)"); + register_ber_oid_dissector("2.6.1.10.0", dissect_p22, proto_p22, "InterPersonal Message (1984)"); + register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)"); } diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf index 7f19b61c7d..94d1ed9046 100644 --- a/asn1/p7/p7.cnf +++ b/asn1/p7/p7.cnf @@ -200,13 +200,13 @@ static const ros_err_t p7_err_tab[] = { }; #.END -#.PDU_NEW +#.PDU ERROR.&ParameterType OPERATION.&ArgumentType OPERATION.&ResultType #.END -#.REGISTER_NEW +#.REGISTER # MSGeneralAttributeTypes ReportLocation B "2.6.4.3.42" "id-att-ac-correlated-report-list" SequenceNumber B "2.6.4.3.76" "id-att-ac-report-subject-entry" diff --git a/asn1/p772/p772.cnf b/asn1/p772/p772.cnf index 05c544b838..d2da78e3b6 100644 --- a/asn1/p772/p772.cnf +++ b/asn1/p772/p772.cnf @@ -40,7 +40,7 @@ AddressListDesignator/type address_list_type MessageType/type message_type_type OtherRecipientDesignator/type other_recipient_type -#.PDU_NEW +#.PDU PrimaryPrecedence CopyPrecedence MessageType @@ -59,7 +59,7 @@ OriginatorPlad Acp127NotificationType SecurityInformationLabels -#.REGISTER_NEW +#.REGISTER PrimaryPrecedence B "1.3.26.0.4406.0.2.0" "primary-precedence" CopyPrecedence B "1.3.26.0.4406.0.2.1" "copy-precedence" MessageType B "1.3.26.0.4406.0.2.2" "message-type" diff --git a/asn1/p772/packet-p772-template.c b/asn1/p772/packet-p772-template.c index 99ce21b780..bbc41edc50 100644 --- a/asn1/p772/packet-p772-template.c +++ b/asn1/p772/packet-p772-template.c @@ -105,7 +105,7 @@ void proto_register_p772(void) { proto_register_field_array(proto_p772, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - new_register_ber_syntax_dissector("STANAG 4406", proto_p772, dissect_p772); + register_ber_syntax_dissector("STANAG 4406", proto_p772, dissect_p772); register_ber_oid_syntax(".p772", NULL, "STANAG 4406"); } @@ -114,5 +114,5 @@ void proto_register_p772(void) { void proto_reg_handoff_p772(void) { #include "packet-p772-dis-tab.c" - new_register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_p772, proto_p772, "STANAG 4406"); + register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_p772, proto_p772, "STANAG 4406"); } diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf index 1bdb0b8097..9a6d0db90a 100644 --- a/asn1/pcap/pcap.cnf +++ b/asn1/pcap/pcap.cnf @@ -9,7 +9,7 @@ ALIGNED #.EXPORTS -#.PDU_NEW +#.PDU PCAP-PDU #.MAKE_ENUM @@ -267,7 +267,7 @@ id-IMEI ProtocolIE-ID #.END -#.REGISTER_NEW +#.REGISTER #PCAP-PROTOCOL-IES Cause N pcap.ies id-Cause diff --git a/asn1/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c index e148f95bd5..8ea89414a3 100644 --- a/asn1/pkcs1/packet-pkcs1-template.c +++ b/asn1/pkcs1/packet-pkcs1-template.c @@ -74,27 +74,27 @@ void proto_register_pkcs1(void) { void proto_reg_handoff_pkcs1(void) { #include "packet-pkcs1-dis-tab.c" - new_register_ber_oid_dissector("1.2.840.113549.2.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2"); - new_register_ber_oid_dissector("1.2.840.113549.2.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4"); - new_register_ber_oid_dissector("1.2.840.113549.2.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "md5"); + register_ber_oid_dissector("1.2.840.113549.2.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2"); + register_ber_oid_dissector("1.2.840.113549.2.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4"); + register_ber_oid_dissector("1.2.840.113549.2.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "md5"); - new_register_ber_oid_dissector("1.2.840.113549.1.1.1", dissect_ber_oid_NULL_callback, proto_pkcs1, "rsaEncryption"); - new_register_ber_oid_dissector("1.2.840.113549.1.1.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2WithRSAEncryption"); - new_register_ber_oid_dissector("1.2.840.113549.1.1.3", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4WithRSAEncryption"); - new_register_ber_oid_dissector("1.2.840.113549.1.1.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md5WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.1", dissect_ber_oid_NULL_callback, proto_pkcs1, "rsaEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.3", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md5WithRSAEncryption"); /* these two are not from RFC2313 but pulled in from http://www.alvestrand.no/objectid/1.2.840.113549.1.1.html */ - new_register_ber_oid_dissector("1.2.840.113549.1.1.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha1WithRSAEncryption"); - new_register_ber_oid_dissector("1.2.840.113549.1.1.6", dissect_ber_oid_NULL_callback, proto_pkcs1, "rsaOAEPEncryptionSET"); + register_ber_oid_dissector("1.2.840.113549.1.1.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha1WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.6", dissect_ber_oid_NULL_callback, proto_pkcs1, "rsaOAEPEncryptionSET"); /* these sha2 algorithms are from RFC3447 */ - new_register_ber_oid_dissector("1.2.840.113549.1.1.11", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha256WithRSAEncryption"); - new_register_ber_oid_dissector("1.2.840.113549.1.1.12", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha384WithRSAEncryption"); - new_register_ber_oid_dissector("1.2.840.113549.1.1.13", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha512WithRSAEncryption"); - new_register_ber_oid_dissector("1.2.840.113549.1.1.14", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha224WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.11", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha256WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.12", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha384WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.13", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha512WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.14", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha224WithRSAEncryption"); oid_add_from_string("secp192r1","1.2.840.10045.3.1.1"); oid_add_from_string("sect163k1","1.3.132.0.1"); diff --git a/asn1/pkcs1/pkcs1.cnf b/asn1/pkcs1/pkcs1.cnf index a332955f78..ed0c7e8dd1 100644 --- a/asn1/pkcs1/pkcs1.cnf +++ b/asn1/pkcs1/pkcs1.cnf @@ -14,7 +14,7 @@ DigestInfo #.FIELD_RENAME -#.REGISTER_NEW +#.REGISTER DSA-Params B "1.2.840.10040.4.1" "id-dsa" DomainParameters B "1.2.840.10046.2.1" "dhpublicnumber" KEA-Params-Id B "2.16.840.1.101.2.1.1.22" "id-keyExchangeAlgorithm" diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 3dd6e03f04..18814039b2 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -496,7 +496,7 @@ void proto_register_pkcs12(void) { "Whether to try and decrypt the encrypted data within the" " PKCS#12 with a NULL password", &try_null_password); - new_register_ber_syntax_dissector("PKCS#12", proto_pkcs12, dissect_PFX_PDU); + register_ber_syntax_dissector("PKCS#12", proto_pkcs12, dissect_PFX_PDU); register_ber_oid_syntax(".p12", NULL, "PKCS#12"); register_ber_oid_syntax(".pfx", NULL, "PKCS#12"); } @@ -506,7 +506,7 @@ void proto_register_pkcs12(void) { void proto_reg_handoff_pkcs12(void) { #include "packet-pkcs12-dis-tab.c" - new_register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); + register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); } diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index 419271ac5d..a1b576e5a8 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -11,7 +11,7 @@ PKCS-5 x509af #.EXPORTS -#.REGISTER_NEW +#.REGISTER KeyBag B "1.2.840.113549.1.12.10.1.1" "keyBag" PKCS8ShroudedKeyBag B "1.2.840.113549.1.12.10.1.2" "pkcs8ShroudedKeyBag" CertBag B "1.2.840.113549.1.12.10.1.3" "certBag" @@ -50,7 +50,7 @@ PBMAC1Params B "1.2.840.113549.1.5.14" "id-PBMAC1" PrivateKeyInfo/version privateKeyVersion PBKDF2Params/salt saltChoice -#.PDU_NEW +#.PDU #AuthenticatedSafe PrivateKeyInfo diff --git a/asn1/pkinit/pkinit.cnf b/asn1/pkinit/pkinit.cnf index f70c1dd33a..a62ff8412f 100644 --- a/asn1/pkinit/pkinit.cnf +++ b/asn1/pkinit/pkinit.cnf @@ -11,7 +11,7 @@ PKIX1Explicit88 pkix1explicit PaPkAsReq PaPkAsRep -#.REGISTER_NEW +#.REGISTER AuthPack B "1.3.6.1.5.2.3.1" "id-pkauthdata" KDCDHKeyInfo B "1.3.6.1.5.2.3.2" "id-pkdhkeydata" KRB5PrincipalName B "1.3.6.1.5.2.2" "id-pkinit-san" diff --git a/asn1/pkix1explicit/pkix1explicit.cnf b/asn1/pkix1explicit/pkix1explicit.cnf index a86cd9dc4e..25c6957b7f 100644 --- a/asn1/pkix1explicit/pkix1explicit.cnf +++ b/asn1/pkix1explicit/pkix1explicit.cnf @@ -18,13 +18,13 @@ Version Time UniqueIdentifier -#.REGISTER_NEW +#.REGISTER DirectoryString B "1.3.6.1.5.5.7.2.1" "id-qt-cps" DomainParameters B "1.2.840.10046.2.1" "dhpublicnumber" IPAddrBlocks B "1.3.6.1.5.5.7.1.7" "id-pe-ipAddrBlocks" ASIdentifiers B "1.3.6.1.5.5.7.1.8" "id-pe-autonomousSysIds" -#.PDU_NEW +#.PDU #.NO_EMIT diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf index 1c4723753f..71ebc6c853 100644 --- a/asn1/pkix1implicit/pkix1implicit.cnf +++ b/asn1/pkix1implicit/pkix1implicit.cnf @@ -17,9 +17,9 @@ AuthorityInfoAccessSyntax KeyIdentifier UserNotice -#.PDU_NEW +#.PDU -#.REGISTER_NEW +#.REGISTER AuthorityInfoAccessSyntax B "1.3.6.1.5.5.7.1.1" "id-pe-authorityInfoAccessSyntax" Dummy B "1.3.6.1.5.5.7.3.1" "id-kp-serverAuth" Dummy B "1.3.6.1.5.5.7.3.2" "id-kp-clientAuth" diff --git a/asn1/pkixac/pkixac.cnf b/asn1/pkixac/pkixac.cnf index dbd3abd48f..0ff6ed5262 100644 --- a/asn1/pkixac/pkixac.cnf +++ b/asn1/pkixac/pkixac.cnf @@ -22,7 +22,7 @@ V2Form #.EXPORTS -#.PDU_NEW +#.PDU #.NO_EMIT @@ -30,11 +30,11 @@ V2Form #.FIELD_RENAME -#.SYNTAX_NEW +#.SYNTAX Clearance RFC3281Clearance -#.REGISTER_NEW +#.REGISTER AAControls B "1.3.6.1.5.5.7.1.6" "id-pe-aaControls" ProxyInfo B "1.3.6.1.5.5.7.1.10" "id-pe-ac-proxying" SvceAuthInfo B "1.3.6.1.5.5.7.10.1" "id-aca-authenticationInfo" diff --git a/asn1/pkixproxy/pkixproxy.cnf b/asn1/pkixproxy/pkixproxy.cnf index 3fc770dac2..a80fbce56f 100644 --- a/asn1/pkixproxy/pkixproxy.cnf +++ b/asn1/pkixproxy/pkixproxy.cnf @@ -5,9 +5,9 @@ #.EXPORTS -#.PDU_NEW +#.PDU -#.REGISTER_NEW +#.REGISTER ProxyCertInfoExtension B "1.3.6.1.5.5.7.1.14" "id-pe-proxyCertInfo" #.NO_EMIT diff --git a/asn1/pkixqualified/pkixqualified.cnf b/asn1/pkixqualified/pkixqualified.cnf index cdb6a8e4b1..0e3315efc6 100644 --- a/asn1/pkixqualified/pkixqualified.cnf +++ b/asn1/pkixqualified/pkixqualified.cnf @@ -7,7 +7,7 @@ #.EXPORTS -#.REGISTER_NEW +#.REGISTER BiometricSyntax B "1.3.6.1.5.5.7.1.2" "id-pe-biometricInfo" QCStatements B "1.3.6.1.5.5.7.1.3" "id-pe-qcStatements" SemanticsInformation B "1.3.6.1.5.5.7.11.1" "id-qcs-pkixQCSyntax-v1" diff --git a/asn1/pkixtsp/pkixtsp.cnf b/asn1/pkixtsp/pkixtsp.cnf index 3e44e65708..2687427b16 100644 --- a/asn1/pkixtsp/pkixtsp.cnf +++ b/asn1/pkixtsp/pkixtsp.cnf @@ -11,7 +11,7 @@ PKIX1Implicit88 pkix1implicit #.EXPORTS -#.PDU_NEW +#.PDU #.NO_EMIT @@ -22,7 +22,7 @@ TSTInfo/version Tst_version PKIStatusInfo/status pki_status TSTInfo/version tst_version -#.REGISTER_NEW +#.REGISTER TSTInfo B "1.2.840.113549.1.9.16.1.4" "id-ct-TSTInfo" #.END diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index ca1304be58..eae1d892c0 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -457,7 +457,7 @@ void proto_register_pres(void) { /*--- proto_reg_handoff_pres ---------------------------------------*/ void proto_reg_handoff_pres(void) { -/* new_register_ber_oid_dissector("0.4.0.0.1.1.1.1", dissect_pres, proto_pres, +/* register_ber_oid_dissector("0.4.0.0.1.1.1.1", dissect_pres, proto_pres, "itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) abstractSyntax(1) pres(1) version1(1)"); */ } diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf index 725a8946f0..01539e9a22 100644 --- a/asn1/pres/pres.cnf +++ b/asn1/pres/pres.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.PDU_NEW +#.PDU UD-type #.NO_EMIT diff --git a/asn1/q932-ros/q932-ros.cnf b/asn1/q932-ros/q932-ros.cnf index 355653a768..bafcbe953e 100644 --- a/asn1/q932-ros/q932-ros.cnf +++ b/asn1/q932-ros/q932-ros.cnf @@ -1,4 +1,4 @@ -#.PDU_NEW +#.PDU ROS diff --git a/asn1/q932/q932.cnf b/asn1/q932/q932.cnf index e43e1a7aae..e5bcf3b968 100644 --- a/asn1/q932/q932.cnf +++ b/asn1/q932/q932.cnf @@ -2,7 +2,7 @@ # Q.932 conformation file # 2007 Tomas Kukosa -#.PDU_NEW +#.PDU InterpretationComponent NetworkFacilityExtension diff --git a/asn1/qsig/qsig.cnf b/asn1/qsig/qsig.cnf index 59ed83a1ba..ad2a75ff7b 100644 --- a/asn1/qsig/qsig.cnf +++ b/asn1/qsig/qsig.cnf @@ -44,7 +44,7 @@ SS-MCR-Operations-asn97 qsig.mcr SS-MCM-Operations-asn1-97 qsig.mcm SS-MID-Operations-asn1-97 qsig.mid -#.PDU_NEW +#.PDU OPERATION.&ArgumentType OPERATION.&ResultType diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index 94a1027565..973a8d9b62 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -18,7 +18,7 @@ TargetRNC-ID_PDU InterSystemInformation-TransparentContainer_PDU Source-ToTarget-TransparentContainer_PDU -#.PDU_NEW +#.PDU RANAP-PDU SourceCellID SourceRNC-ToTargetRNC-TransparentContainer @@ -700,7 +700,7 @@ id-Trace-Collection-Entity-IP-Addess ProtocolIE-ID id-End-Of-CSFB ProtocolIE-ID #.END -#.REGISTER_NEW +#.REGISTER #RANAP-PROTOCOL-IES Cause N ranap.ies id-Cause diff --git a/asn1/rnsap/rnsap.cnf b/asn1/rnsap/rnsap.cnf index fd6e9539d5..fb55b2e882 100644 --- a/asn1/rnsap/rnsap.cnf +++ b/asn1/rnsap/rnsap.cnf @@ -11,7 +11,7 @@ ALIGNED EDPCH-Information-RLReconfPrepare-FDD Non-Serving-RL-Preconfig-Info -#.PDU_NEW +#.PDU RNSAP-PDU #.MAKE_DEFINES @@ -136,7 +136,7 @@ BLER TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL #.END -#.REGISTER_NEW +#.REGISTER #RNSAP-PROTOCOL-IES RTLoadValue N rnsap.ies id-RTLoadValue diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index 9a6639f7eb..ec7efccb8e 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -70,7 +70,7 @@ GSM-CellID RRCConnectionRelease-CCCH-va40ext-IEs #.END -#.PDU_NEW +#.PDU DL-DCCH-Message @dl.dcch UL-DCCH-Message @ul.dcch diff --git a/asn1/rrlp/rrlp.cnf b/asn1/rrlp/rrlp.cnf index 8cdebf1fec..25e1e693f8 100644 --- a/asn1/rrlp/rrlp.cnf +++ b/asn1/rrlp/rrlp.cnf @@ -7,7 +7,7 @@ PER UNALIGNED #.END -#.PDU_NEW +#.PDU PDU #.OMIT_ASSIGNMENTS_EXCEPT MAP-LCS-DataTypes diff --git a/asn1/rua/rua.cnf b/asn1/rua/rua.cnf index 5796355958..f173d7d70c 100644 --- a/asn1/rua/rua.cnf +++ b/asn1/rua/rua.cnf @@ -7,7 +7,7 @@ PER ALIGNED #.END -#.PDU_NEW +#.PDU RUA-PDU #.MAKE_ENUM @@ -123,7 +123,7 @@ id-CN-DomainIndicator ProtocolIE-ID #.END -#.REGISTER_NEW +#.REGISTER #RUA-PROTOCOL-IES Cause N rua.ies id-Cause diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index bbf7eb662c..ce549fb9b1 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -31,7 +31,7 @@ SONtransferCause_PDU UE-HistoryInformation_PDU -#.PDU_NEW +#.PDU S1AP-PDU SourceeNB-ToTargeteNB-TransparentContainer TargeteNB-ToSourceeNB-TransparentContainer @@ -803,7 +803,7 @@ id-eNBIndirectX2TransportLayerAddresses ProtocolIE-ID #.END -#.REGISTER_NEW +#.REGISTER #S1AP-PROTOCOL-IES MME-UE-S1AP-ID N s1ap.ies id-MME-UE-S1AP-ID diff --git a/asn1/sabp/sabp.cnf b/asn1/sabp/sabp.cnf index a527218d9e..af373ea0c3 100644 --- a/asn1/sabp/sabp.cnf +++ b/asn1/sabp/sabp.cnf @@ -9,7 +9,7 @@ ALIGNED #.NO_EMIT -#.PDU_NEW +#.PDU SABP-PDU #.MAKE_ENUM @@ -103,7 +103,7 @@ id-Broadcast-Message-Content-Validity-Indicator ProtocolIE-ID #.END -#.REGISTER_NEW +#.REGISTER #SABP-PROTOCOL-IES Message-Identifier N sabp.ies id-Message-Identifier diff --git a/asn1/sbc-ap/sbc-ap.cnf b/asn1/sbc-ap/sbc-ap.cnf index a9b73a450f..b8af92f784 100644 --- a/asn1/sbc-ap/sbc-ap.cnf +++ b/asn1/sbc-ap/sbc-ap.cnf @@ -8,7 +8,7 @@ ALIGNED #.EXPORTS -#.PDU_NEW +#.PDU SBC-AP-PDU #.MAKE_ENUM @@ -142,7 +142,7 @@ id-Concurrent-Warning-Message-Indicator ProtocolIE-ID id-Extended-Repetition-Period ProtocolIE-ID -#.REGISTER_NEW +#.REGISTER #SBC-AP-PROTOCOL-IES diff --git a/asn1/smrse/smrse.cnf b/asn1/smrse/smrse.cnf index 23ef7d36a1..7aec8fd20e 100644 --- a/asn1/smrse/smrse.cnf +++ b/asn1/smrse/smrse.cnf @@ -9,7 +9,7 @@ SemiOctetString #.END -#.PDU_NEW +#.PDU #.TYPE_RENAME diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 59baf9876a..44999eb7bc 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -2581,7 +2581,7 @@ void proto_register_snmp(void) { register_init_routine(init_ue_cache); register_cleanup_routine(cleanup_ue_cache); - new_register_ber_syntax_dissector("SNMP", proto_snmp, dissect_snmp_tcp); + register_ber_syntax_dissector("SNMP", proto_snmp, dissect_snmp_tcp); } diff --git a/asn1/snmp/snmp.cnf b/asn1/snmp/snmp.cnf index f2b95009f4..e413f56bbc 100644 --- a/asn1/snmp/snmp.cnf +++ b/asn1/snmp/snmp.cnf @@ -2,7 +2,7 @@ # snmp conformation file -#.PDU_NEW +#.PDU SMUX-PDUs #.NO_EMIT diff --git a/asn1/spnego/spnego.cnf b/asn1/spnego/spnego.cnf index a765415290..04ce792d02 100644 --- a/asn1/spnego/spnego.cnf +++ b/asn1/spnego/spnego.cnf @@ -3,7 +3,7 @@ #.EXPORTS -#.PDU_NEW +#.PDU #.NO_EMIT ONLY_VALS NegotiationToken diff --git a/asn1/sv/sv.cnf b/asn1/sv/sv.cnf index 37df9f4555..4b96de73e1 100644 --- a/asn1/sv/sv.cnf +++ b/asn1/sv/sv.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.PDU_NEW +#.PDU #.NO_EMIT ONLY_VALS SampledValues diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c index 1b51a452fa..e9b641b2f3 100644 --- a/asn1/t124/packet-t124-template.c +++ b/asn1/t124/packet-t124-template.c @@ -213,7 +213,7 @@ void proto_register_t124(void) { void proto_reg_handoff_t124(void) { - new_register_ber_oid_dissector("0.0.20.124.0.1", dissect_t124, proto_t124, "Generic Conference Control"); + register_ber_oid_dissector("0.0.20.124.0.1", dissect_t124, proto_t124, "Generic Conference Control"); heur_dissector_add("t125", dissect_t124_heur, "T.124 over T.125", "t124_t125", proto_t124, HEURISTIC_ENABLE); diff --git a/asn1/t124/t124.cnf b/asn1/t124/t124.cnf index ffafb9e1f0..e3a8efa507 100644 --- a/asn1/t124/t124.cnf +++ b/asn1/t124/t124.cnf @@ -92,7 +92,7 @@ TransportAddress #---------------------------------------------------------------------------------------- -#.PDU_NEW +#.PDU #---------------------------------------------------------------------------------------- diff --git a/asn1/t125/t125.cnf b/asn1/t125/t125.cnf index 57116ad6fe..19f644e1cd 100644 --- a/asn1/t125/t125.cnf +++ b/asn1/t125/t125.cnf @@ -67,7 +67,7 @@ ChannelId #---------------------------------------------------------------------------------------- -#.PDU_NEW +#.PDU #---------------------------------------------------------------------------------------- ConnectMCSPDU #.END diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index aef2791aea..c0629d2262 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -12,7 +12,7 @@ Type-of-msg/t30-indicator T30_indicator Type-of-msg/t30-data T30_data #.END -#.PDU_NEW +#.PDU IFPPacket UDPTLPacket #.END diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf index ecb23dc6ec..b8f807ebad 100644 --- a/asn1/tcap/tcap.cnf +++ b/asn1/tcap/tcap.cnf @@ -14,11 +14,11 @@ Release-response-reason DialoguePDU UniDialoguePDU -#.REGISTER_NEW +#.REGISTER DialoguePDU B "0.0.17.773.1.1.1" "id-as-dialogue" UniDialoguePDU B "0.0.17.773.1.2.1" "id-as-uniDialogue" -#.PDU_NEW +#.PDU #.NO_EMIT ONLY_VALS diff --git a/asn1/tetra/tetra.cnf b/asn1/tetra/tetra.cnf index c7b5cee4cd..8c4aab8a48 100644 --- a/asn1/tetra/tetra.cnf +++ b/asn1/tetra/tetra.cnf @@ -54,7 +54,7 @@ CALLMODE #.END -#.PDU_NEW +#.PDU AACH MAC-FRAG MAC-FRAG120 diff --git a/asn1/ulp/ulp.cnf b/asn1/ulp/ulp.cnf index 8798e6facf..55fec09162 100644 --- a/asn1/ulp/ulp.cnf +++ b/asn1/ulp/ulp.cnf @@ -7,7 +7,7 @@ PER UNALIGNED #.END -#.PDU_NEW +#.PDU ULP-PDU #.END diff --git a/asn1/wlancertextn/wlancertextn.cnf b/asn1/wlancertextn/wlancertextn.cnf index 5187d2b029..2a86702974 100644 --- a/asn1/wlancertextn/wlancertextn.cnf +++ b/asn1/wlancertextn/wlancertextn.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.REGISTER_NEW +#.REGISTER SSIDList B "1.3.6.1.5.5.7.1.13" "id-pe-wlanSSID" SSIDList B "1.3.6.1.5.5.7.10.6" "id-aca-wlanSSID" diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf index 133081146c..6fe4b74535 100644 --- a/asn1/x2ap/x2ap.cnf +++ b/asn1/x2ap/x2ap.cnf @@ -11,7 +11,7 @@ ALIGNED # Get rid of unused code warnings #.END -#.PDU_NEW +#.PDU X2AP-PDU #.MAKE_ENUM @@ -262,7 +262,7 @@ id-ExtendedULInterferenceOverloadInfo ProtocolIE-ID id-RNL-Header ProtocolIE-ID id-x2APMessage ProtocolIE-ID -#.REGISTER_NEW +#.REGISTER #X2AP-PROTOCOL-IES E-RABs-Admitted-Item N x2ap.ies id-E-RABs-Admitted-Item diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index dc3f89e3d2..198970a427 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -127,9 +127,9 @@ void proto_register_x509af(void) { proto_register_subtree_array(ett, array_length(ett)); - new_register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU); - new_register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU); - new_register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU); + register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU); + register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU); + register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU); register_ber_oid_syntax(".cer", NULL, "Certificate"); register_ber_oid_syntax(".crt", NULL, "Certificate"); @@ -153,27 +153,27 @@ void proto_reg_handoff_x509af(void) { for the time being, ronnie */ /* from http://www.alvestrand.no/objectid/1.3.14.3.2.html */ - new_register_ber_oid_dissector("1.3.14.3.2.2", dissect_ber_oid_NULL_callback, proto_x509af, "md4WithRSA"); - new_register_ber_oid_dissector("1.3.14.3.2.3", dissect_ber_oid_NULL_callback, proto_x509af, "md5WithRSA"); - new_register_ber_oid_dissector("1.3.14.3.2.4", dissect_ber_oid_NULL_callback, proto_x509af, "md4WithRSAEncryption"); - new_register_ber_oid_dissector("1.3.14.3.2.6", dissect_ber_oid_NULL_callback, proto_x509af, "desECB"); - new_register_ber_oid_dissector("1.3.14.3.2.11", dissect_ber_oid_NULL_callback, proto_x509af, "rsaSignature"); - new_register_ber_oid_dissector("1.3.14.3.2.14", dissect_ber_oid_NULL_callback, proto_x509af, "mdc2WithRSASignature"); - new_register_ber_oid_dissector("1.3.14.3.2.15", dissect_ber_oid_NULL_callback, proto_x509af, "shaWithRSASignature"); - new_register_ber_oid_dissector("1.3.14.3.2.16", dissect_ber_oid_NULL_callback, proto_x509af, "dhWithCommonModulus"); - new_register_ber_oid_dissector("1.3.14.3.2.17", dissect_ber_oid_NULL_callback, proto_x509af, "desEDE"); - new_register_ber_oid_dissector("1.3.14.3.2.18", dissect_ber_oid_NULL_callback, proto_x509af, "sha"); - new_register_ber_oid_dissector("1.3.14.3.2.19", dissect_ber_oid_NULL_callback, proto_x509af, "mdc-2"); - new_register_ber_oid_dissector("1.3.14.3.2.20", dissect_ber_oid_NULL_callback, proto_x509af, "dsaCommon"); - new_register_ber_oid_dissector("1.3.14.3.2.21", dissect_ber_oid_NULL_callback, proto_x509af, "dsaCommonWithSHA"); - new_register_ber_oid_dissector("1.3.14.3.2.22", dissect_ber_oid_NULL_callback, proto_x509af, "rsaKeyTransport"); - new_register_ber_oid_dissector("1.3.14.3.2.23", dissect_ber_oid_NULL_callback, proto_x509af, "keyed-hash-seal"); - new_register_ber_oid_dissector("1.3.14.3.2.24", dissect_ber_oid_NULL_callback, proto_x509af, "md2WithRSASignature"); - new_register_ber_oid_dissector("1.3.14.3.2.25", dissect_ber_oid_NULL_callback, proto_x509af, "md5WithRSASignature"); - new_register_ber_oid_dissector("1.3.14.3.2.26", dissect_ber_oid_NULL_callback, proto_x509af, "SHA-1"); - new_register_ber_oid_dissector("1.3.14.3.2.27", dissect_ber_oid_NULL_callback, proto_x509af, "dsaWithSHA1"); - new_register_ber_oid_dissector("1.3.14.3.2.28", dissect_ber_oid_NULL_callback, proto_x509af, "dsaWithCommonSHA1"); - new_register_ber_oid_dissector("1.3.14.3.2.29", dissect_ber_oid_NULL_callback, proto_x509af, "sha-1WithRSAEncryption"); + register_ber_oid_dissector("1.3.14.3.2.2", dissect_ber_oid_NULL_callback, proto_x509af, "md4WithRSA"); + register_ber_oid_dissector("1.3.14.3.2.3", dissect_ber_oid_NULL_callback, proto_x509af, "md5WithRSA"); + register_ber_oid_dissector("1.3.14.3.2.4", dissect_ber_oid_NULL_callback, proto_x509af, "md4WithRSAEncryption"); + register_ber_oid_dissector("1.3.14.3.2.6", dissect_ber_oid_NULL_callback, proto_x509af, "desECB"); + register_ber_oid_dissector("1.3.14.3.2.11", dissect_ber_oid_NULL_callback, proto_x509af, "rsaSignature"); + register_ber_oid_dissector("1.3.14.3.2.14", dissect_ber_oid_NULL_callback, proto_x509af, "mdc2WithRSASignature"); + register_ber_oid_dissector("1.3.14.3.2.15", dissect_ber_oid_NULL_callback, proto_x509af, "shaWithRSASignature"); + register_ber_oid_dissector("1.3.14.3.2.16", dissect_ber_oid_NULL_callback, proto_x509af, "dhWithCommonModulus"); + register_ber_oid_dissector("1.3.14.3.2.17", dissect_ber_oid_NULL_callback, proto_x509af, "desEDE"); + register_ber_oid_dissector("1.3.14.3.2.18", dissect_ber_oid_NULL_callback, proto_x509af, "sha"); + register_ber_oid_dissector("1.3.14.3.2.19", dissect_ber_oid_NULL_callback, proto_x509af, "mdc-2"); + register_ber_oid_dissector("1.3.14.3.2.20", dissect_ber_oid_NULL_callback, proto_x509af, "dsaCommon"); + register_ber_oid_dissector("1.3.14.3.2.21", dissect_ber_oid_NULL_callback, proto_x509af, "dsaCommonWithSHA"); + register_ber_oid_dissector("1.3.14.3.2.22", dissect_ber_oid_NULL_callback, proto_x509af, "rsaKeyTransport"); + register_ber_oid_dissector("1.3.14.3.2.23", dissect_ber_oid_NULL_callback, proto_x509af, "keyed-hash-seal"); + register_ber_oid_dissector("1.3.14.3.2.24", dissect_ber_oid_NULL_callback, proto_x509af, "md2WithRSASignature"); + register_ber_oid_dissector("1.3.14.3.2.25", dissect_ber_oid_NULL_callback, proto_x509af, "md5WithRSASignature"); + register_ber_oid_dissector("1.3.14.3.2.26", dissect_ber_oid_NULL_callback, proto_x509af, "SHA-1"); + register_ber_oid_dissector("1.3.14.3.2.27", dissect_ber_oid_NULL_callback, proto_x509af, "dsaWithSHA1"); + register_ber_oid_dissector("1.3.14.3.2.28", dissect_ber_oid_NULL_callback, proto_x509af, "dsaWithCommonSHA1"); + register_ber_oid_dissector("1.3.14.3.2.29", dissect_ber_oid_NULL_callback, proto_x509af, "sha-1WithRSAEncryption"); /* these will generally be encoded as ";binary" in LDAP */ diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf index 23ae5c7c62..936379c8a7 100644 --- a/asn1/x509af/x509af.cnf +++ b/asn1/x509af/x509af.cnf @@ -31,9 +31,9 @@ Time Validity Version -#.PDU_NEW +#.PDU -#.REGISTER_NEW +#.REGISTER Certificate B "2.5.4.36" "id-at-userCertificate" Certificate B "2.5.4.37" "id-at-cAcertificate" CertificateList B "2.5.4.38" "id-at-authorityRevocationList" diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c index fc57a4a47f..006d9de471 100644 --- a/asn1/x509ce/packet-x509ce-template.c +++ b/asn1/x509ce/packet-x509ce-template.c @@ -136,7 +136,7 @@ void proto_register_x509ce(void) { /*--- proto_reg_handoff_x509ce -------------------------------------------*/ void proto_reg_handoff_x509ce(void) { #include "packet-x509ce-dis-tab.c" - new_register_ber_oid_dissector("2.5.29.24", dissect_x509ce_invalidityDate_callback, proto_x509ce, "id-ce-invalidityDate"); - new_register_ber_oid_dissector("2.5.29.51", dissect_x509ce_baseUpdateTime_callback, proto_x509ce, "id-ce-baseUpdateTime"); + register_ber_oid_dissector("2.5.29.24", dissect_x509ce_invalidityDate_callback, proto_x509ce, "id-ce-invalidityDate"); + register_ber_oid_dissector("2.5.29.51", dissect_x509ce_baseUpdateTime_callback, proto_x509ce, "id-ce-baseUpdateTime"); } diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf index 96962fb58f..454ea8958e 100644 --- a/asn1/x509ce/x509ce.cnf +++ b/asn1/x509ce/x509ce.cnf @@ -89,13 +89,13 @@ ScramblerCapabilities CiplusInfo CicamBrandId -#.PDU_NEW +#.PDU ScramblerCapabilities CiplusInfo CicamBrandId -#.REGISTER_NEW +#.REGISTER CertificatePoliciesSyntax B "2.5.29.3" "id-ce-certificatePolicies" AttributesSyntax B "2.5.29.9" "id-ce-subjectDirectoryAttributes" SubjectKeyIdentifier B "2.5.29.14" "id-ce-subjectKeyIdentifier" diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf index 92fa3fa211..db64da356b 100644 --- a/asn1/x509if/x509if.cnf +++ b/asn1/x509if/x509if.cnf @@ -98,7 +98,7 @@ SearchRuleDescription SearchRuleId SubtreeSpecification -#.PDU_NEW +#.PDU DistinguishedName #.NO_EMIT @@ -136,7 +136,7 @@ RequestAttribute/defaultValues/_item/values/_item ra_values_item RequestAttribute/selectedValues ra_selectedValues RequestAttribute/selectedValues/_item ra_selectedValues_item -#.REGISTER_NEW +#.REGISTER DistinguishedName B "2.5.4.1" "id-at-aliasedEntryName" DistinguishedName B "2.5.4.31" "id-at-member" DistinguishedName B "2.5.4.32" "id-at-owner" diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index ee3422770b..b142ed2e9f 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -62,7 +62,7 @@ XDayOf ZonalResult ZonalSelect -#.SYNTAX_NEW +#.SYNTAX BitString Boolean CaseIgnoreListMatch @@ -101,7 +101,7 @@ TelexNumber UniqueIdentifier X121Address -#.REGISTER_NEW +#.REGISTER ObjectIdentifier B "2.5.4.0" "id-at-objectClass" # - see x509if.cnf for "id-at-aliasedEntryName" DirectoryString B "2.5.4.2" "id-at-knowledgeInformation" |