diff options
| -rw-r--r-- | epan/asn1.h | 3 | ||||
| -rw-r--r-- | epan/dissectors/asn1/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ieee1609dot2/IEEE1609dot2DataTypes.asn | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ieee1609dot2/ieee1609dot2.cnf | 19 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c | 28 | ||||
| -rw-r--r-- | epan/dissectors/packet-ieee1609dot2.c | 2154 | ||||
| -rw-r--r-- | epan/dissectors/packet-wsmp.c | 2 | ||||
| -rwxr-xr-x | tools/asn2wrs.py | 87 |
8 files changed, 1074 insertions, 1223 deletions
diff --git a/epan/asn1.h b/epan/asn1.h index 6331ebf03d..bbc4cd4748 100644 --- a/epan/asn1.h +++ b/epan/asn1.h @@ -18,7 +18,8 @@ typedef enum { ASN1_ENC_BER, /* X.690 - BER, CER, DER */ ASN1_ENC_PER, /* X.691 - PER */ ASN1_ENC_ECN, /* X.692 - ECN */ - ASN1_ENC_XER /* X.693 - XER */ + ASN1_ENC_XER, /* X.693 - XER */ + ASN1_ENC_OER /* X.696 - OER */ } asn1_enc_e; typedef enum { diff --git a/epan/dissectors/asn1/CMakeLists.txt b/epan/dissectors/asn1/CMakeLists.txt index 32ee252d99..3e295d441d 100644 --- a/epan/dissectors/asn1/CMakeLists.txt +++ b/epan/dissectors/asn1/CMakeLists.txt @@ -53,7 +53,7 @@ set(ASN1_SRC_DIRS h501 hnbap idmp -# ieee1609dot2 + ieee1609dot2 ilp inap isdn-sup diff --git a/epan/dissectors/asn1/ieee1609dot2/IEEE1609dot2DataTypes.asn b/epan/dissectors/asn1/ieee1609dot2/IEEE1609dot2DataTypes.asn index 7463be5801..5dbef9be7d 100644 --- a/epan/dissectors/asn1/ieee1609dot2/IEEE1609dot2DataTypes.asn +++ b/epan/dissectors/asn1/ieee1609dot2/IEEE1609dot2DataTypes.asn @@ -295,4 +295,4 @@ dot2(2) base (1) schema (1)} ... } -END
\ No newline at end of file +END diff --git a/epan/dissectors/asn1/ieee1609dot2/ieee1609dot2.cnf b/epan/dissectors/asn1/ieee1609dot2/ieee1609dot2.cnf index 8ccdb69c67..6118ac8ef3 100644 --- a/epan/dissectors/asn1/ieee1609dot2/ieee1609dot2.cnf +++ b/epan/dissectors/asn1/ieee1609dot2/ieee1609dot2.cnf @@ -1,6 +1,10 @@ # IEEE1609dot2.cnf # IEEE1609dot2 conformation file +#.OPT +OER +#.END + #.MODULE #.MODULE_IMPORT @@ -15,6 +19,21 @@ Ieee1609Dot2Data #.OMIT_ASSIGNMENT # Get rid of unused code warnings +Countersignature +ExplicitCertificate +HashedId4 +HashedId10 +HashedId32 +ImplicitCertificate +KnownLatitude +KnownLongitude +LaId +LinkageSeed +SequenceOfPsid +SequenceOfUint3 +Uint3 +UnknownLatitude +UnknownLongitude #.TYPE_RENAME diff --git a/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c b/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c index 428a32af15..8ca285e076 100644 --- a/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c +++ b/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c @@ -26,40 +26,34 @@ void proto_register_IEEE1609dot2(void); void proto_reg_handoff_IEEE1609dot2(void); /* Initialize the protocol and registered fields */ -int proto_IEEE1609dot2 = -1; -#include "packet-IEEE1609dot2-hf.c" +int proto_ieee1609dot2 = -1; +#include "packet-ieee1609dot2-hf.c" /* Initialize the subtree pointers */ -#include "packet-IEEE1609dot2-ett.c" +#include "packet-ieee1609dot2-ett.c" -#include "packet-IEEE1609dot2-fn.c" +#include "packet-ieee1609dot2-fn.c" -/*--- proto_register_IEEE1609dot2 ----------------------------------------------*/ -void proto_register_IEEE1609dot2(void) { +/*--- proto_register_ieee1609dot2 ----------------------------------------------*/ +void proto_register_ieee1609dot2(void) { /* List of fields */ static hf_register_info hf[] = { -#include "packet-IEEE1609dot2-hfarr.c" +#include "packet-ieee1609dot2-hfarr.c" }; /* List of subtrees */ static gint *ett[] = { -#include "packet-IEEE1609dot2-ettarr.c" +#include "packet-ieee1609dot2-ettarr.c" }; /* Register protocol */ - proto_IEEE1609dot2 = proto_register_protocol(PNAME, PSNAME, PFNAME); + proto_ieee1609dot2 = proto_register_protocol(PNAME, PSNAME, PFNAME); /* Register fields and subtrees */ - proto_register_field_array(proto_IEEE1609dot2, hf, array_length(hf)); + proto_register_field_array(proto_ieee1609dot2, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("IEEE1609dot2.data", dissect_Ieee1609Dot2Data_PDU, proto_IEEE1609dot2); + register_dissector("ieee1609dot2.data", dissect_Ieee1609Dot2Data_PDU, proto_ieee1609dot2); } - - -/*--- proto_reg_handoff_IEEE1609dot2 -------------------------------------------*/ -void proto_reg_handoff_IEEE1609dot2(void) { -} - diff --git a/epan/dissectors/packet-ieee1609dot2.c b/epan/dissectors/packet-ieee1609dot2.c index f2ffd4f6d7..bcb90da131 100644 --- a/epan/dissectors/packet-ieee1609dot2.c +++ b/epan/dissectors/packet-ieee1609dot2.c @@ -1,11 +1,11 @@ /* Do not modify this file. Changes will be overwritten. */ /* Generated automatically by the ASN.1 to Wireshark dissector compiler */ -/* packet-IEEE1609dot2.c */ -/* asn2wrs.py -p IEEE1609dot2 -c ./IEEE1609dot2.cnf -s ./packet-IEEE1609dot2-template -D . -O ../.. IEEE1609dot2BaseTypes.asn IEEE1609dot2DataTypes.asn */ +/* packet-ieee1609dot2.c */ +/* asn2wrs.py -p ieee1609dot2 -c ./ieee1609dot2.cnf -s ./packet-ieee1609dot2-template -D . -O ../.. IEEE1609dot2BaseTypes.asn IEEE1609dot2DataTypes.asn */ -/* Input file: packet-IEEE1609dot2-template.c */ +/* Input file: packet-ieee1609dot2-template.c */ -#line 1 "./asn1/ieee1609dot2/packet-IEEE1609dot2-template.c" +#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" /* packet-IEEE1609dot2.c * Routines for HI2 (ETSI TS 101 671 V3.5.1 (2009-11)) * Erwin van Eijk 2010 @@ -30,272 +30,248 @@ #define PSNAME "IEEE1609dot2" #define PFNAME "ieee1609dot2" -#if defined(__GNUC__) - /* - * This is meant to handle defined but not used. Fix in a better way when automatically generated OER - * - * DIAG_OFF doesn't work with llvm-gcc, for some unknown reason, so - * we just use the pragma directly. - */ -#pragma GCC diagnostic ignored "-Wunused-function" -#endif - void proto_register_IEEE1609dot2(void); void proto_reg_handoff_IEEE1609dot2(void); /* Initialize the protocol and registered fields */ -int proto_IEEE1609dot2 = -1; - -/*--- Included file: packet-IEEE1609dot2-hf.c ---*/ -#line 1 "./asn1/ieee1609dot2/packet-IEEE1609dot2-hf.c" -static int hf_IEEE1609dot2_Ieee1609Dot2Data_PDU = -1; /* Ieee1609Dot2Data */ -static int hf_IEEE1609dot2_SequenceOfUint3_item = -1; /* Uint3 */ -static int hf_IEEE1609dot2_SequenceOfUint8_item = -1; /* Uint8 */ -static int hf_IEEE1609dot2_SequenceOfUint16_item = -1; /* Uint16 */ -static int hf_IEEE1609dot2_start = -1; /* Time32 */ -static int hf_IEEE1609dot2_duration = -1; /* Duration */ -static int hf_IEEE1609dot2_microseconds = -1; /* Uint16 */ -static int hf_IEEE1609dot2_milliseconds = -1; /* Uint16 */ -static int hf_IEEE1609dot2_seconds = -1; /* Uint16 */ -static int hf_IEEE1609dot2_minutes = -1; /* Uint16 */ -static int hf_IEEE1609dot2_hours = -1; /* Uint16 */ -static int hf_IEEE1609dot2_sixtyHours = -1; /* Uint16 */ -static int hf_IEEE1609dot2_years = -1; /* Uint16 */ -static int hf_IEEE1609dot2_circularRegion = -1; /* CircularRegion */ -static int hf_IEEE1609dot2_rectangularRegion = -1; /* SequenceOfRectangularRegion */ -static int hf_IEEE1609dot2_polygonalRegion = -1; /* PolygonalRegion */ -static int hf_IEEE1609dot2_identifiedRegion = -1; /* SequenceOfIdentifiedRegion */ -static int hf_IEEE1609dot2_center = -1; /* TwoDLocation */ -static int hf_IEEE1609dot2_radius = -1; /* Uint16 */ -static int hf_IEEE1609dot2_northWest = -1; /* TwoDLocation */ -static int hf_IEEE1609dot2_southEast = -1; /* TwoDLocation */ -static int hf_IEEE1609dot2_SequenceOfRectangularRegion_item = -1; /* RectangularRegion */ -static int hf_IEEE1609dot2_PolygonalRegion_item = -1; /* TwoDLocation */ -static int hf_IEEE1609dot2_latitude = -1; /* Latitude */ -static int hf_IEEE1609dot2_longitude = -1; /* Longitude */ -static int hf_IEEE1609dot2_countryOnly = -1; /* CountryOnly */ -static int hf_IEEE1609dot2_countryAndRegions = -1; /* CountryAndRegions */ -static int hf_IEEE1609dot2_countryAndSubregions = -1; /* CountryAndSubregions */ -static int hf_IEEE1609dot2_SequenceOfIdentifiedRegion_item = -1; /* IdentifiedRegion */ -static int hf_IEEE1609dot2_regions = -1; /* SequenceOfUint8 */ -static int hf_IEEE1609dot2_country = -1; /* CountryOnly */ -static int hf_IEEE1609dot2_regionAndSubregions = -1; /* SequenceOfRegionAndSubregions */ -static int hf_IEEE1609dot2_region = -1; /* Uint8 */ -static int hf_IEEE1609dot2_subregions = -1; /* SequenceOfUint16 */ -static int hf_IEEE1609dot2_SequenceOfRegionAndSubregions_item = -1; /* RegionAndSubregions */ -static int hf_IEEE1609dot2_elevation = -1; /* Elevation */ -static int hf_IEEE1609dot2_ecdsaNistP256Signature = -1; /* EcdsaP256Signature */ -static int hf_IEEE1609dot2_ecdsaBrainpoolP256r1Signature = -1; /* EcdsaP256Signature */ -static int hf_IEEE1609dot2_r = -1; /* EccP256CurvePoint */ -static int hf_IEEE1609dot2_s = -1; /* OCTET_STRING_SIZE_32 */ -static int hf_IEEE1609dot2_x_only = -1; /* OCTET_STRING_SIZE_32 */ -static int hf_IEEE1609dot2_fill = -1; /* NULL */ -static int hf_IEEE1609dot2_compressed_y_0 = -1; /* OCTET_STRING_SIZE_32 */ -static int hf_IEEE1609dot2_compressed_y_1 = -1; /* OCTET_STRING_SIZE_32 */ -static int hf_IEEE1609dot2_uncompressed = -1; /* T_uncompressed */ -static int hf_IEEE1609dot2_x = -1; /* OCTET_STRING_SIZE_32 */ -static int hf_IEEE1609dot2_y = -1; /* OCTET_STRING_SIZE_32 */ -static int hf_IEEE1609dot2_v = -1; /* EccP256CurvePoint */ -static int hf_IEEE1609dot2_c = -1; /* OCTET_STRING_SIZE_16 */ -static int hf_IEEE1609dot2_t = -1; /* OCTET_STRING_SIZE_16 */ -static int hf_IEEE1609dot2_public = -1; /* PublicEncryptionKey */ -static int hf_IEEE1609dot2_symmetric = -1; /* SymmetricEncryptionKey */ -static int hf_IEEE1609dot2_supportedSymmAlg = -1; /* SymmAlgorithm */ -static int hf_IEEE1609dot2_publicKey = -1; /* BasePublicEncryptionKey */ -static int hf_IEEE1609dot2_eciesNistP256 = -1; /* EccP256CurvePoint */ -static int hf_IEEE1609dot2_eciesBrainpoolP256r1 = -1; /* EccP256CurvePoint */ -static int hf_IEEE1609dot2_ecdsaNistP256 = -1; /* EccP256CurvePoint */ -static int hf_IEEE1609dot2_ecdsaBrainpoolP256r1 = -1; /* EccP256CurvePoint */ -static int hf_IEEE1609dot2_aes128Ccm = -1; /* OCTET_STRING_SIZE_16 */ -static int hf_IEEE1609dot2_psid = -1; /* Psid */ -static int hf_IEEE1609dot2_ssp = -1; /* ServiceSpecificPermissions */ -static int hf_IEEE1609dot2_SequenceOfPsidSsp_item = -1; /* PsidSsp */ -static int hf_IEEE1609dot2_SequenceOfPsid_item = -1; /* Psid */ -static int hf_IEEE1609dot2_opaque = -1; /* OCTET_STRING_SIZE_0_MAX */ -static int hf_IEEE1609dot2_sspRange = -1; /* SspRange */ -static int hf_IEEE1609dot2_SequenceOfPsidSspRange_item = -1; /* PsidSspRange */ -static int hf_IEEE1609dot2_opaque_01 = -1; /* SequenceOfOctetString */ -static int hf_IEEE1609dot2_all = -1; /* NULL */ -static int hf_IEEE1609dot2_SequenceOfOctetString_item = -1; /* OCTET_STRING_SIZE_0_MAX */ -static int hf_IEEE1609dot2_jValue = -1; /* OCTET_STRING_SIZE_4 */ -static int hf_IEEE1609dot2_value = -1; /* OCTET_STRING_SIZE_9 */ -static int hf_IEEE1609dot2_data = -1; /* Ieee1609Dot2Data */ -static int hf_IEEE1609dot2_extDataHash = -1; /* HashedData */ -static int hf_IEEE1609dot2_protocolVersion = -1; /* Uint8 */ -static int hf_IEEE1609dot2_content = -1; /* Ieee1609Dot2Content */ -static int hf_IEEE1609dot2_unsecuredData = -1; /* Opaque */ -static int hf_IEEE1609dot2_signedData = -1; /* SignedData */ -static int hf_IEEE1609dot2_encryptedData = -1; /* EncryptedData */ -static int hf_IEEE1609dot2_signedCertificateRequest = -1; /* Opaque */ -static int hf_IEEE1609dot2_hashId = -1; /* HashAlgorithm */ -static int hf_IEEE1609dot2_tbsData = -1; /* ToBeSignedData */ -static int hf_IEEE1609dot2_signer = -1; /* SignerIdentifier */ -static int hf_IEEE1609dot2_signature = -1; /* Signature */ -static int hf_IEEE1609dot2_digest = -1; /* HashedId8 */ -static int hf_IEEE1609dot2_certificate = -1; /* SequenceOfCertificate */ -static int hf_IEEE1609dot2_self = -1; /* NULL */ -static int hf_IEEE1609dot2_payload = -1; /* SignedDataPayload */ -static int hf_IEEE1609dot2_headerInfo = -1; /* HeaderInfo */ -static int hf_IEEE1609dot2_sha256HashedData = -1; /* OCTET_STRING_SIZE_32 */ -static int hf_IEEE1609dot2_generationTime = -1; /* Time64 */ -static int hf_IEEE1609dot2_expiryTime = -1; /* Time64 */ -static int hf_IEEE1609dot2_generationLocation = -1; /* ThreeDLocation */ -static int hf_IEEE1609dot2_p2pcdLearningRequest = -1; /* HashedId3 */ -static int hf_IEEE1609dot2_missingCrlIdentifier = -1; /* MissingCrlIdentifier */ -static int hf_IEEE1609dot2_encryptionKey = -1; /* EncryptionKey */ -static int hf_IEEE1609dot2_cracaId = -1; /* HashedId3 */ -static int hf_IEEE1609dot2_crlSeries = -1; /* CrlSeries */ -static int hf_IEEE1609dot2_recipients = -1; /* SequenceOfRecipientInfo */ -static int hf_IEEE1609dot2_ciphertext = -1; /* SymmetricCiphertext */ -static int hf_IEEE1609dot2_pskRecipInfo = -1; /* PreSharedKeyRecipientInfo */ -static int hf_IEEE1609dot2_symmRecipInfo = -1; /* SymmRecipientInfo */ -static int hf_IEEE1609dot2_certRecipInfo = -1; /* PKRecipientInfo */ -static int hf_IEEE1609dot2_signedDataRecipInfo = -1; /* PKRecipientInfo */ -static int hf_IEEE1609dot2_rekRecipInfo = -1; /* PKRecipientInfo */ -static int hf_IEEE1609dot2_SequenceOfRecipientInfo_item = -1; /* RecipientInfo */ -static int hf_IEEE1609dot2_recipientId = -1; /* HashedId8 */ -static int hf_IEEE1609dot2_encKey = -1; /* SymmetricCiphertext */ -static int hf_IEEE1609dot2_encKey_01 = -1; /* EncryptedDataEncryptionKey */ -static int hf_IEEE1609dot2_eciesNistP256_01 = -1; /* EciesP256EncryptedKey */ -static int hf_IEEE1609dot2_eciesBrainpoolP256r1_01 = -1; /* EciesP256EncryptedKey */ -static int hf_IEEE1609dot2_aes128ccm = -1; /* AesCcmCiphertext */ -static int hf_IEEE1609dot2_nonce = -1; /* OCTET_STRING_SIZE_12 */ -static int hf_IEEE1609dot2_ccmCiphertext = -1; /* Opaque */ -static int hf_IEEE1609dot2_SequenceOfCertificate_item = -1; /* Certificate */ -static int hf_IEEE1609dot2_version = -1; /* Uint8 */ -static int hf_IEEE1609dot2_type = -1; /* CertificateType */ -static int hf_IEEE1609dot2_issuer = -1; /* IssuerIdentifier */ -static int hf_IEEE1609dot2_toBeSigned = -1; /* ToBeSignedCertificate */ -static int hf_IEEE1609dot2_sha256AndDigest = -1; /* HashedId8 */ -static int hf_IEEE1609dot2_self_01 = -1; /* HashAlgorithm */ -static int hf_IEEE1609dot2_id = -1; /* CertificateId */ -static int hf_IEEE1609dot2_validityPeriod = -1; /* ValidityPeriod */ -static int hf_IEEE1609dot2_region_01 = -1; /* GeographicRegion */ -static int hf_IEEE1609dot2_assuranceLevel = -1; /* SubjectAssurance */ -static int hf_IEEE1609dot2_appPermissions = -1; /* SequenceOfPsidSsp */ -static int hf_IEEE1609dot2_certIssuePermissions = -1; /* SequenceOfPsidGroupPermissions */ -static int hf_IEEE1609dot2_certRequestPermissions = -1; /* SequenceOfPsidGroupPermissions */ -static int hf_IEEE1609dot2_canRequestRollover = -1; /* NULL */ -static int hf_IEEE1609dot2_encryptionKey_01 = -1; /* PublicEncryptionKey */ -static int hf_IEEE1609dot2_verifyKeyIndicator = -1; /* VerificationKeyIndicator */ -static int hf_IEEE1609dot2_linkageData = -1; /* LinkageData */ -static int hf_IEEE1609dot2_name = -1; /* Hostname */ -static int hf_IEEE1609dot2_binaryId = -1; /* OCTET_STRING_SIZE_1_64 */ -static int hf_IEEE1609dot2_none = -1; /* NULL */ -static int hf_IEEE1609dot2_iCert = -1; /* IValue */ -static int hf_IEEE1609dot2_linkage_value = -1; /* LinkageValue */ -static int hf_IEEE1609dot2_group_linkage_value = -1; /* GroupLinkageValue */ -static int hf_IEEE1609dot2_appPermissions_01 = -1; /* SubjectPermissions */ -static int hf_IEEE1609dot2_minChainDepth = -1; /* INTEGER */ -static int hf_IEEE1609dot2_chainDepthRange = -1; /* INTEGER */ -static int hf_IEEE1609dot2_eeType = -1; /* EndEntityType */ -static int hf_IEEE1609dot2_SequenceOfPsidGroupPermissions_item = -1; /* PsidGroupPermissions */ -static int hf_IEEE1609dot2_explicit = -1; /* SequenceOfPsidSspRange */ -static int hf_IEEE1609dot2_verificationKey = -1; /* PublicVerificationKey */ -static int hf_IEEE1609dot2_reconstructionValue = -1; /* EccP256CurvePoint */ +int proto_ieee1609dot2 = -1; + +/*--- Included file: packet-ieee1609dot2-hf.c ---*/ +#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-hf.c" +static int hf_ieee1609dot2_Ieee1609Dot2Data_PDU = -1; /* Ieee1609Dot2Data */ +static int hf_ieee1609dot2_SequenceOfUint8_item = -1; /* Uint8 */ +static int hf_ieee1609dot2_SequenceOfUint16_item = -1; /* Uint16 */ +static int hf_ieee1609dot2_start = -1; /* Time32 */ +static int hf_ieee1609dot2_duration = -1; /* Duration */ +static int hf_ieee1609dot2_microseconds = -1; /* Uint16 */ +static int hf_ieee1609dot2_milliseconds = -1; /* Uint16 */ +static int hf_ieee1609dot2_seconds = -1; /* Uint16 */ +static int hf_ieee1609dot2_minutes = -1; /* Uint16 */ +static int hf_ieee1609dot2_hours = -1; /* Uint16 */ +static int hf_ieee1609dot2_sixtyHours = -1; /* Uint16 */ +static int hf_ieee1609dot2_years = -1; /* Uint16 */ +static int hf_ieee1609dot2_circularRegion = -1; /* CircularRegion */ +static int hf_ieee1609dot2_rectangularRegion = -1; /* SequenceOfRectangularRegion */ +static int hf_ieee1609dot2_polygonalRegion = -1; /* PolygonalRegion */ +static int hf_ieee1609dot2_identifiedRegion = -1; /* SequenceOfIdentifiedRegion */ +static int hf_ieee1609dot2_center = -1; /* TwoDLocation */ +static int hf_ieee1609dot2_radius = -1; /* Uint16 */ +static int hf_ieee1609dot2_northWest = -1; /* TwoDLocation */ +static int hf_ieee1609dot2_southEast = -1; /* TwoDLocation */ +static int hf_ieee1609dot2_SequenceOfRectangularRegion_item = -1; /* RectangularRegion */ +static int hf_ieee1609dot2_PolygonalRegion_item = -1; /* TwoDLocation */ +static int hf_ieee1609dot2_latitude = -1; /* Latitude */ +static int hf_ieee1609dot2_longitude = -1; /* Longitude */ +static int hf_ieee1609dot2_countryOnly = -1; /* CountryOnly */ +static int hf_ieee1609dot2_countryAndRegions = -1; /* CountryAndRegions */ +static int hf_ieee1609dot2_countryAndSubregions = -1; /* CountryAndSubregions */ +static int hf_ieee1609dot2_SequenceOfIdentifiedRegion_item = -1; /* IdentifiedRegion */ +static int hf_ieee1609dot2_regions = -1; /* SequenceOfUint8 */ +static int hf_ieee1609dot2_country = -1; /* CountryOnly */ +static int hf_ieee1609dot2_regionAndSubregions = -1; /* SequenceOfRegionAndSubregions */ +static int hf_ieee1609dot2_region = -1; /* Uint8 */ +static int hf_ieee1609dot2_subregions = -1; /* SequenceOfUint16 */ +static int hf_ieee1609dot2_SequenceOfRegionAndSubregions_item = -1; /* RegionAndSubregions */ +static int hf_ieee1609dot2_elevation = -1; /* Elevation */ +static int hf_ieee1609dot2_ecdsaNistP256Signature = -1; /* EcdsaP256Signature */ +static int hf_ieee1609dot2_ecdsaBrainpoolP256r1Signature = -1; /* EcdsaP256Signature */ +static int hf_ieee1609dot2_r = -1; /* EccP256CurvePoint */ +static int hf_ieee1609dot2_s = -1; /* OCTET_STRING_SIZE_32 */ +static int hf_ieee1609dot2_x_only = -1; /* OCTET_STRING_SIZE_32 */ +static int hf_ieee1609dot2_fill = -1; /* NULL */ +static int hf_ieee1609dot2_compressed_y_0 = -1; /* OCTET_STRING_SIZE_32 */ +static int hf_ieee1609dot2_compressed_y_1 = -1; /* OCTET_STRING_SIZE_32 */ +static int hf_ieee1609dot2_uncompressed = -1; /* T_uncompressed */ +static int hf_ieee1609dot2_x = -1; /* OCTET_STRING_SIZE_32 */ +static int hf_ieee1609dot2_y = -1; /* OCTET_STRING_SIZE_32 */ +static int hf_ieee1609dot2_v = -1; /* EccP256CurvePoint */ +static int hf_ieee1609dot2_c = -1; /* OCTET_STRING_SIZE_16 */ +static int hf_ieee1609dot2_t = -1; /* OCTET_STRING_SIZE_16 */ +static int hf_ieee1609dot2_public = -1; /* PublicEncryptionKey */ +static int hf_ieee1609dot2_symmetric = -1; /* SymmetricEncryptionKey */ +static int hf_ieee1609dot2_supportedSymmAlg = -1; /* SymmAlgorithm */ +static int hf_ieee1609dot2_publicKey = -1; /* BasePublicEncryptionKey */ +static int hf_ieee1609dot2_eciesNistP256 = -1; /* EccP256CurvePoint */ +static int hf_ieee1609dot2_eciesBrainpoolP256r1 = -1; /* EccP256CurvePoint */ +static int hf_ieee1609dot2_ecdsaNistP256 = -1; /* EccP256CurvePoint */ +static int hf_ieee1609dot2_ecdsaBrainpoolP256r1 = -1; /* EccP256CurvePoint */ +static int hf_ieee1609dot2_aes128Ccm = -1; /* OCTET_STRING_SIZE_16 */ +static int hf_ieee1609dot2_psid = -1; /* Psid */ +static int hf_ieee1609dot2_ssp = -1; /* ServiceSpecificPermissions */ +static int hf_ieee1609dot2_SequenceOfPsidSsp_item = -1; /* PsidSsp */ +static int hf_ieee1609dot2_opaque = -1; /* OCTET_STRING_SIZE_0_MAX */ +static int hf_ieee1609dot2_sspRange = -1; /* SspRange */ +static int hf_ieee1609dot2_SequenceOfPsidSspRange_item = -1; /* PsidSspRange */ +static int hf_ieee1609dot2_opaque_01 = -1; /* SequenceOfOctetString */ +static int hf_ieee1609dot2_all = -1; /* NULL */ +static int hf_ieee1609dot2_SequenceOfOctetString_item = -1; /* OCTET_STRING_SIZE_0_MAX */ +static int hf_ieee1609dot2_jValue = -1; /* OCTET_STRING_SIZE_4 */ +static int hf_ieee1609dot2_value = -1; /* OCTET_STRING_SIZE_9 */ +static int hf_ieee1609dot2_data = -1; /* Ieee1609Dot2Data */ +static int hf_ieee1609dot2_extDataHash = -1; /* HashedData */ +static int hf_ieee1609dot2_protocolVersion = -1; /* Uint8 */ +static int hf_ieee1609dot2_content = -1; /* Ieee1609Dot2Content */ +static int hf_ieee1609dot2_unsecuredData = -1; /* Opaque */ +static int hf_ieee1609dot2_signedData = -1; /* SignedData */ +static int hf_ieee1609dot2_encryptedData = -1; /* EncryptedData */ +static int hf_ieee1609dot2_signedCertificateRequest = -1; /* Opaque */ +static int hf_ieee1609dot2_hashId = -1; /* HashAlgorithm */ +static int hf_ieee1609dot2_tbsData = -1; /* ToBeSignedData */ +static int hf_ieee1609dot2_signer = -1; /* SignerIdentifier */ +static int hf_ieee1609dot2_signature = -1; /* Signature */ +static int hf_ieee1609dot2_digest = -1; /* HashedId8 */ +static int hf_ieee1609dot2_certificate = -1; /* SequenceOfCertificate */ +static int hf_ieee1609dot2_self = -1; /* NULL */ +static int hf_ieee1609dot2_payload = -1; /* SignedDataPayload */ +static int hf_ieee1609dot2_headerInfo = -1; /* HeaderInfo */ +static int hf_ieee1609dot2_sha256HashedData = -1; /* OCTET_STRING_SIZE_32 */ +static int hf_ieee1609dot2_generationTime = -1; /* Time64 */ +static int hf_ieee1609dot2_expiryTime = -1; /* Time64 */ +static int hf_ieee1609dot2_generationLocation = -1; /* ThreeDLocation */ +static int hf_ieee1609dot2_p2pcdLearningRequest = -1; /* HashedId3 */ +static int hf_ieee1609dot2_missingCrlIdentifier = -1; /* MissingCrlIdentifier */ +static int hf_ieee1609dot2_encryptionKey = -1; /* EncryptionKey */ +static int hf_ieee1609dot2_cracaId = -1; /* HashedId3 */ +static int hf_ieee1609dot2_crlSeries = -1; /* CrlSeries */ +static int hf_ieee1609dot2_recipients = -1; /* SequenceOfRecipientInfo */ +static int hf_ieee1609dot2_ciphertext = -1; /* SymmetricCiphertext */ +static int hf_ieee1609dot2_pskRecipInfo = -1; /* PreSharedKeyRecipientInfo */ +static int hf_ieee1609dot2_symmRecipInfo = -1; /* SymmRecipientInfo */ +static int hf_ieee1609dot2_certRecipInfo = -1; /* PKRecipientInfo */ +static int hf_ieee1609dot2_signedDataRecipInfo = -1; /* PKRecipientInfo */ +static int hf_ieee1609dot2_rekRecipInfo = -1; /* PKRecipientInfo */ +static int hf_ieee1609dot2_SequenceOfRecipientInfo_item = -1; /* RecipientInfo */ +static int hf_ieee1609dot2_recipientId = -1; /* HashedId8 */ +static int hf_ieee1609dot2_encKey = -1; /* SymmetricCiphertext */ +static int hf_ieee1609dot2_encKey_01 = -1; /* EncryptedDataEncryptionKey */ +static int hf_ieee1609dot2_eciesNistP256_01 = -1; /* EciesP256EncryptedKey */ +static int hf_ieee1609dot2_eciesBrainpoolP256r1_01 = -1; /* EciesP256EncryptedKey */ +static int hf_ieee1609dot2_aes128ccm = -1; /* AesCcmCiphertext */ +static int hf_ieee1609dot2_nonce = -1; /* OCTET_STRING_SIZE_12 */ +static int hf_ieee1609dot2_ccmCiphertext = -1; /* Opaque */ +static int hf_ieee1609dot2_SequenceOfCertificate_item = -1; /* Certificate */ +static int hf_ieee1609dot2_version = -1; /* Uint8 */ +static int hf_ieee1609dot2_type = -1; /* CertificateType */ +static int hf_ieee1609dot2_issuer = -1; /* IssuerIdentifier */ +static int hf_ieee1609dot2_toBeSigned = -1; /* ToBeSignedCertificate */ +static int hf_ieee1609dot2_sha256AndDigest = -1; /* HashedId8 */ +static int hf_ieee1609dot2_self_01 = -1; /* HashAlgorithm */ +static int hf_ieee1609dot2_id = -1; /* CertificateId */ +static int hf_ieee1609dot2_validityPeriod = -1; /* ValidityPeriod */ +static int hf_ieee1609dot2_region_01 = -1; /* GeographicRegion */ +static int hf_ieee1609dot2_assuranceLevel = -1; /* SubjectAssurance */ +static int hf_ieee1609dot2_appPermissions = -1; /* SequenceOfPsidSsp */ +static int hf_ieee1609dot2_certIssuePermissions = -1; /* SequenceOfPsidGroupPermissions */ +static int hf_ieee1609dot2_certRequestPermissions = -1; /* SequenceOfPsidGroupPermissions */ +static int hf_ieee1609dot2_canRequestRollover = -1; /* NULL */ +static int hf_ieee1609dot2_encryptionKey_01 = -1; /* PublicEncryptionKey */ +static int hf_ieee1609dot2_verifyKeyIndicator = -1; /* VerificationKeyIndicator */ +static int hf_ieee1609dot2_linkageData = -1; /* LinkageData */ +static int hf_ieee1609dot2_name = -1; /* Hostname */ +static int hf_ieee1609dot2_binaryId = -1; /* OCTET_STRING_SIZE_1_64 */ +static int hf_ieee1609dot2_none = -1; /* NULL */ +static int hf_ieee1609dot2_iCert = -1; /* IValue */ +static int hf_ieee1609dot2_linkage_value = -1; /* LinkageValue */ +static int hf_ieee1609dot2_group_linkage_value = -1; /* GroupLinkageValue */ +static int hf_ieee1609dot2_appPermissions_01 = -1; /* SubjectPermissions */ +static int hf_ieee1609dot2_minChainDepth = -1; /* INTEGER */ +static int hf_ieee1609dot2_chainDepthRange = -1; /* INTEGER */ +static int hf_ieee1609dot2_eeType = -1; /* EndEntityType */ +static int hf_ieee1609dot2_SequenceOfPsidGroupPermissions_item = -1; /* PsidGroupPermissions */ +static int hf_ieee1609dot2_explicit = -1; /* SequenceOfPsidSspRange */ +static int hf_ieee1609dot2_verificationKey = -1; /* PublicVerificationKey */ +static int hf_ieee1609dot2_reconstructionValue = -1; /* EccP256CurvePoint */ /* named bits */ -//static int hf_IEEE1609dot2_EndEntityType_app = -1; -//static int hf_IEEE1609dot2_EndEntityType_enrol = -1; +static int hf_ieee1609dot2_EndEntityType_app = -1; +static int hf_ieee1609dot2_EndEntityType_enrol = -1; -/*--- End of included file: packet-IEEE1609dot2-hf.c ---*/ -#line 31 "./asn1/ieee1609dot2/packet-IEEE1609dot2-template.c" +/*--- End of included file: packet-ieee1609dot2-hf.c ---*/ +#line 31 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" /* Initialize the subtree pointers */ -/*--- Included file: packet-IEEE1609dot2-ett.c ---*/ -#line 1 "./asn1/ieee1609dot2/packet-IEEE1609dot2-ett.c" -static gint ett_IEEE1609dot2_SequenceOfUint3 = -1; -static gint ett_IEEE1609dot2_SequenceOfUint8 = -1; -static gint ett_IEEE1609dot2_SequenceOfUint16 = -1; -static gint ett_IEEE1609dot2_ValidityPeriod = -1; -static gint ett_IEEE1609dot2_Duration = -1; -static gint ett_IEEE1609dot2_GeographicRegion = -1; -static gint ett_IEEE1609dot2_CircularRegion = -1; -static gint ett_IEEE1609dot2_RectangularRegion = -1; -static gint ett_IEEE1609dot2_SequenceOfRectangularRegion = -1; -static gint ett_IEEE1609dot2_PolygonalRegion = -1; -static gint ett_IEEE1609dot2_TwoDLocation = -1; -static gint ett_IEEE1609dot2_IdentifiedRegion = -1; -static gint ett_IEEE1609dot2_SequenceOfIdentifiedRegion = -1; -static gint ett_IEEE1609dot2_CountryAndRegions = -1; -static gint ett_IEEE1609dot2_CountryAndSubregions = -1; -static gint ett_IEEE1609dot2_RegionAndSubregions = -1; -static gint ett_IEEE1609dot2_SequenceOfRegionAndSubregions = -1; -static gint ett_IEEE1609dot2_ThreeDLocation = -1; -static gint ett_IEEE1609dot2_Signature = -1; -static gint ett_IEEE1609dot2_EcdsaP256Signature = -1; -static gint ett_IEEE1609dot2_EccP256CurvePoint = -1; -static gint ett_IEEE1609dot2_T_uncompressed = -1; -static gint ett_IEEE1609dot2_EciesP256EncryptedKey = -1; -static gint ett_IEEE1609dot2_EncryptionKey = -1; -static gint ett_IEEE1609dot2_PublicEncryptionKey = -1; -static gint ett_IEEE1609dot2_BasePublicEncryptionKey = -1; -static gint ett_IEEE1609dot2_PublicVerificationKey = -1; -static gint ett_IEEE1609dot2_SymmetricEncryptionKey = -1; -static gint ett_IEEE1609dot2_PsidSsp = -1; -static gint ett_IEEE1609dot2_SequenceOfPsidSsp = -1; -static gint ett_IEEE1609dot2_SequenceOfPsid = -1; -static gint ett_IEEE1609dot2_ServiceSpecificPermissions = -1; -static gint ett_IEEE1609dot2_PsidSspRange = -1; -static gint ett_IEEE1609dot2_SequenceOfPsidSspRange = -1; -static gint ett_IEEE1609dot2_SspRange = -1; -static gint ett_IEEE1609dot2_SequenceOfOctetString = -1; -static gint ett_IEEE1609dot2_GroupLinkageValue = -1; -static gint ett_IEEE1609dot2_SignedDataPayload = -1; -static gint ett_IEEE1609dot2_Ieee1609Dot2Data = -1; -static gint ett_IEEE1609dot2_Ieee1609Dot2Content = -1; -static gint ett_IEEE1609dot2_SignedData = -1; -static gint ett_IEEE1609dot2_SignerIdentifier = -1; -static gint ett_IEEE1609dot2_ToBeSignedData = -1; -static gint ett_IEEE1609dot2_HashedData = -1; -static gint ett_IEEE1609dot2_HeaderInfo = -1; -static gint ett_IEEE1609dot2_MissingCrlIdentifier = -1; -static gint ett_IEEE1609dot2_EncryptedData = -1; -static gint ett_IEEE1609dot2_RecipientInfo = -1; -static gint ett_IEEE1609dot2_SequenceOfRecipientInfo = -1; -static gint ett_IEEE1609dot2_SymmRecipientInfo = -1; -static gint ett_IEEE1609dot2_PKRecipientInfo = -1; -static gint ett_IEEE1609dot2_EncryptedDataEncryptionKey = -1; -static gint ett_IEEE1609dot2_SymmetricCiphertext = -1; -static gint ett_IEEE1609dot2_AesCcmCiphertext = -1; -static gint ett_IEEE1609dot2_SequenceOfCertificate = -1; -static gint ett_IEEE1609dot2_CertificateBase = -1; -static gint ett_IEEE1609dot2_IssuerIdentifier = -1; -static gint ett_IEEE1609dot2_ToBeSignedCertificate = -1; -static gint ett_IEEE1609dot2_CertificateId = -1; -static gint ett_IEEE1609dot2_LinkageData = -1; -static gint ett_IEEE1609dot2_EndEntityType = -1; -static gint ett_IEEE1609dot2_PsidGroupPermissions = -1; -static gint ett_IEEE1609dot2_SequenceOfPsidGroupPermissions = -1; -static gint ett_IEEE1609dot2_SubjectPermissions = -1; -static gint ett_IEEE1609dot2_VerificationKeyIndicator = -1; - -/*--- End of included file: packet-IEEE1609dot2-ett.c ---*/ -#line 34 "./asn1/ieee1609dot2/packet-IEEE1609dot2-template.c" - - -/*--- Included file: packet-IEEE1609dot2-fn.c ---*/ -#line 1 "./asn1/ieee1609dot2/packet-IEEE1609dot2-fn.c" +/*--- Included file: packet-ieee1609dot2-ett.c ---*/ +#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-ett.c" +static gint ett_ieee1609dot2_SequenceOfUint8 = -1; +static gint ett_ieee1609dot2_SequenceOfUint16 = -1; +static gint ett_ieee1609dot2_ValidityPeriod = -1; +static gint ett_ieee1609dot2_Duration = -1; +static gint ett_ieee1609dot2_GeographicRegion = -1; +static gint ett_ieee1609dot2_CircularRegion = -1; +static gint ett_ieee1609dot2_RectangularRegion = -1; +static gint ett_ieee1609dot2_SequenceOfRectangularRegion = -1; +static gint ett_ieee1609dot2_PolygonalRegion = -1; +static gint ett_ieee1609dot2_TwoDLocation = -1; +static gint ett_ieee1609dot2_IdentifiedRegion = -1; +static gint ett_ieee1609dot2_SequenceOfIdentifiedRegion = -1; +static gint ett_ieee1609dot2_CountryAndRegions = -1; +static gint ett_ieee1609dot2_CountryAndSubregions = -1; +static gint ett_ieee1609dot2_RegionAndSubregions = -1; +static gint ett_ieee1609dot2_SequenceOfRegionAndSubregions = -1; +static gint ett_ieee1609dot2_ThreeDLocation = -1; +static gint ett_ieee1609dot2_Signature = -1; +static gint ett_ieee1609dot2_EcdsaP256Signature = -1; +static gint ett_ieee1609dot2_EccP256CurvePoint = -1; +static gint ett_ieee1609dot2_T_uncompressed = -1; +static gint ett_ieee1609dot2_EciesP256EncryptedKey = -1; +static gint ett_ieee1609dot2_EncryptionKey = -1; +static gint ett_ieee1609dot2_PublicEncryptionKey = -1; +static gint ett_ieee1609dot2_BasePublicEncryptionKey = -1; +static gint ett_ieee1609dot2_PublicVerificationKey = -1; +static gint ett_ieee1609dot2_SymmetricEncryptionKey = -1; +static gint ett_ieee1609dot2_PsidSsp = -1; +static gint ett_ieee1609dot2_SequenceOfPsidSsp = -1; +static gint ett_ieee1609dot2_ServiceSpecificPermissions = -1; +static gint ett_ieee1609dot2_PsidSspRange = -1; +static gint ett_ieee1609dot2_SequenceOfPsidSspRange = -1; +static gint ett_ieee1609dot2_SspRange = -1; +static gint ett_ieee1609dot2_SequenceOfOctetString = -1; +static gint ett_ieee1609dot2_GroupLinkageValue = -1; +static gint ett_ieee1609dot2_SignedDataPayload = -1; +static gint ett_ieee1609dot2_Ieee1609Dot2Data = -1; +static gint ett_ieee1609dot2_Ieee1609Dot2Content = -1; +static gint ett_ieee1609dot2_SignedData = -1; +static gint ett_ieee1609dot2_SignerIdentifier = -1; +static gint ett_ieee1609dot2_ToBeSignedData = -1; +static gint ett_ieee1609dot2_HashedData = -1; +static gint ett_ieee1609dot2_HeaderInfo = -1; +static gint ett_ieee1609dot2_MissingCrlIdentifier = -1; +static gint ett_ieee1609dot2_EncryptedData = -1; +static gint ett_ieee1609dot2_RecipientInfo = -1; +static gint ett_ieee1609dot2_SequenceOfRecipientInfo = -1; +static gint ett_ieee1609dot2_SymmRecipientInfo = -1; +static gint ett_ieee1609dot2_PKRecipientInfo = -1; +static gint ett_ieee1609dot2_EncryptedDataEncryptionKey = -1; +static gint ett_ieee1609dot2_SymmetricCiphertext = -1; +static gint ett_ieee1609dot2_AesCcmCiphertext = -1; +static gint ett_ieee1609dot2_SequenceOfCertificate = -1; +static gint ett_ieee1609dot2_CertificateBase = -1; +static gint ett_ieee1609dot2_IssuerIdentifier = -1; +static gint ett_ieee1609dot2_ToBeSignedCertificate = -1; +static gint ett_ieee1609dot2_CertificateId = -1; +static gint ett_ieee1609dot2_LinkageData = -1; +static gint ett_ieee1609dot2_EndEntityType = -1; +static gint ett_ieee1609dot2_PsidGroupPermissions = -1; +static gint ett_ieee1609dot2_SequenceOfPsidGroupPermissions = -1; +static gint ett_ieee1609dot2_SubjectPermissions = -1; +static gint ett_ieee1609dot2_VerificationKeyIndicator = -1; + +/*--- End of included file: packet-ieee1609dot2-ett.c ---*/ +#line 34 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" + + +/*--- Included file: packet-ieee1609dot2-fn.c ---*/ +#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-fn.c" /*--- Cyclic dependencies ---*/ /* SignedDataPayload -> Ieee1609Dot2Data -> Ieee1609Dot2Content -> SignedData -> ToBeSignedData -> SignedDataPayload */ -static int dissect_IEEE1609dot2_SignedDataPayload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +static int dissect_ieee1609dot2_SignedDataPayload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); static int -dissect_IEEE1609dot2_Uint3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_oer_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 7U, NULL, FALSE); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_Uint8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Uint8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, NULL, FALSE); @@ -305,7 +281,7 @@ dissect_IEEE1609dot2_Uint8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int -dissect_IEEE1609dot2_Uint16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Uint16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 65535U, NULL, FALSE); @@ -315,7 +291,7 @@ dissect_IEEE1609dot2_Uint16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int -dissect_IEEE1609dot2_Uint32(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Uint32(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 4294967295U, NULL, FALSE); @@ -325,7 +301,7 @@ dissect_IEEE1609dot2_Uint32(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int -dissect_IEEE1609dot2_Uint64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Uint64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_constrained_integer_64b(tvb, offset, actx, tree, hf_index, 0U, G_GUINT64_CONSTANT(18446744073709551615), NULL, FALSE); @@ -333,40 +309,27 @@ dissect_IEEE1609dot2_Uint64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const oer_sequence_t SequenceOfUint3_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfUint3_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Uint3 }, -}; - -static int -dissect_IEEE1609dot2_SequenceOfUint3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfUint3, SequenceOfUint3_sequence_of); - - return offset; -} - - static const oer_sequence_t SequenceOfUint8_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfUint8_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Uint8 }, + { &hf_ieee1609dot2_SequenceOfUint8_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Uint8 }, }; static int -dissect_IEEE1609dot2_SequenceOfUint8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfUint8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfUint8, SequenceOfUint8_sequence_of); + ett_ieee1609dot2_SequenceOfUint8, SequenceOfUint8_sequence_of); return offset; } static const oer_sequence_t SequenceOfUint16_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfUint16_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Uint16 }, + { &hf_ieee1609dot2_SequenceOfUint16_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Uint16 }, }; static int -dissect_IEEE1609dot2_SequenceOfUint16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfUint16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfUint16, SequenceOfUint16_sequence_of); + ett_ieee1609dot2_SequenceOfUint16, SequenceOfUint16_sequence_of); return offset; } @@ -374,7 +337,7 @@ dissect_IEEE1609dot2_SequenceOfUint16(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static int -dissect_IEEE1609dot2_Opaque(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Opaque(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, NULL); @@ -384,27 +347,7 @@ dissect_IEEE1609dot2_Opaque(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int -dissect_IEEE1609dot2_HashedId32(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, - 32, 32, FALSE, NULL); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_HashedId10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, - 10, 10, FALSE, NULL); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_HashedId8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_HashedId8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 8, 8, FALSE, NULL); @@ -414,17 +357,7 @@ dissect_IEEE1609dot2_HashedId8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int -dissect_IEEE1609dot2_HashedId4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, - 4, 4, FALSE, NULL); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_HashedId3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_HashedId3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 3, 3, FALSE, NULL); @@ -434,8 +367,8 @@ dissect_IEEE1609dot2_HashedId3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int -dissect_IEEE1609dot2_Time32(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_Uint32(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_Time32(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_Uint32(tvb, offset, actx, tree, hf_index); return offset; } @@ -443,14 +376,14 @@ dissect_IEEE1609dot2_Time32(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int -dissect_IEEE1609dot2_Time64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_Uint64(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_Time64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_Uint64(tvb, offset, actx, tree, hf_index); return offset; } -static const value_string IEEE1609dot2_Duration_vals[] = { +static const value_string ieee1609dot2_Duration_vals[] = { { 0, "microseconds" }, { 1, "milliseconds" }, { 2, "seconds" }, @@ -462,20 +395,20 @@ static const value_string IEEE1609dot2_Duration_vals[] = { }; static const oer_choice_t Duration_choice[] = { - { 0, &hf_IEEE1609dot2_microseconds, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_Uint16 }, - { 1, &hf_IEEE1609dot2_milliseconds, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_Uint16 }, - { 2, &hf_IEEE1609dot2_seconds, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_Uint16 }, - { 3, &hf_IEEE1609dot2_minutes, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_Uint16 }, - { 4, &hf_IEEE1609dot2_hours , ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_Uint16 }, - { 5, &hf_IEEE1609dot2_sixtyHours, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_Uint16 }, - { 6, &hf_IEEE1609dot2_years , ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_Uint16 }, + { 0, &hf_ieee1609dot2_microseconds, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_Uint16 }, + { 1, &hf_ieee1609dot2_milliseconds, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_Uint16 }, + { 2, &hf_ieee1609dot2_seconds, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_Uint16 }, + { 3, &hf_ieee1609dot2_minutes, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_Uint16 }, + { 4, &hf_ieee1609dot2_hours , ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_Uint16 }, + { 5, &hf_ieee1609dot2_sixtyHours, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_Uint16 }, + { 6, &hf_ieee1609dot2_years , ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_Uint16 }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_Duration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Duration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_Duration, Duration_choice, + ett_ieee1609dot2_Duration, Duration_choice, NULL); return offset; @@ -483,21 +416,21 @@ dissect_IEEE1609dot2_Duration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static const oer_sequence_t ValidityPeriod_sequence[] = { - { &hf_IEEE1609dot2_start , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Time32 }, - { &hf_IEEE1609dot2_duration, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Duration }, + { &hf_ieee1609dot2_start , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Time32 }, + { &hf_ieee1609dot2_duration, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Duration }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_ValidityPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_ValidityPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_ValidityPeriod, ValidityPeriod_sequence); + ett_ieee1609dot2_ValidityPeriod, ValidityPeriod_sequence); return offset; } -static const value_string IEEE1609dot2_NinetyDegreeInt_vals[] = { +static const value_string ieee1609dot2_NinetyDegreeInt_vals[] = { { -900000000, "min" }, { 900000000, "max" }, { 900000001, "unknown" }, @@ -506,7 +439,7 @@ static const value_string IEEE1609dot2_NinetyDegreeInt_vals[] = { static int -dissect_IEEE1609dot2_NinetyDegreeInt(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_NinetyDegreeInt(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_constrained_integer(tvb, offset, actx, tree, hf_index, -900000000, 900000001U, NULL, FALSE); @@ -516,14 +449,14 @@ dissect_IEEE1609dot2_NinetyDegreeInt(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int -dissect_IEEE1609dot2_Latitude(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_NinetyDegreeInt(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_Latitude(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_NinetyDegreeInt(tvb, offset, actx, tree, hf_index); return offset; } -static const value_string IEEE1609dot2_OneEightyDegreeInt_vals[] = { +static const value_string ieee1609dot2_OneEightyDegreeInt_vals[] = { { -1799999999, "min" }, { 1800000000, "max" }, { 1800000001, "unknown" }, @@ -532,7 +465,7 @@ static const value_string IEEE1609dot2_OneEightyDegreeInt_vals[] = { static int -dissect_IEEE1609dot2_OneEightyDegreeInt(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_OneEightyDegreeInt(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_constrained_integer(tvb, offset, actx, tree, hf_index, -1799999999, 1800000001U, NULL, FALSE); @@ -542,79 +475,79 @@ dissect_IEEE1609dot2_OneEightyDegreeInt(tvbuff_t *tvb _U_, int offset _U_, asn1_ static int -dissect_IEEE1609dot2_Longitude(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_OneEightyDegreeInt(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_Longitude(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_OneEightyDegreeInt(tvb, offset, actx, tree, hf_index); return offset; } static const oer_sequence_t TwoDLocation_sequence[] = { - { &hf_IEEE1609dot2_latitude, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Latitude }, - { &hf_IEEE1609dot2_longitude, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Longitude }, + { &hf_ieee1609dot2_latitude, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Latitude }, + { &hf_ieee1609dot2_longitude, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Longitude }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_TwoDLocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_TwoDLocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_TwoDLocation, TwoDLocation_sequence); + ett_ieee1609dot2_TwoDLocation, TwoDLocation_sequence); return offset; } static const oer_sequence_t CircularRegion_sequence[] = { - { &hf_IEEE1609dot2_center , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_TwoDLocation }, - { &hf_IEEE1609dot2_radius , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Uint16 }, + { &hf_ieee1609dot2_center , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_TwoDLocation }, + { &hf_ieee1609dot2_radius , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Uint16 }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_CircularRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_CircularRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_CircularRegion, CircularRegion_sequence); + ett_ieee1609dot2_CircularRegion, CircularRegion_sequence); return offset; } static const oer_sequence_t RectangularRegion_sequence[] = { - { &hf_IEEE1609dot2_northWest, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_TwoDLocation }, - { &hf_IEEE1609dot2_southEast, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_TwoDLocation }, + { &hf_ieee1609dot2_northWest, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_TwoDLocation }, + { &hf_ieee1609dot2_southEast, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_TwoDLocation }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_RectangularRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_RectangularRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_RectangularRegion, RectangularRegion_sequence); + ett_ieee1609dot2_RectangularRegion, RectangularRegion_sequence); return offset; } static const oer_sequence_t SequenceOfRectangularRegion_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfRectangularRegion_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_RectangularRegion }, + { &hf_ieee1609dot2_SequenceOfRectangularRegion_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_RectangularRegion }, }; static int -dissect_IEEE1609dot2_SequenceOfRectangularRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfRectangularRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfRectangularRegion, SequenceOfRectangularRegion_sequence_of); + ett_ieee1609dot2_SequenceOfRectangularRegion, SequenceOfRectangularRegion_sequence_of); return offset; } static const oer_sequence_t PolygonalRegion_sequence_of[1] = { - { &hf_IEEE1609dot2_PolygonalRegion_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_TwoDLocation }, + { &hf_ieee1609dot2_PolygonalRegion_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_TwoDLocation }, }; static int -dissect_IEEE1609dot2_PolygonalRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_PolygonalRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_PolygonalRegion, PolygonalRegion_sequence_of, + ett_ieee1609dot2_PolygonalRegion, PolygonalRegion_sequence_of, 3, NO_BOUND, FALSE); return offset; @@ -623,72 +556,72 @@ dissect_IEEE1609dot2_PolygonalRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int -dissect_IEEE1609dot2_CountryOnly(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_Uint16(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_CountryOnly(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_Uint16(tvb, offset, actx, tree, hf_index); return offset; } static const oer_sequence_t CountryAndRegions_sequence[] = { - { &hf_IEEE1609dot2_countryOnly, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_CountryOnly }, - { &hf_IEEE1609dot2_regions, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_SequenceOfUint8 }, + { &hf_ieee1609dot2_countryOnly, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_CountryOnly }, + { &hf_ieee1609dot2_regions, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_SequenceOfUint8 }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_CountryAndRegions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_CountryAndRegions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_CountryAndRegions, CountryAndRegions_sequence); + ett_ieee1609dot2_CountryAndRegions, CountryAndRegions_sequence); return offset; } static const oer_sequence_t RegionAndSubregions_sequence[] = { - { &hf_IEEE1609dot2_region , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Uint8 }, - { &hf_IEEE1609dot2_subregions, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_SequenceOfUint16 }, + { &hf_ieee1609dot2_region , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Uint8 }, + { &hf_ieee1609dot2_subregions, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_SequenceOfUint16 }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_RegionAndSubregions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_RegionAndSubregions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_RegionAndSubregions, RegionAndSubregions_sequence); + ett_ieee1609dot2_RegionAndSubregions, RegionAndSubregions_sequence); return offset; } static const oer_sequence_t SequenceOfRegionAndSubregions_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfRegionAndSubregions_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_RegionAndSubregions }, + { &hf_ieee1609dot2_SequenceOfRegionAndSubregions_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_RegionAndSubregions }, }; static int -dissect_IEEE1609dot2_SequenceOfRegionAndSubregions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfRegionAndSubregions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfRegionAndSubregions, SequenceOfRegionAndSubregions_sequence_of); + ett_ieee1609dot2_SequenceOfRegionAndSubregions, SequenceOfRegionAndSubregions_sequence_of); return offset; } static const oer_sequence_t CountryAndSubregions_sequence[] = { - { &hf_IEEE1609dot2_country, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_CountryOnly }, - { &hf_IEEE1609dot2_regionAndSubregions, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_SequenceOfRegionAndSubregions }, + { &hf_ieee1609dot2_country, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_CountryOnly }, + { &hf_ieee1609dot2_regionAndSubregions, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_SequenceOfRegionAndSubregions }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_CountryAndSubregions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_CountryAndSubregions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_CountryAndSubregions, CountryAndSubregions_sequence); + ett_ieee1609dot2_CountryAndSubregions, CountryAndSubregions_sequence); return offset; } -static const value_string IEEE1609dot2_IdentifiedRegion_vals[] = { +static const value_string ieee1609dot2_IdentifiedRegion_vals[] = { { 0, "countryOnly" }, { 1, "countryAndRegions" }, { 2, "countryAndSubregions" }, @@ -696,16 +629,16 @@ static const value_string IEEE1609dot2_IdentifiedRegion_vals[] = { }; static const oer_choice_t IdentifiedRegion_choice[] = { - { 0, &hf_IEEE1609dot2_countryOnly, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_CountryOnly }, - { 1, &hf_IEEE1609dot2_countryAndRegions, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_CountryAndRegions }, - { 2, &hf_IEEE1609dot2_countryAndSubregions, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_CountryAndSubregions }, + { 0, &hf_ieee1609dot2_countryOnly, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_CountryOnly }, + { 1, &hf_ieee1609dot2_countryAndRegions, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_CountryAndRegions }, + { 2, &hf_ieee1609dot2_countryAndSubregions, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_CountryAndSubregions }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_IdentifiedRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_IdentifiedRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_IdentifiedRegion, IdentifiedRegion_choice, + ett_ieee1609dot2_IdentifiedRegion, IdentifiedRegion_choice, NULL); return offset; @@ -713,19 +646,19 @@ dissect_IEEE1609dot2_IdentifiedRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static const oer_sequence_t SequenceOfIdentifiedRegion_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfIdentifiedRegion_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_IdentifiedRegion }, + { &hf_ieee1609dot2_SequenceOfIdentifiedRegion_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_IdentifiedRegion }, }; static int -dissect_IEEE1609dot2_SequenceOfIdentifiedRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfIdentifiedRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfIdentifiedRegion, SequenceOfIdentifiedRegion_sequence_of); + ett_ieee1609dot2_SequenceOfIdentifiedRegion, SequenceOfIdentifiedRegion_sequence_of); return offset; } -static const value_string IEEE1609dot2_GeographicRegion_vals[] = { +static const value_string ieee1609dot2_GeographicRegion_vals[] = { { 0, "circularRegion" }, { 1, "rectangularRegion" }, { 2, "polygonalRegion" }, @@ -734,17 +667,17 @@ static const value_string IEEE1609dot2_GeographicRegion_vals[] = { }; static const oer_choice_t GeographicRegion_choice[] = { - { 0, &hf_IEEE1609dot2_circularRegion, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_CircularRegion }, - { 1, &hf_IEEE1609dot2_rectangularRegion, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_SequenceOfRectangularRegion }, - { 2, &hf_IEEE1609dot2_polygonalRegion, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_PolygonalRegion }, - { 3, &hf_IEEE1609dot2_identifiedRegion, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_SequenceOfIdentifiedRegion }, + { 0, &hf_ieee1609dot2_circularRegion, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_CircularRegion }, + { 1, &hf_ieee1609dot2_rectangularRegion, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_SequenceOfRectangularRegion }, + { 2, &hf_ieee1609dot2_polygonalRegion, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_PolygonalRegion }, + { 3, &hf_ieee1609dot2_identifiedRegion, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_SequenceOfIdentifiedRegion }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_GeographicRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_GeographicRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_GeographicRegion, GeographicRegion_choice, + ett_ieee1609dot2_GeographicRegion, GeographicRegion_choice, NULL); return offset; @@ -753,8 +686,8 @@ dissect_IEEE1609dot2_GeographicRegion(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static int -dissect_IEEE1609dot2_ElevInt(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_Uint16(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_ElevInt(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_Uint16(tvb, offset, actx, tree, hf_index); return offset; } @@ -762,24 +695,24 @@ dissect_IEEE1609dot2_ElevInt(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int -dissect_IEEE1609dot2_Elevation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_ElevInt(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_Elevation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_ElevInt(tvb, offset, actx, tree, hf_index); return offset; } static const oer_sequence_t ThreeDLocation_sequence[] = { - { &hf_IEEE1609dot2_latitude, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Latitude }, - { &hf_IEEE1609dot2_longitude, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Longitude }, - { &hf_IEEE1609dot2_elevation, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Elevation }, + { &hf_ieee1609dot2_latitude, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Latitude }, + { &hf_ieee1609dot2_longitude, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Longitude }, + { &hf_ieee1609dot2_elevation, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Elevation }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_ThreeDLocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_ThreeDLocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_ThreeDLocation, ThreeDLocation_sequence); + ett_ieee1609dot2_ThreeDLocation, ThreeDLocation_sequence); return offset; } @@ -787,43 +720,7 @@ dissect_IEEE1609dot2_ThreeDLocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int -dissect_IEEE1609dot2_KnownLatitude(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_NinetyDegreeInt(tvb, offset, actx, tree, hf_index); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_UnknownLatitude(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_NinetyDegreeInt(tvb, offset, actx, tree, hf_index); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_KnownLongitude(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_OneEightyDegreeInt(tvb, offset, actx, tree, hf_index); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_UnknownLongitude(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_OneEightyDegreeInt(tvb, offset, actx, tree, hf_index); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_OCTET_STRING_SIZE_32(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_OCTET_STRING_SIZE_32(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 32, 32, FALSE, NULL); @@ -833,7 +730,7 @@ dissect_IEEE1609dot2_OCTET_STRING_SIZE_32(tvbuff_t *tvb _U_, int offset _U_, asn static int -dissect_IEEE1609dot2_NULL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_NULL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_null(tvb, offset, actx, tree, hf_index); return offset; @@ -841,21 +738,21 @@ dissect_IEEE1609dot2_NULL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static const oer_sequence_t T_uncompressed_sequence[] = { - { &hf_IEEE1609dot2_x , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_OCTET_STRING_SIZE_32 }, - { &hf_IEEE1609dot2_y , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_OCTET_STRING_SIZE_32 }, + { &hf_ieee1609dot2_x , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_OCTET_STRING_SIZE_32 }, + { &hf_ieee1609dot2_y , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_OCTET_STRING_SIZE_32 }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_T_uncompressed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_T_uncompressed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_T_uncompressed, T_uncompressed_sequence); + ett_ieee1609dot2_T_uncompressed, T_uncompressed_sequence); return offset; } -static const value_string IEEE1609dot2_EccP256CurvePoint_vals[] = { +static const value_string ieee1609dot2_EccP256CurvePoint_vals[] = { { 0, "x-only" }, { 1, "fill" }, { 2, "compressed-y-0" }, @@ -865,18 +762,18 @@ static const value_string IEEE1609dot2_EccP256CurvePoint_vals[] = { }; static const oer_choice_t EccP256CurvePoint_choice[] = { - { 0, &hf_IEEE1609dot2_x_only , ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_OCTET_STRING_SIZE_32 }, - { 1, &hf_IEEE1609dot2_fill , ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_NULL }, - { 2, &hf_IEEE1609dot2_compressed_y_0, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_OCTET_STRING_SIZE_32 }, - { 3, &hf_IEEE1609dot2_compressed_y_1, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_OCTET_STRING_SIZE_32 }, - { 4, &hf_IEEE1609dot2_uncompressed, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_T_uncompressed }, + { 0, &hf_ieee1609dot2_x_only , ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_OCTET_STRING_SIZE_32 }, + { 1, &hf_ieee1609dot2_fill , ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_NULL }, + { 2, &hf_ieee1609dot2_compressed_y_0, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_OCTET_STRING_SIZE_32 }, + { 3, &hf_ieee1609dot2_compressed_y_1, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_OCTET_STRING_SIZE_32 }, + { 4, &hf_ieee1609dot2_uncompressed, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_T_uncompressed }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_EccP256CurvePoint(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_EccP256CurvePoint(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_EccP256CurvePoint, EccP256CurvePoint_choice, + ett_ieee1609dot2_EccP256CurvePoint, EccP256CurvePoint_choice, NULL); return offset; @@ -884,50 +781,50 @@ dissect_IEEE1609dot2_EccP256CurvePoint(tvbuff_t *tvb _U_, int offset _U_, asn1_c static const oer_sequence_t EcdsaP256Signature_sequence[] = { - { &hf_IEEE1609dot2_r , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_EccP256CurvePoint }, - { &hf_IEEE1609dot2_s , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_OCTET_STRING_SIZE_32 }, + { &hf_ieee1609dot2_r , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_EccP256CurvePoint }, + { &hf_ieee1609dot2_s , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_OCTET_STRING_SIZE_32 }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_EcdsaP256Signature(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_EcdsaP256Signature(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_EcdsaP256Signature, EcdsaP256Signature_sequence); + ett_ieee1609dot2_EcdsaP256Signature, EcdsaP256Signature_sequence); return offset; } -static const value_string IEEE1609dot2_Signature_vals[] = { +static const value_string ieee1609dot2_Signature_vals[] = { { 0, "ecdsaNistP256Signature" }, { 1, "ecdsaBrainpoolP256r1Signature" }, { 0, NULL } }; static const oer_choice_t Signature_choice[] = { - { 0, &hf_IEEE1609dot2_ecdsaNistP256Signature, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_EcdsaP256Signature }, - { 1, &hf_IEEE1609dot2_ecdsaBrainpoolP256r1Signature, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_EcdsaP256Signature }, + { 0, &hf_ieee1609dot2_ecdsaNistP256Signature, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_EcdsaP256Signature }, + { 1, &hf_ieee1609dot2_ecdsaBrainpoolP256r1Signature, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_EcdsaP256Signature }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_Signature(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Signature(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_Signature, Signature_choice, + ett_ieee1609dot2_Signature, Signature_choice, NULL); return offset; } -static const value_string IEEE1609dot2_SymmAlgorithm_vals[] = { +static const value_string ieee1609dot2_SymmAlgorithm_vals[] = { { 0, "aes128Ccm" }, { 0, NULL } }; static int -dissect_IEEE1609dot2_SymmAlgorithm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SymmAlgorithm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, TRUE, 0, NULL); @@ -935,14 +832,14 @@ dissect_IEEE1609dot2_SymmAlgorithm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const value_string IEEE1609dot2_HashAlgorithm_vals[] = { +static const value_string ieee1609dot2_HashAlgorithm_vals[] = { { 0, "sha256" }, { 0, NULL } }; static int -dissect_IEEE1609dot2_HashAlgorithm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_HashAlgorithm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_enumerated(tvb, offset, actx, tree, hf_index, 1, NULL, TRUE, 0, NULL); @@ -952,7 +849,7 @@ dissect_IEEE1609dot2_HashAlgorithm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int -dissect_IEEE1609dot2_OCTET_STRING_SIZE_16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_OCTET_STRING_SIZE_16(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 16, 16, FALSE, NULL); @@ -961,37 +858,37 @@ dissect_IEEE1609dot2_OCTET_STRING_SIZE_16(tvbuff_t *tvb _U_, int offset _U_, asn static const oer_sequence_t EciesP256EncryptedKey_sequence[] = { - { &hf_IEEE1609dot2_v , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_EccP256CurvePoint }, - { &hf_IEEE1609dot2_c , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_OCTET_STRING_SIZE_16 }, - { &hf_IEEE1609dot2_t , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_OCTET_STRING_SIZE_16 }, + { &hf_ieee1609dot2_v , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_EccP256CurvePoint }, + { &hf_ieee1609dot2_c , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_OCTET_STRING_SIZE_16 }, + { &hf_ieee1609dot2_t , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_OCTET_STRING_SIZE_16 }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_EciesP256EncryptedKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_EciesP256EncryptedKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_EciesP256EncryptedKey, EciesP256EncryptedKey_sequence); + ett_ieee1609dot2_EciesP256EncryptedKey, EciesP256EncryptedKey_sequence); return offset; } -static const value_string IEEE1609dot2_BasePublicEncryptionKey_vals[] = { +static const value_string ieee1609dot2_BasePublicEncryptionKey_vals[] = { { 0, "eciesNistP256" }, { 1, "eciesBrainpoolP256r1" }, { 0, NULL } }; static const oer_choice_t BasePublicEncryptionKey_choice[] = { - { 0, &hf_IEEE1609dot2_eciesNistP256, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_EccP256CurvePoint }, - { 1, &hf_IEEE1609dot2_eciesBrainpoolP256r1, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_EccP256CurvePoint }, + { 0, &hf_ieee1609dot2_eciesNistP256, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_EccP256CurvePoint }, + { 1, &hf_ieee1609dot2_eciesBrainpoolP256r1, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_EccP256CurvePoint }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_BasePublicEncryptionKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_BasePublicEncryptionKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_BasePublicEncryptionKey, BasePublicEncryptionKey_choice, + ett_ieee1609dot2_BasePublicEncryptionKey, BasePublicEncryptionKey_choice, NULL); return offset; @@ -999,78 +896,78 @@ dissect_IEEE1609dot2_BasePublicEncryptionKey(tvbuff_t *tvb _U_, int offset _U_, static const oer_sequence_t PublicEncryptionKey_sequence[] = { - { &hf_IEEE1609dot2_supportedSymmAlg, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_SymmAlgorithm }, - { &hf_IEEE1609dot2_publicKey, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_BasePublicEncryptionKey }, + { &hf_ieee1609dot2_supportedSymmAlg, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_SymmAlgorithm }, + { &hf_ieee1609dot2_publicKey, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_BasePublicEncryptionKey }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_PublicEncryptionKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_PublicEncryptionKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_PublicEncryptionKey, PublicEncryptionKey_sequence); + ett_ieee1609dot2_PublicEncryptionKey, PublicEncryptionKey_sequence); return offset; } -static const value_string IEEE1609dot2_SymmetricEncryptionKey_vals[] = { +static const value_string ieee1609dot2_SymmetricEncryptionKey_vals[] = { { 0, "aes128Ccm" }, { 0, NULL } }; static const oer_choice_t SymmetricEncryptionKey_choice[] = { - { 0, &hf_IEEE1609dot2_aes128Ccm, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_OCTET_STRING_SIZE_16 }, + { 0, &hf_ieee1609dot2_aes128Ccm, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_OCTET_STRING_SIZE_16 }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_SymmetricEncryptionKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SymmetricEncryptionKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SymmetricEncryptionKey, SymmetricEncryptionKey_choice, + ett_ieee1609dot2_SymmetricEncryptionKey, SymmetricEncryptionKey_choice, NULL); return offset; } -static const value_string IEEE1609dot2_EncryptionKey_vals[] = { +static const value_string ieee1609dot2_EncryptionKey_vals[] = { { 0, "public" }, { 1, "symmetric" }, { 0, NULL } }; static const oer_choice_t EncryptionKey_choice[] = { - { 0, &hf_IEEE1609dot2_public , ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_PublicEncryptionKey }, - { 1, &hf_IEEE1609dot2_symmetric, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_SymmetricEncryptionKey }, + { 0, &hf_ieee1609dot2_public , ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_PublicEncryptionKey }, + { 1, &hf_ieee1609dot2_symmetric, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_SymmetricEncryptionKey }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_EncryptionKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_EncryptionKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_EncryptionKey, EncryptionKey_choice, + ett_ieee1609dot2_EncryptionKey, EncryptionKey_choice, NULL); return offset; } -static const value_string IEEE1609dot2_PublicVerificationKey_vals[] = { +static const value_string ieee1609dot2_PublicVerificationKey_vals[] = { { 0, "ecdsaNistP256" }, { 1, "ecdsaBrainpoolP256r1" }, { 0, NULL } }; static const oer_choice_t PublicVerificationKey_choice[] = { - { 0, &hf_IEEE1609dot2_ecdsaNistP256, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_EccP256CurvePoint }, - { 1, &hf_IEEE1609dot2_ecdsaBrainpoolP256r1, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_EccP256CurvePoint }, + { 0, &hf_ieee1609dot2_ecdsaNistP256, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_EccP256CurvePoint }, + { 1, &hf_ieee1609dot2_ecdsaBrainpoolP256r1, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_EccP256CurvePoint }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_PublicVerificationKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_PublicVerificationKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_PublicVerificationKey, PublicVerificationKey_choice, + ett_ieee1609dot2_PublicVerificationKey, PublicVerificationKey_choice, NULL); return offset; @@ -1079,7 +976,7 @@ dissect_IEEE1609dot2_PublicVerificationKey(tvbuff_t *tvb _U_, int offset _U_, as static int -dissect_IEEE1609dot2_Psid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Psid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_constrained_integer_64b_no_ub(tvb, offset, actx, tree, hf_index, 0U, NO_BOUND, NULL, FALSE); @@ -1089,7 +986,7 @@ dissect_IEEE1609dot2_Psid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int -dissect_IEEE1609dot2_OCTET_STRING_SIZE_0_MAX(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_OCTET_STRING_SIZE_0_MAX(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 0, NO_BOUND, FALSE, NULL); @@ -1097,20 +994,20 @@ dissect_IEEE1609dot2_OCTET_STRING_SIZE_0_MAX(tvbuff_t *tvb _U_, int offset _U_, } -static const value_string IEEE1609dot2_ServiceSpecificPermissions_vals[] = { +static const value_string ieee1609dot2_ServiceSpecificPermissions_vals[] = { { 0, "opaque" }, { 0, NULL } }; static const oer_choice_t ServiceSpecificPermissions_choice[] = { - { 0, &hf_IEEE1609dot2_opaque , ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_OCTET_STRING_SIZE_0_MAX }, + { 0, &hf_ieee1609dot2_opaque , ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_OCTET_STRING_SIZE_0_MAX }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_ServiceSpecificPermissions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_ServiceSpecificPermissions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_ServiceSpecificPermissions, ServiceSpecificPermissions_choice, + ett_ieee1609dot2_ServiceSpecificPermissions, ServiceSpecificPermissions_choice, NULL); return offset; @@ -1118,76 +1015,63 @@ dissect_IEEE1609dot2_ServiceSpecificPermissions(tvbuff_t *tvb _U_, int offset _U static const oer_sequence_t PsidSsp_sequence[] = { - { &hf_IEEE1609dot2_psid , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Psid }, - { &hf_IEEE1609dot2_ssp , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_IEEE1609dot2_ServiceSpecificPermissions }, + { &hf_ieee1609dot2_psid , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Psid }, + { &hf_ieee1609dot2_ssp , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_ieee1609dot2_ServiceSpecificPermissions }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_PsidSsp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_PsidSsp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_PsidSsp, PsidSsp_sequence); + ett_ieee1609dot2_PsidSsp, PsidSsp_sequence); return offset; } static const oer_sequence_t SequenceOfPsidSsp_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfPsidSsp_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_PsidSsp }, -}; - -static int -dissect_IEEE1609dot2_SequenceOfPsidSsp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfPsidSsp, SequenceOfPsidSsp_sequence_of); - - return offset; -} - - -static const oer_sequence_t SequenceOfPsid_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfPsid_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Psid }, + { &hf_ieee1609dot2_SequenceOfPsidSsp_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_PsidSsp }, }; static int -dissect_IEEE1609dot2_SequenceOfPsid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfPsidSsp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfPsid, SequenceOfPsid_sequence_of); + ett_ieee1609dot2_SequenceOfPsidSsp, SequenceOfPsidSsp_sequence_of); return offset; } static const oer_sequence_t SequenceOfOctetString_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfOctetString_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_OCTET_STRING_SIZE_0_MAX }, + { &hf_ieee1609dot2_SequenceOfOctetString_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_OCTET_STRING_SIZE_0_MAX }, }; static int -dissect_IEEE1609dot2_SequenceOfOctetString(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfOctetString(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfOctetString, SequenceOfOctetString_sequence_of, + ett_ieee1609dot2_SequenceOfOctetString, SequenceOfOctetString_sequence_of, 0, NO_BOUND, FALSE); return offset; } -static const value_string IEEE1609dot2_SspRange_vals[] = { +static const value_string ieee1609dot2_SspRange_vals[] = { { 0, "opaque" }, { 1, "all" }, { 0, NULL } }; static const oer_choice_t SspRange_choice[] = { - { 0, &hf_IEEE1609dot2_opaque_01, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_SequenceOfOctetString }, - { 1, &hf_IEEE1609dot2_all , ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_NULL }, + { 0, &hf_ieee1609dot2_opaque_01, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_SequenceOfOctetString }, + { 1, &hf_ieee1609dot2_all , ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_NULL }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_SspRange(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SspRange(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SspRange, SspRange_choice, + ett_ieee1609dot2_SspRange, SspRange_choice, NULL); return offset; @@ -1195,28 +1079,28 @@ dissect_IEEE1609dot2_SspRange(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static const oer_sequence_t PsidSspRange_sequence[] = { - { &hf_IEEE1609dot2_psid , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Psid }, - { &hf_IEEE1609dot2_sspRange, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_IEEE1609dot2_SspRange }, + { &hf_ieee1609dot2_psid , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Psid }, + { &hf_ieee1609dot2_sspRange, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_ieee1609dot2_SspRange }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_PsidSspRange(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_PsidSspRange(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_PsidSspRange, PsidSspRange_sequence); + ett_ieee1609dot2_PsidSspRange, PsidSspRange_sequence); return offset; } static const oer_sequence_t SequenceOfPsidSspRange_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfPsidSspRange_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_PsidSspRange }, + { &hf_ieee1609dot2_SequenceOfPsidSspRange_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_PsidSspRange }, }; static int -dissect_IEEE1609dot2_SequenceOfPsidSspRange(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfPsidSspRange(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfPsidSspRange, SequenceOfPsidSspRange_sequence_of); + ett_ieee1609dot2_SequenceOfPsidSspRange, SequenceOfPsidSspRange_sequence_of); return offset; } @@ -1224,7 +1108,7 @@ dissect_IEEE1609dot2_SequenceOfPsidSspRange(tvbuff_t *tvb _U_, int offset _U_, a static int -dissect_IEEE1609dot2_SubjectAssurance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SubjectAssurance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 1, 1, FALSE, NULL); @@ -1234,8 +1118,8 @@ dissect_IEEE1609dot2_SubjectAssurance(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static int -dissect_IEEE1609dot2_CrlSeries(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_Uint16(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_CrlSeries(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_Uint16(tvb, offset, actx, tree, hf_index); return offset; } @@ -1243,8 +1127,8 @@ dissect_IEEE1609dot2_CrlSeries(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int -dissect_IEEE1609dot2_IValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_Uint16(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_IValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_Uint16(tvb, offset, actx, tree, hf_index); return offset; } @@ -1252,7 +1136,7 @@ dissect_IEEE1609dot2_IValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int -dissect_IEEE1609dot2_Hostname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Hostname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_UTF8String(tvb, offset, actx, tree, hf_index, 0, 255, FALSE); @@ -1262,7 +1146,7 @@ dissect_IEEE1609dot2_Hostname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int -dissect_IEEE1609dot2_LinkageValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_LinkageValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 9, 9, FALSE, NULL); @@ -1272,7 +1156,7 @@ dissect_IEEE1609dot2_LinkageValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int -dissect_IEEE1609dot2_OCTET_STRING_SIZE_4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_OCTET_STRING_SIZE_4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 4, 4, FALSE, NULL); @@ -1282,7 +1166,7 @@ dissect_IEEE1609dot2_OCTET_STRING_SIZE_4(tvbuff_t *tvb _U_, int offset _U_, asn1 static int -dissect_IEEE1609dot2_OCTET_STRING_SIZE_9(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_OCTET_STRING_SIZE_9(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 9, 9, FALSE, NULL); @@ -1291,91 +1175,71 @@ dissect_IEEE1609dot2_OCTET_STRING_SIZE_9(tvbuff_t *tvb _U_, int offset _U_, asn1 static const oer_sequence_t GroupLinkageValue_sequence[] = { - { &hf_IEEE1609dot2_jValue , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_OCTET_STRING_SIZE_4 }, - { &hf_IEEE1609dot2_value , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_OCTET_STRING_SIZE_9 }, + { &hf_ieee1609dot2_jValue , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_OCTET_STRING_SIZE_4 }, + { &hf_ieee1609dot2_value , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_OCTET_STRING_SIZE_9 }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_GroupLinkageValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_GroupLinkageValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_GroupLinkageValue, GroupLinkageValue_sequence); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_LaId(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_LinkageSeed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, - 16, 16, FALSE, NULL); + ett_ieee1609dot2_GroupLinkageValue, GroupLinkageValue_sequence); return offset; } static const oer_sequence_t MissingCrlIdentifier_sequence[] = { - { &hf_IEEE1609dot2_cracaId, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_HashedId3 }, - { &hf_IEEE1609dot2_crlSeries, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_CrlSeries }, + { &hf_ieee1609dot2_cracaId, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_HashedId3 }, + { &hf_ieee1609dot2_crlSeries, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_CrlSeries }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_MissingCrlIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_MissingCrlIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_MissingCrlIdentifier, MissingCrlIdentifier_sequence); + ett_ieee1609dot2_MissingCrlIdentifier, MissingCrlIdentifier_sequence); return offset; } static const oer_sequence_t HeaderInfo_sequence[] = { - { &hf_IEEE1609dot2_psid , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Psid }, - { &hf_IEEE1609dot2_generationTime, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_Time64 }, - { &hf_IEEE1609dot2_expiryTime, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_Time64 }, - { &hf_IEEE1609dot2_generationLocation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_ThreeDLocation }, - { &hf_IEEE1609dot2_p2pcdLearningRequest, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_HashedId3 }, - { &hf_IEEE1609dot2_missingCrlIdentifier, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_MissingCrlIdentifier }, - { &hf_IEEE1609dot2_encryptionKey, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_EncryptionKey }, + { &hf_ieee1609dot2_psid , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Psid }, + { &hf_ieee1609dot2_generationTime, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_Time64 }, + { &hf_ieee1609dot2_expiryTime, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_Time64 }, + { &hf_ieee1609dot2_generationLocation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_ThreeDLocation }, + { &hf_ieee1609dot2_p2pcdLearningRequest, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_HashedId3 }, + { &hf_ieee1609dot2_missingCrlIdentifier, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_MissingCrlIdentifier }, + { &hf_ieee1609dot2_encryptionKey, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_EncryptionKey }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_HeaderInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_HeaderInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_HeaderInfo, HeaderInfo_sequence); + ett_ieee1609dot2_HeaderInfo, HeaderInfo_sequence); return offset; } static const oer_sequence_t ToBeSignedData_sequence[] = { - { &hf_IEEE1609dot2_payload, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_SignedDataPayload }, - { &hf_IEEE1609dot2_headerInfo, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_HeaderInfo }, + { &hf_ieee1609dot2_payload, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_SignedDataPayload }, + { &hf_ieee1609dot2_headerInfo, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_HeaderInfo }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_ToBeSignedData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_ToBeSignedData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_ToBeSignedData, ToBeSignedData_sequence); + ett_ieee1609dot2_ToBeSignedData, ToBeSignedData_sequence); return offset; } -static const value_string IEEE1609dot2_CertificateType_vals[] = { +static const value_string ieee1609dot2_CertificateType_vals[] = { { 0, "explicit" }, { 1, "implicit" }, { 0, NULL } @@ -1383,7 +1247,7 @@ static const value_string IEEE1609dot2_CertificateType_vals[] = { static int -dissect_IEEE1609dot2_CertificateType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_CertificateType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_enumerated(tvb, offset, actx, tree, hf_index, 2, NULL, TRUE, 0, NULL); @@ -1391,22 +1255,22 @@ dissect_IEEE1609dot2_CertificateType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const value_string IEEE1609dot2_IssuerIdentifier_vals[] = { +static const value_string ieee1609dot2_IssuerIdentifier_vals[] = { { 0, "sha256AndDigest" }, { 1, "self" }, { 0, NULL } }; static const oer_choice_t IssuerIdentifier_choice[] = { - { 0, &hf_IEEE1609dot2_sha256AndDigest, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_HashedId8 }, - { 1, &hf_IEEE1609dot2_self_01, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_HashAlgorithm }, + { 0, &hf_ieee1609dot2_sha256AndDigest, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_HashedId8 }, + { 1, &hf_ieee1609dot2_self_01, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_HashAlgorithm }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_IssuerIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_IssuerIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_IssuerIdentifier, IssuerIdentifier_choice, + ett_ieee1609dot2_IssuerIdentifier, IssuerIdentifier_choice, NULL); return offset; @@ -1414,16 +1278,16 @@ dissect_IEEE1609dot2_IssuerIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static const oer_sequence_t LinkageData_sequence[] = { - { &hf_IEEE1609dot2_iCert , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_IValue }, - { &hf_IEEE1609dot2_linkage_value, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_LinkageValue }, - { &hf_IEEE1609dot2_group_linkage_value, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_IEEE1609dot2_GroupLinkageValue }, + { &hf_ieee1609dot2_iCert , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_IValue }, + { &hf_ieee1609dot2_linkage_value, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_LinkageValue }, + { &hf_ieee1609dot2_group_linkage_value, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_ieee1609dot2_GroupLinkageValue }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_LinkageData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_LinkageData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_LinkageData, LinkageData_sequence); + ett_ieee1609dot2_LinkageData, LinkageData_sequence); return offset; } @@ -1431,7 +1295,7 @@ dissect_IEEE1609dot2_LinkageData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int -dissect_IEEE1609dot2_OCTET_STRING_SIZE_1_64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_OCTET_STRING_SIZE_1_64(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 1, 64, FALSE, NULL); @@ -1439,7 +1303,7 @@ dissect_IEEE1609dot2_OCTET_STRING_SIZE_1_64(tvbuff_t *tvb _U_, int offset _U_, a } -static const value_string IEEE1609dot2_CertificateId_vals[] = { +static const value_string ieee1609dot2_CertificateId_vals[] = { { 0, "linkageData" }, { 1, "name" }, { 2, "binaryId" }, @@ -1448,39 +1312,39 @@ static const value_string IEEE1609dot2_CertificateId_vals[] = { }; static const oer_choice_t CertificateId_choice[] = { - { 0, &hf_IEEE1609dot2_linkageData, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_LinkageData }, - { 1, &hf_IEEE1609dot2_name , ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_Hostname }, - { 2, &hf_IEEE1609dot2_binaryId, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_OCTET_STRING_SIZE_1_64 }, - { 3, &hf_IEEE1609dot2_none , ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_NULL }, + { 0, &hf_ieee1609dot2_linkageData, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_LinkageData }, + { 1, &hf_ieee1609dot2_name , ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_Hostname }, + { 2, &hf_ieee1609dot2_binaryId, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_OCTET_STRING_SIZE_1_64 }, + { 3, &hf_ieee1609dot2_none , ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_NULL }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_CertificateId(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_CertificateId(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_CertificateId, CertificateId_choice, + ett_ieee1609dot2_CertificateId, CertificateId_choice, NULL); return offset; } -static const value_string IEEE1609dot2_SubjectPermissions_vals[] = { +static const value_string ieee1609dot2_SubjectPermissions_vals[] = { { 0, "explicit" }, { 1, "all" }, { 0, NULL } }; static const oer_choice_t SubjectPermissions_choice[] = { - { 0, &hf_IEEE1609dot2_explicit, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_SequenceOfPsidSspRange }, - { 1, &hf_IEEE1609dot2_all , ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_NULL }, + { 0, &hf_ieee1609dot2_explicit, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_SequenceOfPsidSspRange }, + { 1, &hf_ieee1609dot2_all , ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_NULL }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_SubjectPermissions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SubjectPermissions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SubjectPermissions, SubjectPermissions_choice, + ett_ieee1609dot2_SubjectPermissions, SubjectPermissions_choice, NULL); return offset; @@ -1489,7 +1353,7 @@ dissect_IEEE1609dot2_SubjectPermissions(tvbuff_t *tvb _U_, int offset _U_, asn1_ static int -dissect_IEEE1609dot2_INTEGER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_INTEGER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_integer(tvb, offset, actx, tree, hf_index, NULL); return offset; @@ -1498,7 +1362,7 @@ dissect_IEEE1609dot2_INTEGER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int -dissect_IEEE1609dot2_EndEntityType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_EndEntityType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_bit_string(tvb, offset, actx, tree, hf_index, 8, 8, FALSE, NULL, NULL); @@ -1507,51 +1371,51 @@ dissect_IEEE1609dot2_EndEntityType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static const oer_sequence_t PsidGroupPermissions_sequence[] = { - { &hf_IEEE1609dot2_appPermissions_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_SubjectPermissions }, - { &hf_IEEE1609dot2_minChainDepth, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_IEEE1609dot2_INTEGER }, - { &hf_IEEE1609dot2_chainDepthRange, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_IEEE1609dot2_INTEGER }, - { &hf_IEEE1609dot2_eeType , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_IEEE1609dot2_EndEntityType }, + { &hf_ieee1609dot2_appPermissions_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_SubjectPermissions }, + { &hf_ieee1609dot2_minChainDepth, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_ieee1609dot2_INTEGER }, + { &hf_ieee1609dot2_chainDepthRange, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_ieee1609dot2_INTEGER }, + { &hf_ieee1609dot2_eeType , ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_ieee1609dot2_EndEntityType }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_PsidGroupPermissions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_PsidGroupPermissions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_PsidGroupPermissions, PsidGroupPermissions_sequence); + ett_ieee1609dot2_PsidGroupPermissions, PsidGroupPermissions_sequence); return offset; } static const oer_sequence_t SequenceOfPsidGroupPermissions_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfPsidGroupPermissions_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_PsidGroupPermissions }, + { &hf_ieee1609dot2_SequenceOfPsidGroupPermissions_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_PsidGroupPermissions }, }; static int -dissect_IEEE1609dot2_SequenceOfPsidGroupPermissions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfPsidGroupPermissions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfPsidGroupPermissions, SequenceOfPsidGroupPermissions_sequence_of); + ett_ieee1609dot2_SequenceOfPsidGroupPermissions, SequenceOfPsidGroupPermissions_sequence_of); return offset; } -static const value_string IEEE1609dot2_VerificationKeyIndicator_vals[] = { +static const value_string ieee1609dot2_VerificationKeyIndicator_vals[] = { { 0, "verificationKey" }, { 1, "reconstructionValue" }, { 0, NULL } }; static const oer_choice_t VerificationKeyIndicator_choice[] = { - { 0, &hf_IEEE1609dot2_verificationKey, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_PublicVerificationKey }, - { 1, &hf_IEEE1609dot2_reconstructionValue, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_EccP256CurvePoint }, + { 0, &hf_ieee1609dot2_verificationKey, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_PublicVerificationKey }, + { 1, &hf_ieee1609dot2_reconstructionValue, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_EccP256CurvePoint }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_VerificationKeyIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_VerificationKeyIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_VerificationKeyIndicator, VerificationKeyIndicator_choice, + ett_ieee1609dot2_VerificationKeyIndicator, VerificationKeyIndicator_choice, NULL); return offset; @@ -1559,43 +1423,43 @@ dissect_IEEE1609dot2_VerificationKeyIndicator(tvbuff_t *tvb _U_, int offset _U_, static const oer_sequence_t ToBeSignedCertificate_sequence[] = { - { &hf_IEEE1609dot2_id , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_CertificateId }, - { &hf_IEEE1609dot2_cracaId, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_HashedId3 }, - { &hf_IEEE1609dot2_crlSeries, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_CrlSeries }, - { &hf_IEEE1609dot2_validityPeriod, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_ValidityPeriod }, - { &hf_IEEE1609dot2_region_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_GeographicRegion }, - { &hf_IEEE1609dot2_assuranceLevel, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_SubjectAssurance }, - { &hf_IEEE1609dot2_appPermissions, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_SequenceOfPsidSsp }, - { &hf_IEEE1609dot2_certIssuePermissions, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_SequenceOfPsidGroupPermissions }, - { &hf_IEEE1609dot2_certRequestPermissions, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_SequenceOfPsidGroupPermissions }, - { &hf_IEEE1609dot2_canRequestRollover, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_NULL }, - { &hf_IEEE1609dot2_encryptionKey_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_PublicEncryptionKey }, - { &hf_IEEE1609dot2_verifyKeyIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_VerificationKeyIndicator }, + { &hf_ieee1609dot2_id , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_CertificateId }, + { &hf_ieee1609dot2_cracaId, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_HashedId3 }, + { &hf_ieee1609dot2_crlSeries, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_CrlSeries }, + { &hf_ieee1609dot2_validityPeriod, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_ValidityPeriod }, + { &hf_ieee1609dot2_region_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_GeographicRegion }, + { &hf_ieee1609dot2_assuranceLevel, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_SubjectAssurance }, + { &hf_ieee1609dot2_appPermissions, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_SequenceOfPsidSsp }, + { &hf_ieee1609dot2_certIssuePermissions, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_SequenceOfPsidGroupPermissions }, + { &hf_ieee1609dot2_certRequestPermissions, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_SequenceOfPsidGroupPermissions }, + { &hf_ieee1609dot2_canRequestRollover, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_NULL }, + { &hf_ieee1609dot2_encryptionKey_01, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_PublicEncryptionKey }, + { &hf_ieee1609dot2_verifyKeyIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_VerificationKeyIndicator }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_ToBeSignedCertificate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_ToBeSignedCertificate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_ToBeSignedCertificate, ToBeSignedCertificate_sequence); + ett_ieee1609dot2_ToBeSignedCertificate, ToBeSignedCertificate_sequence); return offset; } static const oer_sequence_t CertificateBase_sequence[] = { - { &hf_IEEE1609dot2_version, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Uint8 }, - { &hf_IEEE1609dot2_type , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_CertificateType }, - { &hf_IEEE1609dot2_issuer , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_IssuerIdentifier }, - { &hf_IEEE1609dot2_toBeSigned, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_ToBeSignedCertificate }, - { &hf_IEEE1609dot2_signature, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_IEEE1609dot2_Signature }, + { &hf_ieee1609dot2_version, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Uint8 }, + { &hf_ieee1609dot2_type , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_CertificateType }, + { &hf_ieee1609dot2_issuer , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_IssuerIdentifier }, + { &hf_ieee1609dot2_toBeSigned, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_ToBeSignedCertificate }, + { &hf_ieee1609dot2_signature, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_ieee1609dot2_Signature }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_CertificateBase(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_CertificateBase(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_CertificateBase, CertificateBase_sequence); + ett_ieee1609dot2_CertificateBase, CertificateBase_sequence); return offset; } @@ -1603,27 +1467,27 @@ dissect_IEEE1609dot2_CertificateBase(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int -dissect_IEEE1609dot2_Certificate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_CertificateBase(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_Certificate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_CertificateBase(tvb, offset, actx, tree, hf_index); return offset; } static const oer_sequence_t SequenceOfCertificate_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfCertificate_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Certificate }, + { &hf_ieee1609dot2_SequenceOfCertificate_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Certificate }, }; static int -dissect_IEEE1609dot2_SequenceOfCertificate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfCertificate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfCertificate, SequenceOfCertificate_sequence_of); + ett_ieee1609dot2_SequenceOfCertificate, SequenceOfCertificate_sequence_of); return offset; } -static const value_string IEEE1609dot2_SignerIdentifier_vals[] = { +static const value_string ieee1609dot2_SignerIdentifier_vals[] = { { 0, "digest" }, { 1, "certificate" }, { 2, "self" }, @@ -1631,16 +1495,16 @@ static const value_string IEEE1609dot2_SignerIdentifier_vals[] = { }; static const oer_choice_t SignerIdentifier_choice[] = { - { 0, &hf_IEEE1609dot2_digest , ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_HashedId8 }, - { 1, &hf_IEEE1609dot2_certificate, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_SequenceOfCertificate }, - { 2, &hf_IEEE1609dot2_self , ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_NULL }, + { 0, &hf_ieee1609dot2_digest , ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_HashedId8 }, + { 1, &hf_ieee1609dot2_certificate, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_SequenceOfCertificate }, + { 2, &hf_ieee1609dot2_self , ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_NULL }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_SignerIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SignerIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SignerIdentifier, SignerIdentifier_choice, + ett_ieee1609dot2_SignerIdentifier, SignerIdentifier_choice, NULL); return offset; @@ -1648,17 +1512,17 @@ dissect_IEEE1609dot2_SignerIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static const oer_sequence_t SignedData_sequence[] = { - { &hf_IEEE1609dot2_hashId , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_HashAlgorithm }, - { &hf_IEEE1609dot2_tbsData, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_ToBeSignedData }, - { &hf_IEEE1609dot2_signer , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_SignerIdentifier }, - { &hf_IEEE1609dot2_signature, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Signature }, + { &hf_ieee1609dot2_hashId , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_HashAlgorithm }, + { &hf_ieee1609dot2_tbsData, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_ToBeSignedData }, + { &hf_ieee1609dot2_signer , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_SignerIdentifier }, + { &hf_ieee1609dot2_signature, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Signature }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_SignedData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SignedData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SignedData, SignedData_sequence); + ett_ieee1609dot2_SignedData, SignedData_sequence); return offset; } @@ -1666,8 +1530,8 @@ dissect_IEEE1609dot2_SignedData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int -dissect_IEEE1609dot2_PreSharedKeyRecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_HashedId8(tvb, offset, actx, tree, hf_index); +dissect_ieee1609dot2_PreSharedKeyRecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ieee1609dot2_HashedId8(tvb, offset, actx, tree, hf_index); return offset; } @@ -1675,7 +1539,7 @@ dissect_IEEE1609dot2_PreSharedKeyRecipientInfo(tvbuff_t *tvb _U_, int offset _U_ static int -dissect_IEEE1609dot2_OCTET_STRING_SIZE_12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_OCTET_STRING_SIZE_12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_octet_string(tvb, offset, actx, tree, hf_index, 12, 12, FALSE, NULL); @@ -1684,34 +1548,34 @@ dissect_IEEE1609dot2_OCTET_STRING_SIZE_12(tvbuff_t *tvb _U_, int offset _U_, asn static const oer_sequence_t AesCcmCiphertext_sequence[] = { - { &hf_IEEE1609dot2_nonce , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_OCTET_STRING_SIZE_12 }, - { &hf_IEEE1609dot2_ccmCiphertext, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Opaque }, + { &hf_ieee1609dot2_nonce , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_OCTET_STRING_SIZE_12 }, + { &hf_ieee1609dot2_ccmCiphertext, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Opaque }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_AesCcmCiphertext(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_AesCcmCiphertext(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_AesCcmCiphertext, AesCcmCiphertext_sequence); + ett_ieee1609dot2_AesCcmCiphertext, AesCcmCiphertext_sequence); return offset; } -static const value_string IEEE1609dot2_SymmetricCiphertext_vals[] = { +static const value_string ieee1609dot2_SymmetricCiphertext_vals[] = { { 0, "aes128ccm" }, { 0, NULL } }; static const oer_choice_t SymmetricCiphertext_choice[] = { - { 0, &hf_IEEE1609dot2_aes128ccm, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_AesCcmCiphertext }, + { 0, &hf_ieee1609dot2_aes128ccm, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_AesCcmCiphertext }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_SymmetricCiphertext(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SymmetricCiphertext(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SymmetricCiphertext, SymmetricCiphertext_choice, + ett_ieee1609dot2_SymmetricCiphertext, SymmetricCiphertext_choice, NULL); return offset; @@ -1719,36 +1583,36 @@ dissect_IEEE1609dot2_SymmetricCiphertext(tvbuff_t *tvb _U_, int offset _U_, asn1 static const oer_sequence_t SymmRecipientInfo_sequence[] = { - { &hf_IEEE1609dot2_recipientId, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_HashedId8 }, - { &hf_IEEE1609dot2_encKey , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_SymmetricCiphertext }, + { &hf_ieee1609dot2_recipientId, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_HashedId8 }, + { &hf_ieee1609dot2_encKey , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_SymmetricCiphertext }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_SymmRecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SymmRecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SymmRecipientInfo, SymmRecipientInfo_sequence); + ett_ieee1609dot2_SymmRecipientInfo, SymmRecipientInfo_sequence); return offset; } -static const value_string IEEE1609dot2_EncryptedDataEncryptionKey_vals[] = { +static const value_string ieee1609dot2_EncryptedDataEncryptionKey_vals[] = { { 0, "eciesNistP256" }, { 1, "eciesBrainpoolP256r1" }, { 0, NULL } }; static const oer_choice_t EncryptedDataEncryptionKey_choice[] = { - { 0, &hf_IEEE1609dot2_eciesNistP256_01, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_EciesP256EncryptedKey }, - { 1, &hf_IEEE1609dot2_eciesBrainpoolP256r1_01, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_EciesP256EncryptedKey }, + { 0, &hf_ieee1609dot2_eciesNistP256_01, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_EciesP256EncryptedKey }, + { 1, &hf_ieee1609dot2_eciesBrainpoolP256r1_01, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_EciesP256EncryptedKey }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_EncryptedDataEncryptionKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_EncryptedDataEncryptionKey(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_EncryptedDataEncryptionKey, EncryptedDataEncryptionKey_choice, + ett_ieee1609dot2_EncryptedDataEncryptionKey, EncryptedDataEncryptionKey_choice, NULL); return offset; @@ -1756,21 +1620,21 @@ dissect_IEEE1609dot2_EncryptedDataEncryptionKey(tvbuff_t *tvb _U_, int offset _U static const oer_sequence_t PKRecipientInfo_sequence[] = { - { &hf_IEEE1609dot2_recipientId, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_HashedId8 }, - { &hf_IEEE1609dot2_encKey_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_EncryptedDataEncryptionKey }, + { &hf_ieee1609dot2_recipientId, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_HashedId8 }, + { &hf_ieee1609dot2_encKey_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_EncryptedDataEncryptionKey }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_PKRecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_PKRecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_PKRecipientInfo, PKRecipientInfo_sequence); + ett_ieee1609dot2_PKRecipientInfo, PKRecipientInfo_sequence); return offset; } -static const value_string IEEE1609dot2_RecipientInfo_vals[] = { +static const value_string ieee1609dot2_RecipientInfo_vals[] = { { 0, "pskRecipInfo" }, { 1, "symmRecipInfo" }, { 2, "certRecipInfo" }, @@ -1780,18 +1644,18 @@ static const value_string IEEE1609dot2_RecipientInfo_vals[] = { }; static const oer_choice_t RecipientInfo_choice[] = { - { 0, &hf_IEEE1609dot2_pskRecipInfo, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_PreSharedKeyRecipientInfo }, - { 1, &hf_IEEE1609dot2_symmRecipInfo, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_SymmRecipientInfo }, - { 2, &hf_IEEE1609dot2_certRecipInfo, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_PKRecipientInfo }, - { 3, &hf_IEEE1609dot2_signedDataRecipInfo, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_PKRecipientInfo }, - { 4, &hf_IEEE1609dot2_rekRecipInfo, ASN1_NO_EXTENSIONS , dissect_IEEE1609dot2_PKRecipientInfo }, + { 0, &hf_ieee1609dot2_pskRecipInfo, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_PreSharedKeyRecipientInfo }, + { 1, &hf_ieee1609dot2_symmRecipInfo, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_SymmRecipientInfo }, + { 2, &hf_ieee1609dot2_certRecipInfo, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_PKRecipientInfo }, + { 3, &hf_ieee1609dot2_signedDataRecipInfo, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_PKRecipientInfo }, + { 4, &hf_ieee1609dot2_rekRecipInfo, ASN1_NO_EXTENSIONS , dissect_ieee1609dot2_PKRecipientInfo }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_RecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_RecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_RecipientInfo, RecipientInfo_choice, + ett_ieee1609dot2_RecipientInfo, RecipientInfo_choice, NULL); return offset; @@ -1799,34 +1663,34 @@ dissect_IEEE1609dot2_RecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static const oer_sequence_t SequenceOfRecipientInfo_sequence_of[1] = { - { &hf_IEEE1609dot2_SequenceOfRecipientInfo_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_RecipientInfo }, + { &hf_ieee1609dot2_SequenceOfRecipientInfo_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_RecipientInfo }, }; static int -dissect_IEEE1609dot2_SequenceOfRecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SequenceOfRecipientInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence_of(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SequenceOfRecipientInfo, SequenceOfRecipientInfo_sequence_of); + ett_ieee1609dot2_SequenceOfRecipientInfo, SequenceOfRecipientInfo_sequence_of); return offset; } static const oer_sequence_t EncryptedData_sequence[] = { - { &hf_IEEE1609dot2_recipients, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_SequenceOfRecipientInfo }, - { &hf_IEEE1609dot2_ciphertext, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_SymmetricCiphertext }, + { &hf_ieee1609dot2_recipients, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_SequenceOfRecipientInfo }, + { &hf_ieee1609dot2_ciphertext, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_SymmetricCiphertext }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_EncryptedData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_EncryptedData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_EncryptedData, EncryptedData_sequence); + ett_ieee1609dot2_EncryptedData, EncryptedData_sequence); return offset; } -static const value_string IEEE1609dot2_Ieee1609Dot2Content_vals[] = { +static const value_string ieee1609dot2_Ieee1609Dot2Content_vals[] = { { 0, "unsecuredData" }, { 1, "signedData" }, { 2, "encryptedData" }, @@ -1835,17 +1699,17 @@ static const value_string IEEE1609dot2_Ieee1609Dot2Content_vals[] = { }; static const oer_choice_t Ieee1609Dot2Content_choice[] = { - { 0, &hf_IEEE1609dot2_unsecuredData, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_Opaque }, - { 1, &hf_IEEE1609dot2_signedData, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_SignedData }, - { 2, &hf_IEEE1609dot2_encryptedData, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_EncryptedData }, - { 3, &hf_IEEE1609dot2_signedCertificateRequest, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_Opaque }, + { 0, &hf_ieee1609dot2_unsecuredData, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_Opaque }, + { 1, &hf_ieee1609dot2_signedData, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_SignedData }, + { 2, &hf_ieee1609dot2_encryptedData, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_EncryptedData }, + { 3, &hf_ieee1609dot2_signedCertificateRequest, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_Opaque }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_Ieee1609Dot2Content(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Ieee1609Dot2Content(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_Ieee1609Dot2Content, Ieee1609Dot2Content_choice, + ett_ieee1609dot2_Ieee1609Dot2Content, Ieee1609Dot2Content_choice, NULL); return offset; @@ -1853,34 +1717,34 @@ dissect_IEEE1609dot2_Ieee1609Dot2Content(tvbuff_t *tvb _U_, int offset _U_, asn1 static const oer_sequence_t Ieee1609Dot2Data_sequence[] = { - { &hf_IEEE1609dot2_protocolVersion, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Uint8 }, - { &hf_IEEE1609dot2_content, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_IEEE1609dot2_Ieee1609Dot2Content }, + { &hf_ieee1609dot2_protocolVersion, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Uint8 }, + { &hf_ieee1609dot2_content, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ieee1609dot2_Ieee1609Dot2Content }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_Ieee1609Dot2Data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_Ieee1609Dot2Data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_Ieee1609Dot2Data, Ieee1609Dot2Data_sequence); + ett_ieee1609dot2_Ieee1609Dot2Data, Ieee1609Dot2Data_sequence); return offset; } -static const value_string IEEE1609dot2_HashedData_vals[] = { +static const value_string ieee1609dot2_HashedData_vals[] = { { 0, "sha256HashedData" }, { 0, NULL } }; static const oer_choice_t HashedData_choice[] = { - { 0, &hf_IEEE1609dot2_sha256HashedData, ASN1_EXTENSION_ROOT , dissect_IEEE1609dot2_OCTET_STRING_SIZE_32 }, + { 0, &hf_ieee1609dot2_sha256HashedData, ASN1_EXTENSION_ROOT , dissect_ieee1609dot2_OCTET_STRING_SIZE_32 }, { 0, NULL, 0, NULL } }; static int -dissect_IEEE1609dot2_HashedData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_HashedData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_choice(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_HashedData, HashedData_choice, + ett_ieee1609dot2_HashedData, HashedData_choice, NULL); return offset; @@ -1888,42 +1752,15 @@ dissect_IEEE1609dot2_HashedData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static const oer_sequence_t SignedDataPayload_sequence[] = { - { &hf_IEEE1609dot2_data , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_Ieee1609Dot2Data }, - { &hf_IEEE1609dot2_extDataHash, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_IEEE1609dot2_HashedData }, + { &hf_ieee1609dot2_data , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_Ieee1609Dot2Data }, + { &hf_ieee1609dot2_extDataHash, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ieee1609dot2_HashedData }, { NULL, 0, 0, NULL } }; static int -dissect_IEEE1609dot2_SignedDataPayload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_ieee1609dot2_SignedDataPayload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_oer_sequence(tvb, offset, actx, tree, hf_index, - ett_IEEE1609dot2_SignedDataPayload, SignedDataPayload_sequence); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_Countersignature(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_Ieee1609Dot2Data(tvb, offset, actx, tree, hf_index); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_ImplicitCertificate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_CertificateBase(tvb, offset, actx, tree, hf_index); - - return offset; -} - - - -static int -dissect_IEEE1609dot2_ExplicitCertificate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_IEEE1609dot2_CertificateBase(tvb, offset, actx, tree, hf_index); + ett_ieee1609dot2_SignedDataPayload, SignedDataPayload_sequence); return offset; } @@ -1933,703 +1770,688 @@ dissect_IEEE1609dot2_ExplicitCertificate(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_Ieee1609Dot2Data_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_IEEE1609dot2_Ieee1609Dot2Data(tvb, offset, &asn1_ctx, tree, hf_IEEE1609dot2_Ieee1609Dot2Data_PDU); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_OER, TRUE, pinfo); + offset = dissect_ieee1609dot2_Ieee1609Dot2Data(tvb, offset, &asn1_ctx, tree, hf_ieee1609dot2_Ieee1609Dot2Data_PDU); return offset; } -/*--- End of included file: packet-IEEE1609dot2-fn.c ---*/ -#line 36 "./asn1/ieee1609dot2/packet-IEEE1609dot2-template.c" +/*--- End of included file: packet-ieee1609dot2-fn.c ---*/ +#line 36 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" -/*--- proto_register_IEEE1609dot2 ----------------------------------------------*/ -void proto_register_IEEE1609dot2(void) { +/*--- proto_register_ieee1609dot2 ----------------------------------------------*/ +void proto_register_ieee1609dot2(void) { /* List of fields */ static hf_register_info hf[] = { -/*--- Included file: packet-IEEE1609dot2-hfarr.c ---*/ -#line 1 "./asn1/ieee1609dot2/packet-IEEE1609dot2-hfarr.c" - { &hf_IEEE1609dot2_Ieee1609Dot2Data_PDU, - { "Ieee1609Dot2Data", "IEEE1609dot2.Ieee1609Dot2Data_element", +/*--- Included file: packet-ieee1609dot2-hfarr.c ---*/ +#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-hfarr.c" + { &hf_ieee1609dot2_Ieee1609Dot2Data_PDU, + { "Ieee1609Dot2Data", "ieee1609dot2.Ieee1609Dot2Data_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_SequenceOfUint3_item, - { "Uint3", "IEEE1609dot2.Uint3", - FT_UINT32, BASE_DEC, NULL, 0, - NULL, HFILL }}, - { &hf_IEEE1609dot2_SequenceOfUint8_item, - { "Uint8", "IEEE1609dot2.Uint8", + { &hf_ieee1609dot2_SequenceOfUint8_item, + { "Uint8", "ieee1609dot2.Uint8", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_SequenceOfUint16_item, - { "Uint16", "IEEE1609dot2.Uint16", + { &hf_ieee1609dot2_SequenceOfUint16_item, + { "Uint16", "ieee1609dot2.Uint16", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_start, - { "start", "IEEE1609dot2.start", + { &hf_ieee1609dot2_start, + { "start", "ieee1609dot2.start", FT_UINT32, BASE_DEC, NULL, 0, "Time32", HFILL }}, - { &hf_IEEE1609dot2_duration, - { "duration", "IEEE1609dot2.duration", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_Duration_vals), 0, + { &hf_ieee1609dot2_duration, + { "duration", "ieee1609dot2.duration", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_Duration_vals), 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_microseconds, - { "microseconds", "IEEE1609dot2.microseconds", + { &hf_ieee1609dot2_microseconds, + { "microseconds", "ieee1609dot2.microseconds", FT_UINT32, BASE_DEC, NULL, 0, "Uint16", HFILL }}, - { &hf_IEEE1609dot2_milliseconds, - { "milliseconds", "IEEE1609dot2.milliseconds", + { &hf_ieee1609dot2_milliseconds, + { "milliseconds", "ieee1609dot2.milliseconds", FT_UINT32, BASE_DEC, NULL, 0, "Uint16", HFILL }}, - { &hf_IEEE1609dot2_seconds, - { "seconds", "IEEE1609dot2.seconds", + { &hf_ieee1609dot2_seconds, + { "seconds", "ieee1609dot2.seconds", FT_UINT32, BASE_DEC, NULL, 0, "Uint16", HFILL }}, - { &hf_IEEE1609dot2_minutes, - { "minutes", "IEEE1609dot2.minutes", + { &hf_ieee1609dot2_minutes, + { "minutes", "ieee1609dot2.minutes", FT_UINT32, BASE_DEC, NULL, 0, "Uint16", HFILL }}, - { &hf_IEEE1609dot2_hours, - { "hours", "IEEE1609dot2.hours", + { &hf_ieee1609dot2_hours, + { "hours", "ieee1609dot2.hours", FT_UINT32, BASE_DEC, NULL, 0, "Uint16", HFILL }}, - { &hf_IEEE1609dot2_sixtyHours, - { "sixtyHours", "IEEE1609dot2.sixtyHours", + { &hf_ieee1609dot2_sixtyHours, + { "sixtyHours", "ieee1609dot2.sixtyHours", FT_UINT32, BASE_DEC, NULL, 0, "Uint16", HFILL }}, - { &hf_IEEE1609dot2_years, - { "years", "IEEE1609dot2.years", + { &hf_ieee1609dot2_years, + { "years", "ieee1609dot2.years", FT_UINT32, BASE_DEC, NULL, 0, "Uint16", HFILL }}, - { &hf_IEEE1609dot2_circularRegion, - { "circularRegion", "IEEE1609dot2.circularRegion_element", + { &hf_ieee1609dot2_circularRegion, + { "circularRegion", "ieee1609dot2.circularRegion_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_rectangularRegion, - { "rectangularRegion", "IEEE1609dot2.rectangularRegion", + { &hf_ieee1609dot2_rectangularRegion, + { "rectangularRegion", "ieee1609dot2.rectangularRegion", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfRectangularRegion", HFILL }}, - { &hf_IEEE1609dot2_polygonalRegion, - { "polygonalRegion", "IEEE1609dot2.polygonalRegion", + { &hf_ieee1609dot2_polygonalRegion, + { "polygonalRegion", "ieee1609dot2.polygonalRegion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_identifiedRegion, - { "identifiedRegion", "IEEE1609dot2.identifiedRegion", + { &hf_ieee1609dot2_identifiedRegion, + { "identifiedRegion", "ieee1609dot2.identifiedRegion", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfIdentifiedRegion", HFILL }}, - { &hf_IEEE1609dot2_center, - { "center", "IEEE1609dot2.center_element", + { &hf_ieee1609dot2_center, + { "center", "ieee1609dot2.center_element", FT_NONE, BASE_NONE, NULL, 0, "TwoDLocation", HFILL }}, - { &hf_IEEE1609dot2_radius, - { "radius", "IEEE1609dot2.radius", + { &hf_ieee1609dot2_radius, + { "radius", "ieee1609dot2.radius", FT_UINT32, BASE_DEC, NULL, 0, "Uint16", HFILL }}, - { &hf_IEEE1609dot2_northWest, - { "northWest", "IEEE1609dot2.northWest_element", + { &hf_ieee1609dot2_northWest, + { "northWest", "ieee1609dot2.northWest_element", FT_NONE, BASE_NONE, NULL, 0, "TwoDLocation", HFILL }}, - { &hf_IEEE1609dot2_southEast, - { "southEast", "IEEE1609dot2.southEast_element", + { &hf_ieee1609dot2_southEast, + { "southEast", "ieee1609dot2.southEast_element", FT_NONE, BASE_NONE, NULL, 0, "TwoDLocation", HFILL }}, - { &hf_IEEE1609dot2_SequenceOfRectangularRegion_item, - { "RectangularRegion", "IEEE1609dot2.RectangularRegion_element", + { &hf_ieee1609dot2_SequenceOfRectangularRegion_item, + { "RectangularRegion", "ieee1609dot2.RectangularRegion_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_PolygonalRegion_item, - { "TwoDLocation", "IEEE1609dot2.TwoDLocation_element", + { &hf_ieee1609dot2_PolygonalRegion_item, + { "TwoDLocation", "ieee1609dot2.TwoDLocation_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_latitude, - { "latitude", "IEEE1609dot2.latitude", - FT_INT32, BASE_DEC, VALS(IEEE1609dot2_NinetyDegreeInt_vals), 0, + { &hf_ieee1609dot2_latitude, + { "latitude", "ieee1609dot2.latitude", + FT_INT32, BASE_DEC, VALS(ieee1609dot2_NinetyDegreeInt_vals), 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_longitude, - { "longitude", "IEEE1609dot2.longitude", - FT_INT32, BASE_DEC, VALS(IEEE1609dot2_OneEightyDegreeInt_vals), 0, + { &hf_ieee1609dot2_longitude, + { "longitude", "ieee1609dot2.longitude", + FT_INT32, BASE_DEC, VALS(ieee1609dot2_OneEightyDegreeInt_vals), 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_countryOnly, - { "countryOnly", "IEEE1609dot2.countryOnly", + { &hf_ieee1609dot2_countryOnly, + { "countryOnly", "ieee1609dot2.countryOnly", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_countryAndRegions, - { "countryAndRegions", "IEEE1609dot2.countryAndRegions_element", + { &hf_ieee1609dot2_countryAndRegions, + { "countryAndRegions", "ieee1609dot2.countryAndRegions_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_countryAndSubregions, - { "countryAndSubregions", "IEEE1609dot2.countryAndSubregions_element", + { &hf_ieee1609dot2_countryAndSubregions, + { "countryAndSubregions", "ieee1609dot2.countryAndSubregions_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_SequenceOfIdentifiedRegion_item, - { "IdentifiedRegion", "IEEE1609dot2.IdentifiedRegion", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_IdentifiedRegion_vals), 0, + { &hf_ieee1609dot2_SequenceOfIdentifiedRegion_item, + { "IdentifiedRegion", "ieee1609dot2.IdentifiedRegion", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_IdentifiedRegion_vals), 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_regions, - { "regions", "IEEE1609dot2.regions", + { &hf_ieee1609dot2_regions, + { "regions", "ieee1609dot2.regions", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfUint8", HFILL }}, - { &hf_IEEE1609dot2_country, - { "country", "IEEE1609dot2.country", + { &hf_ieee1609dot2_country, + { "country", "ieee1609dot2.country", FT_UINT32, BASE_DEC, NULL, 0, "CountryOnly", HFILL }}, - { &hf_IEEE1609dot2_regionAndSubregions, - { "regionAndSubregions", "IEEE1609dot2.regionAndSubregions", + { &hf_ieee1609dot2_regionAndSubregions, + { "regionAndSubregions", "ieee1609dot2.regionAndSubregions", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfRegionAndSubregions", HFILL }}, - { &hf_IEEE1609dot2_region, - { "region", "IEEE1609dot2.region", + { &hf_ieee1609dot2_region, + { "region", "ieee1609dot2.region", FT_UINT32, BASE_DEC, NULL, 0, "Uint8", HFILL }}, - { &hf_IEEE1609dot2_subregions, - { "subregions", "IEEE1609dot2.subregions", + { &hf_ieee1609dot2_subregions, + { "subregions", "ieee1609dot2.subregions", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfUint16", HFILL }}, - { &hf_IEEE1609dot2_SequenceOfRegionAndSubregions_item, - { "RegionAndSubregions", "IEEE1609dot2.RegionAndSubregions_element", + { &hf_ieee1609dot2_SequenceOfRegionAndSubregions_item, + { "RegionAndSubregions", "ieee1609dot2.RegionAndSubregions_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_elevation, - { "elevation", "IEEE1609dot2.elevation", + { &hf_ieee1609dot2_elevation, + { "elevation", "ieee1609dot2.elevation", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_ecdsaNistP256Signature, - { "ecdsaNistP256Signature", "IEEE1609dot2.ecdsaNistP256Signature_element", + { &hf_ieee1609dot2_ecdsaNistP256Signature, + { "ecdsaNistP256Signature", "ieee1609dot2.ecdsaNistP256Signature_element", FT_NONE, BASE_NONE, NULL, 0, "EcdsaP256Signature", HFILL }}, - { &hf_IEEE1609dot2_ecdsaBrainpoolP256r1Signature, - { "ecdsaBrainpoolP256r1Signature", "IEEE1609dot2.ecdsaBrainpoolP256r1Signature_element", + { &hf_ieee1609dot2_ecdsaBrainpoolP256r1Signature, + { "ecdsaBrainpoolP256r1Signature", "ieee1609dot2.ecdsaBrainpoolP256r1Signature_element", FT_NONE, BASE_NONE, NULL, 0, "EcdsaP256Signature", HFILL }}, - { &hf_IEEE1609dot2_r, - { "r", "IEEE1609dot2.r", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_EccP256CurvePoint_vals), 0, + { &hf_ieee1609dot2_r, + { "r", "ieee1609dot2.r", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_EccP256CurvePoint_vals), 0, "EccP256CurvePoint", HFILL }}, - { &hf_IEEE1609dot2_s, - { "s", "IEEE1609dot2.s", + { &hf_ieee1609dot2_s, + { "s", "ieee1609dot2.s", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_32", HFILL }}, - { &hf_IEEE1609dot2_x_only, - { "x-only", "IEEE1609dot2.x_only", + { &hf_ieee1609dot2_x_only, + { "x-only", "ieee1609dot2.x_only", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_32", HFILL }}, - { &hf_IEEE1609dot2_fill, - { "fill", "IEEE1609dot2.fill_element", + { &hf_ieee1609dot2_fill, + { "fill", "ieee1609dot2.fill_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_compressed_y_0, - { "compressed-y-0", "IEEE1609dot2.compressed_y_0", + { &hf_ieee1609dot2_compressed_y_0, + { "compressed-y-0", "ieee1609dot2.compressed_y_0", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_32", HFILL }}, - { &hf_IEEE1609dot2_compressed_y_1, - { "compressed-y-1", "IEEE1609dot2.compressed_y_1", + { &hf_ieee1609dot2_compressed_y_1, + { "compressed-y-1", "ieee1609dot2.compressed_y_1", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_32", HFILL }}, - { &hf_IEEE1609dot2_uncompressed, - { "uncompressed", "IEEE1609dot2.uncompressed_element", + { &hf_ieee1609dot2_uncompressed, + { "uncompressed", "ieee1609dot2.uncompressed_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_x, - { "x", "IEEE1609dot2.x", + { &hf_ieee1609dot2_x, + { "x", "ieee1609dot2.x", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_32", HFILL }}, - { &hf_IEEE1609dot2_y, - { "y", "IEEE1609dot2.y", + { &hf_ieee1609dot2_y, + { "y", "ieee1609dot2.y", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_32", HFILL }}, - { &hf_IEEE1609dot2_v, - { "v", "IEEE1609dot2.v", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_EccP256CurvePoint_vals), 0, + { &hf_ieee1609dot2_v, + { "v", "ieee1609dot2.v", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_EccP256CurvePoint_vals), 0, "EccP256CurvePoint", HFILL }}, - { &hf_IEEE1609dot2_c, - { "c", "IEEE1609dot2.c", + { &hf_ieee1609dot2_c, + { "c", "ieee1609dot2.c", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_16", HFILL }}, - { &hf_IEEE1609dot2_t, - { "t", "IEEE1609dot2.t", + { &hf_ieee1609dot2_t, + { "t", "ieee1609dot2.t", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_16", HFILL }}, - { &hf_IEEE1609dot2_public, - { "public", "IEEE1609dot2.public_element", + { &hf_ieee1609dot2_public, + { "public", "ieee1609dot2.public_element", FT_NONE, BASE_NONE, NULL, 0, "PublicEncryptionKey", HFILL }}, - { &hf_IEEE1609dot2_symmetric, - { "symmetric", "IEEE1609dot2.symmetric", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_SymmetricEncryptionKey_vals), 0, + { &hf_ieee1609dot2_symmetric, + { "symmetric", "ieee1609dot2.symmetric", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_SymmetricEncryptionKey_vals), 0, "SymmetricEncryptionKey", HFILL }}, - { &hf_IEEE1609dot2_supportedSymmAlg, - { "supportedSymmAlg", "IEEE1609dot2.supportedSymmAlg", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_SymmAlgorithm_vals), 0, + { &hf_ieee1609dot2_supportedSymmAlg, + { "supportedSymmAlg", "ieee1609dot2.supportedSymmAlg", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_SymmAlgorithm_vals), 0, "SymmAlgorithm", HFILL }}, - { &hf_IEEE1609dot2_publicKey, - { "publicKey", "IEEE1609dot2.publicKey", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_BasePublicEncryptionKey_vals), 0, + { &hf_ieee1609dot2_publicKey, + { "publicKey", "ieee1609dot2.publicKey", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_BasePublicEncryptionKey_vals), 0, "BasePublicEncryptionKey", HFILL }}, - { &hf_IEEE1609dot2_eciesNistP256, - { "eciesNistP256", "IEEE1609dot2.eciesNistP256", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_EccP256CurvePoint_vals), 0, + { &hf_ieee1609dot2_eciesNistP256, + { "eciesNistP256", "ieee1609dot2.eciesNistP256", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_EccP256CurvePoint_vals), 0, "EccP256CurvePoint", HFILL }}, - { &hf_IEEE1609dot2_eciesBrainpoolP256r1, - { "eciesBrainpoolP256r1", "IEEE1609dot2.eciesBrainpoolP256r1", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_EccP256CurvePoint_vals), 0, + { &hf_ieee1609dot2_eciesBrainpoolP256r1, + { "eciesBrainpoolP256r1", "ieee1609dot2.eciesBrainpoolP256r1", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_EccP256CurvePoint_vals), 0, "EccP256CurvePoint", HFILL }}, - { &hf_IEEE1609dot2_ecdsaNistP256, - { "ecdsaNistP256", "IEEE1609dot2.ecdsaNistP256", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_EccP256CurvePoint_vals), 0, + { &hf_ieee1609dot2_ecdsaNistP256, + { "ecdsaNistP256", "ieee1609dot2.ecdsaNistP256", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_EccP256CurvePoint_vals), 0, "EccP256CurvePoint", HFILL }}, - { &hf_IEEE1609dot2_ecdsaBrainpoolP256r1, - { "ecdsaBrainpoolP256r1", "IEEE1609dot2.ecdsaBrainpoolP256r1", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_EccP256CurvePoint_vals), 0, + { &hf_ieee1609dot2_ecdsaBrainpoolP256r1, + { "ecdsaBrainpoolP256r1", "ieee1609dot2.ecdsaBrainpoolP256r1", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_EccP256CurvePoint_vals), 0, "EccP256CurvePoint", HFILL }}, - { &hf_IEEE1609dot2_aes128Ccm, - { "aes128Ccm", "IEEE1609dot2.aes128Ccm", + { &hf_ieee1609dot2_aes128Ccm, + { "aes128Ccm", "ieee1609dot2.aes128Ccm", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_16", HFILL }}, - { &hf_IEEE1609dot2_psid, - { "psid", "IEEE1609dot2.psid", + { &hf_ieee1609dot2_psid, + { "psid", "ieee1609dot2.psid", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_ssp, - { "ssp", "IEEE1609dot2.ssp", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_ServiceSpecificPermissions_vals), 0, + { &hf_ieee1609dot2_ssp, + { "ssp", "ieee1609dot2.ssp", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_ServiceSpecificPermissions_vals), 0, "ServiceSpecificPermissions", HFILL }}, - { &hf_IEEE1609dot2_SequenceOfPsidSsp_item, - { "PsidSsp", "IEEE1609dot2.PsidSsp_element", + { &hf_ieee1609dot2_SequenceOfPsidSsp_item, + { "PsidSsp", "ieee1609dot2.PsidSsp_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_SequenceOfPsid_item, - { "Psid", "IEEE1609dot2.Psid", - FT_UINT64, BASE_DEC, NULL, 0, - NULL, HFILL }}, - { &hf_IEEE1609dot2_opaque, - { "opaque", "IEEE1609dot2.opaque", + { &hf_ieee1609dot2_opaque, + { "opaque", "ieee1609dot2.opaque", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_0_MAX", HFILL }}, - { &hf_IEEE1609dot2_sspRange, - { "sspRange", "IEEE1609dot2.sspRange", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_SspRange_vals), 0, + { &hf_ieee1609dot2_sspRange, + { "sspRange", "ieee1609dot2.sspRange", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_SspRange_vals), 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_SequenceOfPsidSspRange_item, - { "PsidSspRange", "IEEE1609dot2.PsidSspRange_element", + { &hf_ieee1609dot2_SequenceOfPsidSspRange_item, + { "PsidSspRange", "ieee1609dot2.PsidSspRange_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_opaque_01, - { "opaque", "IEEE1609dot2.opaque", + { &hf_ieee1609dot2_opaque_01, + { "opaque", "ieee1609dot2.opaque", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfOctetString", HFILL }}, - { &hf_IEEE1609dot2_all, - { "all", "IEEE1609dot2.all_element", + { &hf_ieee1609dot2_all, + { "all", "ieee1609dot2.all_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_SequenceOfOctetString_item, - { "SequenceOfOctetString item", "IEEE1609dot2.SequenceOfOctetString_item", + { &hf_ieee1609dot2_SequenceOfOctetString_item, + { "SequenceOfOctetString item", "ieee1609dot2.SequenceOfOctetString_item", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_0_MAX", HFILL }}, - { &hf_IEEE1609dot2_jValue, - { "jValue", "IEEE1609dot2.jValue", + { &hf_ieee1609dot2_jValue, + { "jValue", "ieee1609dot2.jValue", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_4", HFILL }}, - { &hf_IEEE1609dot2_value, - { "value", "IEEE1609dot2.value", + { &hf_ieee1609dot2_value, + { "value", "ieee1609dot2.value", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_9", HFILL }}, - { &hf_IEEE1609dot2_data, - { "data", "IEEE1609dot2.data_element", + { &hf_ieee1609dot2_data, + { "data", "ieee1609dot2.data_element", FT_NONE, BASE_NONE, NULL, 0, "Ieee1609Dot2Data", HFILL }}, - { &hf_IEEE1609dot2_extDataHash, - { "extDataHash", "IEEE1609dot2.extDataHash", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_HashedData_vals), 0, + { &hf_ieee1609dot2_extDataHash, + { "extDataHash", "ieee1609dot2.extDataHash", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_HashedData_vals), 0, "HashedData", HFILL }}, - { &hf_IEEE1609dot2_protocolVersion, - { "protocolVersion", "IEEE1609dot2.protocolVersion", + { &hf_ieee1609dot2_protocolVersion, + { "protocolVersion", "ieee1609dot2.protocolVersion", FT_UINT32, BASE_DEC, NULL, 0, "Uint8", HFILL }}, - { &hf_IEEE1609dot2_content, - { "content", "IEEE1609dot2.content", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_Ieee1609Dot2Content_vals), 0, + { &hf_ieee1609dot2_content, + { "content", "ieee1609dot2.content", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_Ieee1609Dot2Content_vals), 0, "Ieee1609Dot2Content", HFILL }}, - { &hf_IEEE1609dot2_unsecuredData, - { "unsecuredData", "IEEE1609dot2.unsecuredData", + { &hf_ieee1609dot2_unsecuredData, + { "unsecuredData", "ieee1609dot2.unsecuredData", FT_BYTES, BASE_NONE, NULL, 0, "Opaque", HFILL }}, - { &hf_IEEE1609dot2_signedData, - { "signedData", "IEEE1609dot2.signedData_element", + { &hf_ieee1609dot2_signedData, + { "signedData", "ieee1609dot2.signedData_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_encryptedData, - { "encryptedData", "IEEE1609dot2.encryptedData_element", + { &hf_ieee1609dot2_encryptedData, + { "encryptedData", "ieee1609dot2.encryptedData_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_signedCertificateRequest, - { "signedCertificateRequest", "IEEE1609dot2.signedCertificateRequest", + { &hf_ieee1609dot2_signedCertificateRequest, + { "signedCertificateRequest", "ieee1609dot2.signedCertificateRequest", FT_BYTES, BASE_NONE, NULL, 0, "Opaque", HFILL }}, - { &hf_IEEE1609dot2_hashId, - { "hashId", "IEEE1609dot2.hashId", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_HashAlgorithm_vals), 0, + { &hf_ieee1609dot2_hashId, + { "hashId", "ieee1609dot2.hashId", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_HashAlgorithm_vals), 0, "HashAlgorithm", HFILL }}, - { &hf_IEEE1609dot2_tbsData, - { "tbsData", "IEEE1609dot2.tbsData_element", + { &hf_ieee1609dot2_tbsData, + { "tbsData", "ieee1609dot2.tbsData_element", FT_NONE, BASE_NONE, NULL, 0, "ToBeSignedData", HFILL }}, - { &hf_IEEE1609dot2_signer, - { "signer", "IEEE1609dot2.signer", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_SignerIdentifier_vals), 0, + { &hf_ieee1609dot2_signer, + { "signer", "ieee1609dot2.signer", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_SignerIdentifier_vals), 0, "SignerIdentifier", HFILL }}, - { &hf_IEEE1609dot2_signature, - { "signature", "IEEE1609dot2.signature", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_Signature_vals), 0, + { &hf_ieee1609dot2_signature, + { "signature", "ieee1609dot2.signature", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_Signature_vals), 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_digest, - { "digest", "IEEE1609dot2.digest", + { &hf_ieee1609dot2_digest, + { "digest", "ieee1609dot2.digest", FT_BYTES, BASE_NONE, NULL, 0, "HashedId8", HFILL }}, - { &hf_IEEE1609dot2_certificate, - { "certificate", "IEEE1609dot2.certificate", + { &hf_ieee1609dot2_certificate, + { "certificate", "ieee1609dot2.certificate", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfCertificate", HFILL }}, - { &hf_IEEE1609dot2_self, - { "self", "IEEE1609dot2.self_element", + { &hf_ieee1609dot2_self, + { "self", "ieee1609dot2.self_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_payload, - { "payload", "IEEE1609dot2.payload_element", + { &hf_ieee1609dot2_payload, + { "payload", "ieee1609dot2.payload_element", FT_NONE, BASE_NONE, NULL, 0, "SignedDataPayload", HFILL }}, - { &hf_IEEE1609dot2_headerInfo, - { "headerInfo", "IEEE1609dot2.headerInfo_element", + { &hf_ieee1609dot2_headerInfo, + { "headerInfo", "ieee1609dot2.headerInfo_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_sha256HashedData, - { "sha256HashedData", "IEEE1609dot2.sha256HashedData", + { &hf_ieee1609dot2_sha256HashedData, + { "sha256HashedData", "ieee1609dot2.sha256HashedData", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_32", HFILL }}, - { &hf_IEEE1609dot2_generationTime, - { "generationTime", "IEEE1609dot2.generationTime", + { &hf_ieee1609dot2_generationTime, + { "generationTime", "ieee1609dot2.generationTime", FT_UINT64, BASE_DEC, NULL, 0, "Time64", HFILL }}, - { &hf_IEEE1609dot2_expiryTime, - { "expiryTime", "IEEE1609dot2.expiryTime", + { &hf_ieee1609dot2_expiryTime, + { "expiryTime", "ieee1609dot2.expiryTime", FT_UINT64, BASE_DEC, NULL, 0, "Time64", HFILL }}, - { &hf_IEEE1609dot2_generationLocation, - { "generationLocation", "IEEE1609dot2.generationLocation_element", + { &hf_ieee1609dot2_generationLocation, + { "generationLocation", "ieee1609dot2.generationLocation_element", FT_NONE, BASE_NONE, NULL, 0, "ThreeDLocation", HFILL }}, - { &hf_IEEE1609dot2_p2pcdLearningRequest, - { "p2pcdLearningRequest", "IEEE1609dot2.p2pcdLearningRequest", + { &hf_ieee1609dot2_p2pcdLearningRequest, + { "p2pcdLearningRequest", "ieee1609dot2.p2pcdLearningRequest", FT_BYTES, BASE_NONE, NULL, 0, "HashedId3", HFILL }}, - { &hf_IEEE1609dot2_missingCrlIdentifier, - { "missingCrlIdentifier", "IEEE1609dot2.missingCrlIdentifier_element", + { &hf_ieee1609dot2_missingCrlIdentifier, + { "missingCrlIdentifier", "ieee1609dot2.missingCrlIdentifier_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_encryptionKey, - { "encryptionKey", "IEEE1609dot2.encryptionKey", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_EncryptionKey_vals), 0, + { &hf_ieee1609dot2_encryptionKey, + { "encryptionKey", "ieee1609dot2.encryptionKey", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_EncryptionKey_vals), 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_cracaId, - { "cracaId", "IEEE1609dot2.cracaId", + { &hf_ieee1609dot2_cracaId, + { "cracaId", "ieee1609dot2.cracaId", FT_BYTES, BASE_NONE, NULL, 0, "HashedId3", HFILL }}, - { &hf_IEEE1609dot2_crlSeries, - { "crlSeries", "IEEE1609dot2.crlSeries", + { &hf_ieee1609dot2_crlSeries, + { "crlSeries", "ieee1609dot2.crlSeries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_recipients, - { "recipients", "IEEE1609dot2.recipients", + { &hf_ieee1609dot2_recipients, + { "recipients", "ieee1609dot2.recipients", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfRecipientInfo", HFILL }}, - { &hf_IEEE1609dot2_ciphertext, - { "ciphertext", "IEEE1609dot2.ciphertext", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_SymmetricCiphertext_vals), 0, + { &hf_ieee1609dot2_ciphertext, + { "ciphertext", "ieee1609dot2.ciphertext", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_SymmetricCiphertext_vals), 0, "SymmetricCiphertext", HFILL }}, - { &hf_IEEE1609dot2_pskRecipInfo, - { "pskRecipInfo", "IEEE1609dot2.pskRecipInfo", + { &hf_ieee1609dot2_pskRecipInfo, + { "pskRecipInfo", "ieee1609dot2.pskRecipInfo", FT_BYTES, BASE_NONE, NULL, 0, "PreSharedKeyRecipientInfo", HFILL }}, - { &hf_IEEE1609dot2_symmRecipInfo, - { "symmRecipInfo", "IEEE1609dot2.symmRecipInfo_element", + { &hf_ieee1609dot2_symmRecipInfo, + { "symmRecipInfo", "ieee1609dot2.symmRecipInfo_element", FT_NONE, BASE_NONE, NULL, 0, "SymmRecipientInfo", HFILL }}, - { &hf_IEEE1609dot2_certRecipInfo, - { "certRecipInfo", "IEEE1609dot2.certRecipInfo_element", + { &hf_ieee1609dot2_certRecipInfo, + { "certRecipInfo", "ieee1609dot2.certRecipInfo_element", FT_NONE, BASE_NONE, NULL, 0, "PKRecipientInfo", HFILL }}, - { &hf_IEEE1609dot2_signedDataRecipInfo, - { "signedDataRecipInfo", "IEEE1609dot2.signedDataRecipInfo_element", + { &hf_ieee1609dot2_signedDataRecipInfo, + { "signedDataRecipInfo", "ieee1609dot2.signedDataRecipInfo_element", FT_NONE, BASE_NONE, NULL, 0, "PKRecipientInfo", HFILL }}, - { &hf_IEEE1609dot2_rekRecipInfo, - { "rekRecipInfo", "IEEE1609dot2.rekRecipInfo_element", + { &hf_ieee1609dot2_rekRecipInfo, + { "rekRecipInfo", "ieee1609dot2.rekRecipInfo_element", FT_NONE, BASE_NONE, NULL, 0, "PKRecipientInfo", HFILL }}, - { &hf_IEEE1609dot2_SequenceOfRecipientInfo_item, - { "RecipientInfo", "IEEE1609dot2.RecipientInfo", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_RecipientInfo_vals), 0, + { &hf_ieee1609dot2_SequenceOfRecipientInfo_item, + { "RecipientInfo", "ieee1609dot2.RecipientInfo", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_RecipientInfo_vals), 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_recipientId, - { "recipientId", "IEEE1609dot2.recipientId", + { &hf_ieee1609dot2_recipientId, + { "recipientId", "ieee1609dot2.recipientId", FT_BYTES, BASE_NONE, NULL, 0, "HashedId8", HFILL }}, - { &hf_IEEE1609dot2_encKey, - { "encKey", "IEEE1609dot2.encKey", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_SymmetricCiphertext_vals), 0, + { &hf_ieee1609dot2_encKey, + { "encKey", "ieee1609dot2.encKey", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_SymmetricCiphertext_vals), 0, "SymmetricCiphertext", HFILL }}, - { &hf_IEEE1609dot2_encKey_01, - { "encKey", "IEEE1609dot2.encKey", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_EncryptedDataEncryptionKey_vals), 0, + { &hf_ieee1609dot2_encKey_01, + { "encKey", "ieee1609dot2.encKey", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_EncryptedDataEncryptionKey_vals), 0, "EncryptedDataEncryptionKey", HFILL }}, - { &hf_IEEE1609dot2_eciesNistP256_01, - { "eciesNistP256", "IEEE1609dot2.eciesNistP256_element", + { &hf_ieee1609dot2_eciesNistP256_01, + { "eciesNistP256", "ieee1609dot2.eciesNistP256_element", FT_NONE, BASE_NONE, NULL, 0, "EciesP256EncryptedKey", HFILL }}, - { &hf_IEEE1609dot2_eciesBrainpoolP256r1_01, - { "eciesBrainpoolP256r1", "IEEE1609dot2.eciesBrainpoolP256r1_element", + { &hf_ieee1609dot2_eciesBrainpoolP256r1_01, + { "eciesBrainpoolP256r1", "ieee1609dot2.eciesBrainpoolP256r1_element", FT_NONE, BASE_NONE, NULL, 0, "EciesP256EncryptedKey", HFILL }}, - { &hf_IEEE1609dot2_aes128ccm, - { "aes128ccm", "IEEE1609dot2.aes128ccm_element", + { &hf_ieee1609dot2_aes128ccm, + { "aes128ccm", "ieee1609dot2.aes128ccm_element", FT_NONE, BASE_NONE, NULL, 0, "AesCcmCiphertext", HFILL }}, - { &hf_IEEE1609dot2_nonce, - { "nonce", "IEEE1609dot2.nonce", + { &hf_ieee1609dot2_nonce, + { "nonce", "ieee1609dot2.nonce", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_12", HFILL }}, - { &hf_IEEE1609dot2_ccmCiphertext, - { "ccmCiphertext", "IEEE1609dot2.ccmCiphertext", + { &hf_ieee1609dot2_ccmCiphertext, + { "ccmCiphertext", "ieee1609dot2.ccmCiphertext", FT_BYTES, BASE_NONE, NULL, 0, "Opaque", HFILL }}, - { &hf_IEEE1609dot2_SequenceOfCertificate_item, - { "Certificate", "IEEE1609dot2.Certificate_element", + { &hf_ieee1609dot2_SequenceOfCertificate_item, + { "Certificate", "ieee1609dot2.Certificate_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_version, - { "version", "IEEE1609dot2.version", + { &hf_ieee1609dot2_version, + { "version", "ieee1609dot2.version", FT_UINT32, BASE_DEC, NULL, 0, "Uint8", HFILL }}, - { &hf_IEEE1609dot2_type, - { "type", "IEEE1609dot2.type", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_CertificateType_vals), 0, + { &hf_ieee1609dot2_type, + { "type", "ieee1609dot2.type", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_CertificateType_vals), 0, "CertificateType", HFILL }}, - { &hf_IEEE1609dot2_issuer, - { "issuer", "IEEE1609dot2.issuer", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_IssuerIdentifier_vals), 0, + { &hf_ieee1609dot2_issuer, + { "issuer", "ieee1609dot2.issuer", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_IssuerIdentifier_vals), 0, "IssuerIdentifier", HFILL }}, - { &hf_IEEE1609dot2_toBeSigned, - { "toBeSigned", "IEEE1609dot2.toBeSigned_element", + { &hf_ieee1609dot2_toBeSigned, + { "toBeSigned", "ieee1609dot2.toBeSigned_element", FT_NONE, BASE_NONE, NULL, 0, "ToBeSignedCertificate", HFILL }}, - { &hf_IEEE1609dot2_sha256AndDigest, - { "sha256AndDigest", "IEEE1609dot2.sha256AndDigest", + { &hf_ieee1609dot2_sha256AndDigest, + { "sha256AndDigest", "ieee1609dot2.sha256AndDigest", FT_BYTES, BASE_NONE, NULL, 0, "HashedId8", HFILL }}, - { &hf_IEEE1609dot2_self_01, - { "self", "IEEE1609dot2.self", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_HashAlgorithm_vals), 0, + { &hf_ieee1609dot2_self_01, + { "self", "ieee1609dot2.self", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_HashAlgorithm_vals), 0, "HashAlgorithm", HFILL }}, - { &hf_IEEE1609dot2_id, - { "id", "IEEE1609dot2.id", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_CertificateId_vals), 0, + { &hf_ieee1609dot2_id, + { "id", "ieee1609dot2.id", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_CertificateId_vals), 0, "CertificateId", HFILL }}, - { &hf_IEEE1609dot2_validityPeriod, - { "validityPeriod", "IEEE1609dot2.validityPeriod_element", + { &hf_ieee1609dot2_validityPeriod, + { "validityPeriod", "ieee1609dot2.validityPeriod_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_region_01, - { "region", "IEEE1609dot2.region", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_GeographicRegion_vals), 0, + { &hf_ieee1609dot2_region_01, + { "region", "ieee1609dot2.region", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_GeographicRegion_vals), 0, "GeographicRegion", HFILL }}, - { &hf_IEEE1609dot2_assuranceLevel, - { "assuranceLevel", "IEEE1609dot2.assuranceLevel", + { &hf_ieee1609dot2_assuranceLevel, + { "assuranceLevel", "ieee1609dot2.assuranceLevel", FT_BYTES, BASE_NONE, NULL, 0, "SubjectAssurance", HFILL }}, - { &hf_IEEE1609dot2_appPermissions, - { "appPermissions", "IEEE1609dot2.appPermissions", + { &hf_ieee1609dot2_appPermissions, + { "appPermissions", "ieee1609dot2.appPermissions", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfPsidSsp", HFILL }}, - { &hf_IEEE1609dot2_certIssuePermissions, - { "certIssuePermissions", "IEEE1609dot2.certIssuePermissions", + { &hf_ieee1609dot2_certIssuePermissions, + { "certIssuePermissions", "ieee1609dot2.certIssuePermissions", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfPsidGroupPermissions", HFILL }}, - { &hf_IEEE1609dot2_certRequestPermissions, - { "certRequestPermissions", "IEEE1609dot2.certRequestPermissions", + { &hf_ieee1609dot2_certRequestPermissions, + { "certRequestPermissions", "ieee1609dot2.certRequestPermissions", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfPsidGroupPermissions", HFILL }}, - { &hf_IEEE1609dot2_canRequestRollover, - { "canRequestRollover", "IEEE1609dot2.canRequestRollover_element", + { &hf_ieee1609dot2_canRequestRollover, + { "canRequestRollover", "ieee1609dot2.canRequestRollover_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_encryptionKey_01, - { "encryptionKey", "IEEE1609dot2.encryptionKey_element", + { &hf_ieee1609dot2_encryptionKey_01, + { "encryptionKey", "ieee1609dot2.encryptionKey_element", FT_NONE, BASE_NONE, NULL, 0, "PublicEncryptionKey", HFILL }}, - { &hf_IEEE1609dot2_verifyKeyIndicator, - { "verifyKeyIndicator", "IEEE1609dot2.verifyKeyIndicator", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_VerificationKeyIndicator_vals), 0, + { &hf_ieee1609dot2_verifyKeyIndicator, + { "verifyKeyIndicator", "ieee1609dot2.verifyKeyIndicator", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_VerificationKeyIndicator_vals), 0, "VerificationKeyIndicator", HFILL }}, - { &hf_IEEE1609dot2_linkageData, - { "linkageData", "IEEE1609dot2.linkageData_element", + { &hf_ieee1609dot2_linkageData, + { "linkageData", "ieee1609dot2.linkageData_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_name, - { "name", "IEEE1609dot2.name", + { &hf_ieee1609dot2_name, + { "name", "ieee1609dot2.name", FT_STRING, BASE_NONE, NULL, 0, "Hostname", HFILL }}, - { &hf_IEEE1609dot2_binaryId, - { "binaryId", "IEEE1609dot2.binaryId", + { &hf_ieee1609dot2_binaryId, + { "binaryId", "ieee1609dot2.binaryId", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_1_64", HFILL }}, - { &hf_IEEE1609dot2_none, - { "none", "IEEE1609dot2.none_element", + { &hf_ieee1609dot2_none, + { "none", "ieee1609dot2.none_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_iCert, - { "iCert", "IEEE1609dot2.iCert", + { &hf_ieee1609dot2_iCert, + { "iCert", "ieee1609dot2.iCert", FT_UINT32, BASE_DEC, NULL, 0, "IValue", HFILL }}, - { &hf_IEEE1609dot2_linkage_value, - { "linkage-value", "IEEE1609dot2.linkage_value", + { &hf_ieee1609dot2_linkage_value, + { "linkage-value", "ieee1609dot2.linkage_value", FT_BYTES, BASE_NONE, NULL, 0, "LinkageValue", HFILL }}, - { &hf_IEEE1609dot2_group_linkage_value, - { "group-linkage-value", "IEEE1609dot2.group_linkage_value_element", + { &hf_ieee1609dot2_group_linkage_value, + { "group-linkage-value", "ieee1609dot2.group_linkage_value_element", FT_NONE, BASE_NONE, NULL, 0, "GroupLinkageValue", HFILL }}, - { &hf_IEEE1609dot2_appPermissions_01, - { "appPermissions", "IEEE1609dot2.appPermissions", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_SubjectPermissions_vals), 0, + { &hf_ieee1609dot2_appPermissions_01, + { "appPermissions", "ieee1609dot2.appPermissions", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_SubjectPermissions_vals), 0, "SubjectPermissions", HFILL }}, - { &hf_IEEE1609dot2_minChainDepth, - { "minChainDepth", "IEEE1609dot2.minChainDepth", + { &hf_ieee1609dot2_minChainDepth, + { "minChainDepth", "ieee1609dot2.minChainDepth", FT_INT32, BASE_DEC, NULL, 0, "INTEGER", HFILL }}, - { &hf_IEEE1609dot2_chainDepthRange, - { "chainDepthRange", "IEEE1609dot2.chainDepthRange", + { &hf_ieee1609dot2_chainDepthRange, + { "chainDepthRange", "ieee1609dot2.chainDepthRange", FT_INT32, BASE_DEC, NULL, 0, "INTEGER", HFILL }}, - { &hf_IEEE1609dot2_eeType, - { "eeType", "IEEE1609dot2.eeType", + { &hf_ieee1609dot2_eeType, + { "eeType", "ieee1609dot2.eeType", FT_BYTES, BASE_NONE, NULL, 0, "EndEntityType", HFILL }}, - { &hf_IEEE1609dot2_SequenceOfPsidGroupPermissions_item, - { "PsidGroupPermissions", "IEEE1609dot2.PsidGroupPermissions_element", + { &hf_ieee1609dot2_SequenceOfPsidGroupPermissions_item, + { "PsidGroupPermissions", "ieee1609dot2.PsidGroupPermissions_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_IEEE1609dot2_explicit, - { "explicit", "IEEE1609dot2.explicit", + { &hf_ieee1609dot2_explicit, + { "explicit", "ieee1609dot2.explicit", FT_UINT32, BASE_DEC, NULL, 0, "SequenceOfPsidSspRange", HFILL }}, - { &hf_IEEE1609dot2_verificationKey, - { "verificationKey", "IEEE1609dot2.verificationKey", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_PublicVerificationKey_vals), 0, + { &hf_ieee1609dot2_verificationKey, + { "verificationKey", "ieee1609dot2.verificationKey", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_PublicVerificationKey_vals), 0, "PublicVerificationKey", HFILL }}, - { &hf_IEEE1609dot2_reconstructionValue, - { "reconstructionValue", "IEEE1609dot2.reconstructionValue", - FT_UINT32, BASE_DEC, VALS(IEEE1609dot2_EccP256CurvePoint_vals), 0, + { &hf_ieee1609dot2_reconstructionValue, + { "reconstructionValue", "ieee1609dot2.reconstructionValue", + FT_UINT32, BASE_DEC, VALS(ieee1609dot2_EccP256CurvePoint_vals), 0, "EccP256CurvePoint", HFILL }}, - //{ &hf_IEEE1609dot2_EndEntityType_app, - // { "app", "IEEE1609dot2.app", - // FT_BOOLEAN, 8, NULL, 0x80, - // NULL, HFILL }}, - //{ &hf_IEEE1609dot2_EndEntityType_enrol, - // { "enrol", "IEEE1609dot2.enrol", - // FT_BOOLEAN, 8, NULL, 0x40, - // NULL, HFILL }}, - -/*--- End of included file: packet-IEEE1609dot2-hfarr.c ---*/ -#line 44 "./asn1/ieee1609dot2/packet-IEEE1609dot2-template.c" + { &hf_ieee1609dot2_EndEntityType_app, + { "app", "ieee1609dot2.app", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_ieee1609dot2_EndEntityType_enrol, + { "enrol", "ieee1609dot2.enrol", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + +/*--- End of included file: packet-ieee1609dot2-hfarr.c ---*/ +#line 44 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" }; /* List of subtrees */ static gint *ett[] = { -/*--- Included file: packet-IEEE1609dot2-ettarr.c ---*/ -#line 1 "./asn1/ieee1609dot2/packet-IEEE1609dot2-ettarr.c" - &ett_IEEE1609dot2_SequenceOfUint3, - &ett_IEEE1609dot2_SequenceOfUint8, - &ett_IEEE1609dot2_SequenceOfUint16, - &ett_IEEE1609dot2_ValidityPeriod, - &ett_IEEE1609dot2_Duration, - &ett_IEEE1609dot2_GeographicRegion, - &ett_IEEE1609dot2_CircularRegion, - &ett_IEEE1609dot2_RectangularRegion, - &ett_IEEE1609dot2_SequenceOfRectangularRegion, - &ett_IEEE1609dot2_PolygonalRegion, - &ett_IEEE1609dot2_TwoDLocation, - &ett_IEEE1609dot2_IdentifiedRegion, - &ett_IEEE1609dot2_SequenceOfIdentifiedRegion, - &ett_IEEE1609dot2_CountryAndRegions, - &ett_IEEE1609dot2_CountryAndSubregions, - &ett_IEEE1609dot2_RegionAndSubregions, - &ett_IEEE1609dot2_SequenceOfRegionAndSubregions, - &ett_IEEE1609dot2_ThreeDLocation, - &ett_IEEE1609dot2_Signature, - &ett_IEEE1609dot2_EcdsaP256Signature, - &ett_IEEE1609dot2_EccP256CurvePoint, - &ett_IEEE1609dot2_T_uncompressed, - &ett_IEEE1609dot2_EciesP256EncryptedKey, - &ett_IEEE1609dot2_EncryptionKey, - &ett_IEEE1609dot2_PublicEncryptionKey, - &ett_IEEE1609dot2_BasePublicEncryptionKey, - &ett_IEEE1609dot2_PublicVerificationKey, - &ett_IEEE1609dot2_SymmetricEncryptionKey, - &ett_IEEE1609dot2_PsidSsp, - &ett_IEEE1609dot2_SequenceOfPsidSsp, - &ett_IEEE1609dot2_SequenceOfPsid, - &ett_IEEE1609dot2_ServiceSpecificPermissions, - &ett_IEEE1609dot2_PsidSspRange, - &ett_IEEE1609dot2_SequenceOfPsidSspRange, - &ett_IEEE1609dot2_SspRange, - &ett_IEEE1609dot2_SequenceOfOctetString, - &ett_IEEE1609dot2_GroupLinkageValue, - &ett_IEEE1609dot2_SignedDataPayload, - &ett_IEEE1609dot2_Ieee1609Dot2Data, - &ett_IEEE1609dot2_Ieee1609Dot2Content, - &ett_IEEE1609dot2_SignedData, - &ett_IEEE1609dot2_SignerIdentifier, - &ett_IEEE1609dot2_ToBeSignedData, - &ett_IEEE1609dot2_HashedData, - &ett_IEEE1609dot2_HeaderInfo, - &ett_IEEE1609dot2_MissingCrlIdentifier, - &ett_IEEE1609dot2_EncryptedData, - &ett_IEEE1609dot2_RecipientInfo, - &ett_IEEE1609dot2_SequenceOfRecipientInfo, - &ett_IEEE1609dot2_SymmRecipientInfo, - &ett_IEEE1609dot2_PKRecipientInfo, - &ett_IEEE1609dot2_EncryptedDataEncryptionKey, - &ett_IEEE1609dot2_SymmetricCiphertext, - &ett_IEEE1609dot2_AesCcmCiphertext, - &ett_IEEE1609dot2_SequenceOfCertificate, - &ett_IEEE1609dot2_CertificateBase, - &ett_IEEE1609dot2_IssuerIdentifier, - &ett_IEEE1609dot2_ToBeSignedCertificate, - &ett_IEEE1609dot2_CertificateId, - &ett_IEEE1609dot2_LinkageData, - &ett_IEEE1609dot2_EndEntityType, - &ett_IEEE1609dot2_PsidGroupPermissions, - &ett_IEEE1609dot2_SequenceOfPsidGroupPermissions, - &ett_IEEE1609dot2_SubjectPermissions, - &ett_IEEE1609dot2_VerificationKeyIndicator, - -/*--- End of included file: packet-IEEE1609dot2-ettarr.c ---*/ -#line 49 "./asn1/ieee1609dot2/packet-IEEE1609dot2-template.c" +/*--- Included file: packet-ieee1609dot2-ettarr.c ---*/ +#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-ettarr.c" + &ett_ieee1609dot2_SequenceOfUint8, + &ett_ieee1609dot2_SequenceOfUint16, + &ett_ieee1609dot2_ValidityPeriod, + &ett_ieee1609dot2_Duration, + &ett_ieee1609dot2_GeographicRegion, + &ett_ieee1609dot2_CircularRegion, + &ett_ieee1609dot2_RectangularRegion, + &ett_ieee1609dot2_SequenceOfRectangularRegion, + &ett_ieee1609dot2_PolygonalRegion, + &ett_ieee1609dot2_TwoDLocation, + &ett_ieee1609dot2_IdentifiedRegion, + &ett_ieee1609dot2_SequenceOfIdentifiedRegion, + &ett_ieee1609dot2_CountryAndRegions, + &ett_ieee1609dot2_CountryAndSubregions, + &ett_ieee1609dot2_RegionAndSubregions, + &ett_ieee1609dot2_SequenceOfRegionAndSubregions, + &ett_ieee1609dot2_ThreeDLocation, + &ett_ieee1609dot2_Signature, + &ett_ieee1609dot2_EcdsaP256Signature, + &ett_ieee1609dot2_EccP256CurvePoint, + &ett_ieee1609dot2_T_uncompressed, + &ett_ieee1609dot2_EciesP256EncryptedKey, + &ett_ieee1609dot2_EncryptionKey, + &ett_ieee1609dot2_PublicEncryptionKey, + &ett_ieee1609dot2_BasePublicEncryptionKey, + &ett_ieee1609dot2_PublicVerificationKey, + &ett_ieee1609dot2_SymmetricEncryptionKey, + &ett_ieee1609dot2_PsidSsp, + &ett_ieee1609dot2_SequenceOfPsidSsp, + &ett_ieee1609dot2_ServiceSpecificPermissions, + &ett_ieee1609dot2_PsidSspRange, + &ett_ieee1609dot2_SequenceOfPsidSspRange, + &ett_ieee1609dot2_SspRange, + &ett_ieee1609dot2_SequenceOfOctetString, + &ett_ieee1609dot2_GroupLinkageValue, + &ett_ieee1609dot2_SignedDataPayload, + &ett_ieee1609dot2_Ieee1609Dot2Data, + &ett_ieee1609dot2_Ieee1609Dot2Content, + &ett_ieee1609dot2_SignedData, + &ett_ieee1609dot2_SignerIdentifier, + &ett_ieee1609dot2_ToBeSignedData, + &ett_ieee1609dot2_HashedData, + &ett_ieee1609dot2_HeaderInfo, + &ett_ieee1609dot2_MissingCrlIdentifier, + &ett_ieee1609dot2_EncryptedData, + &ett_ieee1609dot2_RecipientInfo, + &ett_ieee1609dot2_SequenceOfRecipientInfo, + &ett_ieee1609dot2_SymmRecipientInfo, + &ett_ieee1609dot2_PKRecipientInfo, + &ett_ieee1609dot2_EncryptedDataEncryptionKey, + &ett_ieee1609dot2_SymmetricCiphertext, + &ett_ieee1609dot2_AesCcmCiphertext, + &ett_ieee1609dot2_SequenceOfCertificate, + &ett_ieee1609dot2_CertificateBase, + &ett_ieee1609dot2_IssuerIdentifier, + &ett_ieee1609dot2_ToBeSignedCertificate, + &ett_ieee1609dot2_CertificateId, + &ett_ieee1609dot2_LinkageData, + &ett_ieee1609dot2_EndEntityType, + &ett_ieee1609dot2_PsidGroupPermissions, + &ett_ieee1609dot2_SequenceOfPsidGroupPermissions, + &ett_ieee1609dot2_SubjectPermissions, + &ett_ieee1609dot2_VerificationKeyIndicator, + +/*--- End of included file: packet-ieee1609dot2-ettarr.c ---*/ +#line 49 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" }; /* Register protocol */ - proto_IEEE1609dot2 = proto_register_protocol(PNAME, PSNAME, PFNAME); + proto_ieee1609dot2 = proto_register_protocol(PNAME, PSNAME, PFNAME); /* Register fields and subtrees */ - proto_register_field_array(proto_IEEE1609dot2, hf, array_length(hf)); + proto_register_field_array(proto_ieee1609dot2, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("IEEE1609dot2.data", dissect_Ieee1609Dot2Data_PDU, proto_IEEE1609dot2); -} - - -/*--- proto_reg_handoff_IEEE1609dot2 -------------------------------------------*/ -void proto_reg_handoff_IEEE1609dot2(void) { + register_dissector("ieee1609dot2.data", dissect_Ieee1609Dot2Data_PDU, proto_ieee1609dot2); } diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index 23a61172f2..8e3600677a 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -592,7 +592,7 @@ proto_reg_handoff_wsmp(void) wsmp_handle = create_dissector_handle(dissect_wsmp, proto_wsmp); dissector_add_uint("ethertype", ETHERTYPE_WSMP, wsmp_handle); - IEEE1609dot2_handle = find_dissector_add_dependency("IEEE1609dot2.data", proto_wsmp); + IEEE1609dot2_handle = find_dissector_add_dependency("ieee1609dot2.data", proto_wsmp); } /* diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py index 4e2fe30e01..7b57b9fcd4 100755 --- a/tools/asn2wrs.py +++ b/tools/asn2wrs.py @@ -605,6 +605,7 @@ class EthCtx: # Encoding def Per(self): return self.encoding == 'per' def Ber(self): return self.encoding == 'ber' + def Oer(self): return self.encoding == 'oer' def Aligned(self): return self.aligned def Unaligned(self): return not self.aligned def NeedTags(self): return self.tag_opt or self.Ber() @@ -1344,7 +1345,7 @@ class EthCtx: if self.type[t]['import']: continue m = self.type[t]['module'] - if not self.Per(): + if not self.Per() and not self.Oer(): if m not in self.all_tags: self.all_tags[m] = {} self.all_tags[m][t] = self.type[t]['val'].GetTTag(self) @@ -1463,7 +1464,7 @@ class EthCtx: out += "int " if (self.Ber()): out += "dissect_%s_%s(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_)" % (self.eth_type[tname]['proto'], tname) - elif (self.Per()): + elif (self.Per() or self.Oer()): out += "dissect_%s_%s(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_)" % (self.eth_type[tname]['proto'], tname) out += ";\n" return out @@ -1493,7 +1494,7 @@ class EthCtx: out += "int\n" if (self.Ber()): out += "dissect_%s_%s(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {\n" % (self.eth_type[tname]['proto'], tname) - elif (self.Per()): + elif (self.Per() or self.Oer()): out += "dissect_%s_%s(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {\n" % (self.eth_type[tname]['proto'], tname) #if self.conform.get_fn_presence(tname): # out += self.conform.get_fn_text(tname, 'FN_HDR') @@ -1739,6 +1740,10 @@ class EthCtx: par=((impl, 'tvb', off_par,'&asn1_ctx', 'tree', self.eth_hf[f]['fullname']),) elif (self.Per()): par=(('tvb', off_par, '&asn1_ctx', 'tree', self.eth_hf[f]['fullname']),) + elif (self.Oer()): + out += " asn1_ctx_t asn1_ctx;\n" + out += self.eth_fn_call('asn1_ctx_init', par=(('&asn1_ctx', 'ASN1_ENC_OER', 'TRUE', 'pinfo'),)) + par=(('tvb', off_par,'&asn1_ctx', 'tree', self.eth_hf[f]['fullname']),) else: par=((),) out += self.eth_fn_call('dissect_%s_%s' % (self.eth_type[t]['proto'], t), ret=ret_par, par=par) @@ -1867,7 +1872,7 @@ class EthCtx: hnd = '%screate_dissector_handle(dissect_%s, proto_%s)' % (new_prefix, f, self.eproto) rport = self.value_get_eth(reg['rport']) fx.write(' dissector_add_%s("%s", %s, %s);\n' % (rstr, reg['rtable'], rport, hnd)) - elif (reg['rtype'] in ('BER', 'PER')): + elif (reg['rtype'] in ('BER', 'PER', 'OER')): roid = self.value_get_eth(reg['roid']) fx.write(' %sregister_%s_oid_dissector(%s, dissect_%s, proto_%s, %s);\n' % (new_prefix, reg['rtype'].lower(), roid, f, self.eproto, reg['roidname'])) fempty = False @@ -2264,6 +2269,7 @@ class EthCnf: elif (par[0] in ('S', 'STR')): rtype = 'STR'; (pmin, pmax) = (2, 2) elif (par[0] in ('B', 'BER')): rtype = 'BER'; (pmin, pmax) = (1, 2) elif (par[0] in ('P', 'PER')): rtype = 'PER'; (pmin, pmax) = (1, 2) + elif (par[0] in ('O', 'OER')): rtype = 'OER'; (pmin, pmax) = (1, 2) else: warnings.warn_explicit("Unknown registration type '%s'" % (par[2]), UserWarning, fn, lineno); return if ((len(par)-1) < pmin): warnings.warn_explicit("Too few parameters for %s registration type. At least %d parameters are required" % (rtype, pmin), UserWarning, fn, lineno) @@ -2275,7 +2281,7 @@ class EthCnf: attr['rtable'] = par[1] attr['rport'] = par[2] rkey = '/'.join([rtype, attr['rtable'], attr['rport']]) - elif (rtype in ('BER', 'PER')): + elif (rtype in ('BER', 'PER', 'OER')): attr['roid'] = par[1] attr['roidname'] = '""' if (len(par)>=3): @@ -2730,6 +2736,9 @@ class EthCnf: elif opt in ("PER",): par = self.check_par(par, 0, 0, fn, lineno) self.ectx.encoding = 'per' + elif opt in ("OER",): + par = self.check_par(par, 0, 0, fn, lineno) + self.ectx.encoding = 'oer' elif opt in ("-p", "PROTO"): par = self.check_par(par, 1, 1, fn, lineno) if not par: return @@ -3714,7 +3723,7 @@ class Type_Ref (Type): return asn2c(self.val) def tr_need_own_fn(self, ectx): - return ectx.Per() and self.HasSizeConstraint() + return (ectx.Per() or ectx.Oer()) and self.HasSizeConstraint() def fld_obj_repr(self, ectx): return self.val @@ -3764,7 +3773,7 @@ class Type_Ref (Type): if (ectx.Ber()): body = ectx.eth_fn_call('%(TYPE_REF_FN)s', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),)) - elif (ectx.Per()): + elif (ectx.Per() or ectx.Oer()): if self.HasSizeConstraint(): body = ectx.eth_fn_call('dissect_%(ER)s_size_constrained_type', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s', '%(TYPE_REF_FN)s',), @@ -3824,7 +3833,7 @@ class SelectionType (Type): elif (ectx.Ber()): body = ectx.eth_fn_call('%(TYPE_REF_FN)s', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),)) - elif (ectx.Per()): + elif (ectx.Per() or ectx.Oer()): body = ectx.eth_fn_call('%(TYPE_REF_FN)s', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),)) else: @@ -3914,7 +3923,7 @@ class SqType (Type): (tc, tn) = val.GetTag(ectx) out = ' { %-24s, %-13s, %s, %s, dissect_%s_%s },\n' \ % ('&'+fullname, tc, tn, opt, ectx.eth_type[t]['proto'], t) - elif (ectx.Per()): + elif (ectx.Per() or ectx.Oer()): out = ' { %-24s, %-23s, %-17s, dissect_%s_%s },\n' \ % ('&'+fullname, ext, opt, ectx.eth_type[t]['proto'], t) else: @@ -3982,7 +3991,7 @@ class SeqType (SqType): return # extension addition groups if hasattr(self, 'ext_list'): - if (ectx.Per()): # add names + if (ectx.Per() or ectx.Oer()): # add names eag_num = 1 for e in (self.ext_list): if isinstance(e.val, ExtensionAdditionGroup): @@ -4120,11 +4129,11 @@ class SequenceOfType (SeqOfType): body = ectx.eth_fn_call('dissect_%(ER)s_sequence_of', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) - elif (ectx.Per() and not self.HasConstraint()): + elif ((ectx.Per() or ectx.Oer()) and not self.HasConstraint()): body = ectx.eth_fn_call('dissect_%(ER)s_sequence_of', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), ('%(ETT_INDEX)s', '%(TABLE)s',),)) - elif (ectx.Per() and self.constr.type == 'Size'): + elif ((ectx.Per() or ectx.Oer()) and self.constr.type == 'Size'): body = ectx.eth_fn_call('dissect_%(ER)s_constrained_sequence_of', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), ('%(ETT_INDEX)s', '%(TABLE)s',), @@ -4261,7 +4270,7 @@ class SequenceType (SeqType): body = ectx.eth_fn_call('dissect_%(ER)s_sequence', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),)) - elif (ectx.Per()): + elif (ectx.Per() or ectx.Oer()): body = ectx.eth_fn_call('dissect_%(ER)s_sequence', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), ('%(ETT_INDEX)s', '%(TABLE)s',),)) @@ -4467,7 +4476,7 @@ class ChoiceType (Type): lst = self.elt_list[:] if hasattr(self, 'ext_list'): lst.extend(self.ext_list) - if (len(lst) > 0) and (not ectx.Per() or lst[0].HasOwnTag()): + if (len(lst) > 0) and (not (ectx.Per() or ectx.Oer()) or lst[0].HasOwnTag()): t = lst[0].GetTag(ectx)[0] tagval = True else: @@ -4476,7 +4485,7 @@ class ChoiceType (Type): if (t == 'BER_CLASS_UNI'): tagval = False for e in (lst): - if not ectx.Per() or e.HasOwnTag(): + if not (ectx.Per() or ectx.Oer()) or e.HasOwnTag(): tt = e.GetTag(ectx)[0] else: tt = '' @@ -4546,7 +4555,7 @@ class ChoiceType (Type): (tc, tn) = e.GetTag(ectx) out = ' { %3s, %-24s, %-13s, %s, %s, dissect_%s_%s },\n' \ % (vval, '&'+ectx.eth_hf[ef]['fullname'], tc, tn, opt, ectx.eth_type[t]['proto'], t) - elif (ectx.Per()): + elif (ectx.Per() or ectx.Oer()): out = ' { %3s, %-24s, %-23s, dissect_%s_%s },\n' \ % (vval, '&'+ectx.eth_hf[ef]['fullname'], ext, ectx.eth_type[t]['proto'], t) else: @@ -4588,7 +4597,7 @@ class ChoiceType (Type): par=(('%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s'), ('%(VAL_PTR)s',),)) - elif (ectx.Per()): + elif (ectx.Per() or ectx.Oer()): body = ectx.eth_fn_call('dissect_%(ER)s_choice', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), ('%(ETT_INDEX)s', '%(TABLE)s',), @@ -4706,7 +4715,7 @@ class EnumeratedType (Type): return pars def eth_type_default_table(self, ectx, tname): - if (not ectx.Per()): return '' + if (not ectx.Per() and not ectx.Oer()): return '' map_table = self.get_vals_etc(ectx)[3] if (map_table == None): return '' table = "static guint32 %(TABLE)s[%(ROOT_NUM)s+%(EXT_NUM)s] = {" @@ -4724,7 +4733,7 @@ class EnumeratedType (Type): body = ectx.eth_fn_call('dissect_%(ER)s_integer', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'), ('%(VAL_PTR)s',),)) - elif (ectx.Per()): + elif (ectx.Per() or ectx.Oer()): body = ectx.eth_fn_call('dissect_%(ER)s_enumerated', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), ('%(ROOT_NUM)s', '%(VAL_PTR)s', '%(EXT)s', '%(EXT_NUM)s', '%(TABLE)s',),)) @@ -4866,8 +4875,6 @@ class InstanceOfType (Type): if (ectx.Ber()): body = ectx.eth_fn_call('dissect_%(ER)s_external_type', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(HF_INDEX)s', '%(TYPE_REF_FN)s',),)) - elif (ectx.Per()): - body = '#error Can not decode %s' % (tname) else: body = '#error Can not decode %s' % (tname) return body @@ -4906,7 +4913,7 @@ class NullType (Type): if (ectx.Ber()): body = ectx.eth_fn_call('dissect_%(ER)s_null', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),)) - elif (ectx.Per()): + elif (ectx.Per() or ectx.Oer()): body = ectx.eth_fn_call('dissect_%(ER)s_null', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),)) else: @@ -5028,7 +5035,7 @@ class OctetStringType (Type): body = ectx.eth_fn_call('dissect_%(ER)s_octet_string', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'), ('%(VAL_PTR)s',),)) - elif (ectx.Per()): + elif (ectx.Per() or ectx.Oer()): if self.HasContentsConstraint(): body = ectx.eth_fn_call('dissect_%(ER)s_octet_string_containing%(FN_VARIANT)s', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), @@ -5089,18 +5096,21 @@ class RestrictedCharacterStringType (CharacterStringType): if (self.eth_tsname() == 'GeneralString'): body = ectx.eth_fn_call('dissect_%(ER)s_%(STRING_TYPE)s', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),)) - elif (self.eth_tsname() == 'GeneralizedTime'): + elif (self.eth_tsname() == 'GeneralizedTime' or self.eth_tsname() == 'UTCTime'): body = ectx.eth_fn_call('dissect_%(ER)s_VisibleString', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s',),)) - elif (self.eth_tsname() == 'UTCTime'): - body = ectx.eth_fn_call('dissect_%(ER)s_VisibleString', ret='offset', + else: + body = ectx.eth_fn_call('dissect_%(ER)s_%(STRING_TYPE)s', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s',),)) - else: + elif (ectx.Oer()): + if (self.eth_tsname() == 'UTF8String'): body = ectx.eth_fn_call('dissect_%(ER)s_%(STRING_TYPE)s', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s',),)) + else: + body = '#error Can not decode %s' % (tname) else: body = '#error Can not decode %s' % (tname) return body @@ -5399,7 +5409,11 @@ class IntegerType (Type): (pars['MIN_VAL'], pars['MAX_VAL'], pars['EXT']) = self.eth_get_value_constr(ectx) if (pars['FN_VARIANT'] == '') and self.constr.Needs64b(ectx): if ectx.Ber(): pars['FN_VARIANT'] = '64' - else: pars['FN_VARIANT'] = '_64b' + else: + if (ectx.Oer() and pars['MAX_VAL'] == 'NO_BOUND'): + pars['FN_VARIANT'] = '_64b_no_ub' + else: + pars['FN_VARIANT'] = '_64b' return pars def eth_type_default_body(self, ectx, tname): @@ -5412,13 +5426,14 @@ class IntegerType (Type): body = ectx.eth_fn_call('dissect_%(ER)s_integer%(FN_VARIANT)s', ret='offset', par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'), ('%(VAL_PTR)s',),)) - elif (ectx.Per() and not self.HasValueConstraint()): - body = ectx.eth_fn_call('dissect_%(ER)s_integer%(FN_VARIANT)s', ret='offset', - par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s', '%(VAL_PTR)s'),)) - elif (ectx.Per() and self.HasValueConstraint()): - body = ectx.eth_fn_call('dissect_%(ER)s_constrained_integer%(FN_VARIANT)s', ret='offset', - par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), - ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(VAL_PTR)s', '%(EXT)s'),)) + elif (ectx.Per() or ectx.Oer()): + if (self.HasValueConstraint()): + body = ectx.eth_fn_call('dissect_%(ER)s_constrained_integer%(FN_VARIANT)s', ret='offset', + par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), + ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(VAL_PTR)s', '%(EXT)s'),)) + else: + body = ectx.eth_fn_call('dissect_%(ER)s_integer%(FN_VARIANT)s', ret='offset', + par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s', '%(VAL_PTR)s'),)) else: body = '#error Can not decode %s' % (tname) return body @@ -5511,7 +5526,7 @@ class BitStringType (Type): par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'), ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',), ('%(VAL_PTR)s',),)) - elif (ectx.Per()): + elif (ectx.Per() or ectx.Oer()): if self.HasContentsConstraint(): body = ectx.eth_fn_call('dissect_%(ER)s_bit_string_containing%(FN_VARIANT)s', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), |