osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Regenerate ASN.1 dissectors 

Change-Id: I1b7fb95df061e97de2e236d19221b8e2a5da0d92
Reviewed-on: https://code.wireshark.org/review/29226
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2018-08-21 19:31:05 +01:00 committed by João Valverde
parent ad3367e169
commit 0410a522d5
3 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-cms.c
View File

@ -3399,7 +3399,7 @@ void proto_reg_handoff_cms(void) {
#line 141 "./asn1/cms/packet-cms-template.c"
/* RFC 3370 [CMS-ASN} section 4.3.1 */
register_ber_oid_dissector("1.2.840.113549.1.9.16.3.6", dissect_ber_oid_NULL_callback, proto_cms, "id-alg-CMS3DESwrap");
register_ber_oid_dissector("1.2.840.113549.1.9.16.3.6", dissect_ber_oid_NULL_callback, proto_cms, "id-alg-CMS3DESwrap");
oid_add_from_string("id-data","1.2.840.113549.1.7.1");
oid_add_from_string("id-alg-des-cbc","1.3.14.3.2.7");

98
epan/dissectors/packet-gprscdr.c
View File

@ -3732,7 +3732,7 @@ dissect_gprscdr_SGSNNILCSRecord(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
static const ber_sequence_t SEQUENCE_OF_RAIdentity_sequence_of[1] = {
{ &hf_gprscdr_listofRAs_item, -1/*imported*/, -1/*imported*/, BER_FLAGS_NOOWNTAG, dissect_gsm_map_RAIdentity },
{ &hf_gprscdr_listofRAs_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_RAIdentity },
};
static int
@ -4953,12 +4953,12 @@ proto_register_gprscdr(void)
FT_NONE, BASE_NONE, NULL, 0,
"ManagementExtension", HFILL }},
{ &hf_gprscdr_positionMethodFailureCause,
{ "positionMethodFailureCause", "gprscdr.positionMethodFailureCause_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "positionMethodFailureCause", "gprscdr.positionMethodFailureCause",
FT_UINT32, BASE_DEC, VALS(gsm_map_er_PositionMethodFailure_Diagnostic_vals), 0,
"PositionMethodFailure_Diagnostic", HFILL }},
{ &hf_gprscdr_unauthorizedLCSClientCause,
{ "unauthorizedLCSClientCause", "gprscdr.unauthorizedLCSClientCause_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "unauthorizedLCSClientCause", "gprscdr.unauthorizedLCSClientCause",
FT_UINT32, BASE_DEC, VALS(gsm_map_er_UnauthorizedLCSClient_Diagnostic_vals), 0,
"UnauthorizedLCSClient_Diagnostic", HFILL }},
{ &hf_gprscdr_diameterResultCodeAndExperimentalResult,
{ "diameterResultCodeAndExperimentalResult", "gprscdr.diameterResultCodeAndExperimentalResult",
@ -5013,12 +5013,12 @@ proto_register_gprscdr(void)
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_gprscdr_lcsClientDialedByMS,
{ "lcsClientDialedByMS", "gprscdr.lcsClientDialedByMS_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "lcsClientDialedByMS", "gprscdr.lcsClientDialedByMS",
FT_BYTES, BASE_NONE, NULL, 0,
"AddressString", HFILL }},
{ &hf_gprscdr_lcsClientInternalID,
{ "lcsClientInternalID", "gprscdr.lcsClientInternalID_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "lcsClientInternalID", "gprscdr.lcsClientInternalID",
FT_UINT32, BASE_DEC, VALS(gsm_map_LCSClientInternalID_vals), 0,
NULL, HFILL }},
{ &hf_gprscdr_locationAreaCode,
{ "locationAreaCode", "gprscdr.locationAreaCode",
@ -5157,8 +5157,8 @@ proto_register_gprscdr(void)
FT_BOOLEAN, BASE_NONE, NULL, 0,
"NetworkInitiatedPDPContext", HFILL }},
{ &hf_gprscdr_servedIMSI,
{ "servedIMSI", "gprscdr.servedIMSI_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "servedIMSI", "gprscdr.servedIMSI",
FT_BYTES, BASE_NONE, NULL, 0,
"IMSI", HFILL }},
{ &hf_gprscdr_ggsnAddress,
{ "ggsnAddress", "gprscdr.ggsnAddress",
@ -5237,8 +5237,8 @@ proto_register_gprscdr(void)
FT_UINT32, BASE_DEC, VALS(gprscdr_APNSelectionMode_vals), 0,
NULL, HFILL }},
{ &hf_gprscdr_servedMSISDN,
{ "servedMSISDN", "gprscdr.servedMSISDN_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "servedMSISDN", "gprscdr.servedMSISDN",
FT_BYTES, BASE_NONE, NULL, 0,
"MSISDN", HFILL }},
{ &hf_gprscdr_chargingCharacteristics,
{ "chargingCharacteristics", "gprscdr.chargingCharacteristics",
@ -5261,8 +5261,8 @@ proto_register_gprscdr(void)
FT_BYTES, BASE_NONE, NULL, 0,
"PLMN_Id", HFILL }},
{ &hf_gprscdr_servedIMEISV,
{ "servedIMEISV", "gprscdr.servedIMEISV_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "servedIMEISV", "gprscdr.servedIMEISV",
FT_BYTES, BASE_NONE, NULL, 0,
"IMEI", HFILL }},
{ &hf_gprscdr_rATType,
{ "rATType", "gprscdr.rATType",
@ -5321,8 +5321,8 @@ proto_register_gprscdr(void)
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_gprscdr_servedIMEI,
{ "servedIMEI", "gprscdr.servedIMEI_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "servedIMEI", "gprscdr.servedIMEI",
FT_BYTES, BASE_NONE, NULL, 0,
"IMEI", HFILL }},
{ &hf_gprscdr_sgsnAddress_01,
{ "sgsnAddress", "gprscdr.sgsnAddress",
@ -5361,12 +5361,12 @@ proto_register_gprscdr(void)
FT_INT32, BASE_DEC, NULL, 0,
"DataVolumeGPRS", HFILL }},
{ &hf_gprscdr_serviceCentre,
{ "serviceCentre", "gprscdr.serviceCentre_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "serviceCentre", "gprscdr.serviceCentre",
FT_BYTES, BASE_NONE, NULL, 0,
"AddressString", HFILL }},
{ &hf_gprscdr_recordingEntity,
{ "recordingEntity", "gprscdr.recordingEntity_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "recordingEntity", "gprscdr.recordingEntity",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_gprscdr_locationArea,
{ "locationArea", "gprscdr.locationArea",
@ -5909,12 +5909,12 @@ proto_register_gprscdr(void)
FT_BYTES, BASE_NONE, NULL, 0,
"DiameterIdentity", HFILL }},
{ &hf_gprscdr_originatingAddress,
{ "originatingAddress", "gprscdr.originatingAddress_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "originatingAddress", "gprscdr.originatingAddress",
FT_BYTES, BASE_NONE, NULL, 0,
"AddressString", HFILL }},
{ &hf_gprscdr_lcsClientType,
{ "lcsClientType", "gprscdr.lcsClientType_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "lcsClientType", "gprscdr.lcsClientType",
FT_UINT32, BASE_DEC, VALS(gsm_map_lcs_LCSClientType_vals), 0,
NULL, HFILL }},
{ &hf_gprscdr_lcsClientIdentity,
{ "lcsClientIdentity", "gprscdr.lcsClientIdentity_element",
@ -5929,20 +5929,20 @@ proto_register_gprscdr(void)
FT_BYTES, BASE_NONE, NULL, 0,
"LCSQoSInfo", HFILL }},
{ &hf_gprscdr_lcsPriority,
{ "lcsPriority", "gprscdr.lcsPriority_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "lcsPriority", "gprscdr.lcsPriority",
FT_BYTES, BASE_NONE, NULL, 0,
"LCS_Priority", HFILL }},
{ &hf_gprscdr_mlcNumber,
{ "mlcNumber", "gprscdr.mlcNumber_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "mlcNumber", "gprscdr.mlcNumber",
FT_BYTES, BASE_NONE, NULL, 0,
"ISDN_AddressString", HFILL }},
{ &hf_gprscdr_measurementDuration,
{ "measurementDuration", "gprscdr.measurementDuration",
FT_INT32, BASE_DEC, NULL, 0,
"CallDuration", HFILL }},
{ &hf_gprscdr_notificationToMSUser,
{ "notificationToMSUser", "gprscdr.notificationToMSUser_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "notificationToMSUser", "gprscdr.notificationToMSUser",
FT_UINT32, BASE_DEC, VALS(gsm_map_ms_NotificationToMSUser_vals), 0,
NULL, HFILL }},
{ &hf_gprscdr_privacyOverride,
{ "privacyOverride", "gprscdr.privacyOverride_element",
@ -5953,8 +5953,8 @@ proto_register_gprscdr(void)
FT_NONE, BASE_NONE, NULL, 0,
"LocationAreaAndCell", HFILL }},
{ &hf_gprscdr_locationEstimate,
{ "locationEstimate", "gprscdr.locationEstimate_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "locationEstimate", "gprscdr.locationEstimate",
FT_BYTES, BASE_NONE, NULL, 0,
"Ext_GeographicalInformation", HFILL }},
{ &hf_gprscdr_positioningData,
{ "positioningData", "gprscdr.positioningData",
@ -5965,16 +5965,16 @@ proto_register_gprscdr(void)
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_gprscdr_locationMethod,
{ "locationMethod", "gprscdr.locationMethod_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "locationMethod", "gprscdr.locationMethod",
FT_UINT32, BASE_DEC, VALS(gsm_ss_LocationMethod_vals), 0,
NULL, HFILL }},
{ &hf_gprscdr_listofRAs,
{ "listofRAs", "gprscdr.listofRAs",
FT_UINT32, BASE_DEC, NULL, 0,
"SEQUENCE_OF_RAIdentity", HFILL }},
{ &hf_gprscdr_listofRAs_item,
{ "RAIdentity", "gprscdr.RAIdentity_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "RAIdentity", "gprscdr.RAIdentity",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_gprscdr_listOfTrafficVolumes_02,
{ "listOfTrafficVolumes", "gprscdr.listOfTrafficVolumes",
@ -6053,16 +6053,16 @@ proto_register_gprscdr(void)
FT_INT32, BASE_DEC, NULL, 0,
"DataVolumeGPRS", HFILL }},
{ &hf_gprscdr_sCFAddress,
{ "sCFAddress", "gprscdr.sCFAddress_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "sCFAddress", "gprscdr.sCFAddress",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_gprscdr_serviceKey,
{ "serviceKey", "gprscdr.serviceKey_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "serviceKey", "gprscdr.serviceKey",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_gprscdr_defaultTransactionHandling,
{ "defaultTransactionHandling", "gprscdr.defaultTransactionHandling_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "defaultTransactionHandling", "gprscdr.defaultTransactionHandling",
FT_UINT32, BASE_DEC, VALS(gsm_map_ms_DefaultGPRS_Handling_vals), 0,
"DefaultGPRS_Handling", HFILL }},
{ &hf_gprscdr_numberOfDPEncountered,
{ "numberOfDPEncountered", "gprscdr.numberOfDPEncountered",
@ -6089,8 +6089,8 @@ proto_register_gprscdr(void)
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_gprscdr_defaultSMSHandling,
{ "defaultSMSHandling", "gprscdr.defaultSMSHandling_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "defaultSMSHandling", "gprscdr.defaultSMSHandling",
FT_UINT32, BASE_DEC, VALS(gsm_map_ms_DefaultSMS_Handling_vals), 0,
"DefaultSMS_Handling", HFILL }},
{ &hf_gprscdr_cAMELCallingPartyNumber,
{ "cAMELCallingPartyNumber", "gprscdr.cAMELCallingPartyNumber",
@ -6101,12 +6101,12 @@ proto_register_gprscdr(void)
FT_BYTES, BASE_NONE, NULL, 0,
"SmsTpDestinationNumber", HFILL }},
{ &hf_gprscdr_cAMELSMSCAddress,
{ "cAMELSMSCAddress", "gprscdr.cAMELSMSCAddress_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "cAMELSMSCAddress", "gprscdr.cAMELSMSCAddress",
FT_BYTES, BASE_NONE, NULL, 0,
"AddressString", HFILL }},
{ &hf_gprscdr_smsReferenceNumber,
{ "smsReferenceNumber", "gprscdr.smsReferenceNumber_element",
FT_NONE, BASE_NONE, NULL, 0,
{ "smsReferenceNumber", "gprscdr.smsReferenceNumber",
FT_BYTES, BASE_NONE, NULL, 0,
"CallReferenceNumber", HFILL }},
{ &hf_gprscdr_changeCondition_01,
{ "changeCondition", "gprscdr.changeCondition",

2
epan/dissectors/packet-nist-csor.c
View File

@ -234,7 +234,7 @@ void proto_reg_handoff_nist_csor(void) {
/* Secure Hash Algorithms */
oid_add_from_string("hashAlgs","2.16.840.1.101.3.4.2");
/* SHA-3 family */
/* SHA-2 family */
oid_add_from_string("id-sha256","2.16.840.1.101.3.4.2.1");
oid_add_from_string("id-sha384","2.16.840.1.101.3.4.2.2");
oid_add_from_string("id-sha512","2.16.840.1.101.3.4.2.3");