/* Input file: packet-x509sat-template.c */
-#define BER_UNI_TAG_TeletexString 20 /* until we fix the bug in asn2eth */
/* packet-x509sat.c
* Routines for X.509 Selected Attribute Types packet dissection
* Ronnie Sahlberg 2004
*
- * $Id: packet-x509sat-template.c 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id: packet-x509sat-template.c 12743 2004-12-13 11:59:48Z sahlberg $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
static int hf_x509sat_pSelector = -1; /* OCTET_STRING */
static int hf_x509sat_sSelector = -1; /* OCTET_STRING */
static int hf_x509sat_tSelector = -1; /* OCTET_STRING */
-static int hf_x509sat_nAddresses = -1; /* SET_OF_OCTET_STRING */
+static int hf_x509sat_nAddresses = -1; /* T_nAddresses */
static int hf_x509sat_nAddresses_item = -1; /* OCTET_STRING */
static int hf_x509sat_nAddress = -1; /* OCTET_STRING */
-static int hf_x509sat_profiles = -1; /* SET_OF_OBJECT_IDENTIFIER */
+static int hf_x509sat_profiles = -1; /* T_profiles */
static int hf_x509sat_profiles_item = -1; /* OBJECT_IDENTIFIER */
static int hf_x509sat_dn = -1; /* DistinguishedName */
static int hf_x509sat_uid = -1; /* UniqueIdentifier */
static int hf_x509sat_matchingRuleUsed = -1; /* OBJECT_IDENTIFIER */
-static int hf_x509sat_attributeList = -1; /* SEQUNCE_OF_AttributeValueAssertion */
+static int hf_x509sat_attributeList = -1; /* SEQUENCE_OF_AttributeValueAssertion */
static int hf_x509sat_attributeList_item = -1; /* AttributeValueAssertion */
static int hf_x509sat_SubstringAssertion_item = -1; /* SubstringAssertion_item */
static int hf_x509sat_initial = -1; /* DirectoryString */
static int hf_x509sat_control = -1; /* Attribute */
static int hf_x509sat_CaseIgnoreListMatch_item = -1; /* DirectoryString */
static int hf_x509sat_OctetSubstringAssertion_item = -1; /* OctetSubstringAssertion_item */
-static int hf_x509sat_initial1 = -1; /* OCTET_STRING */
-static int hf_x509sat_any1 = -1; /* OCTET_STRING */
-static int hf_x509sat_final1 = -1; /* OCTET_STRING */
+static int hf_x509sat_initial_substring = -1; /* OCTET_STRING */
+static int hf_x509sat_any_substring = -1; /* OCTET_STRING */
+static int hf_x509sat_finall_substring = -1; /* OCTET_STRING */
static int hf_x509sat_ZonalSelect_item = -1; /* AttributeType */
static int hf_x509sat_time = -1; /* T_time */
static int hf_x509sat_absolute = -1; /* T_absolute */
static int hf_x509sat_timesOfDay = -1; /* SET_OF_DayTimeBand */
static int hf_x509sat_timesOfDay_item = -1; /* DayTimeBand */
static int hf_x509sat_days = -1; /* T_days */
-static int hf_x509sat_intDay = -1; /* SET_OF_INTEGER */
+static int hf_x509sat_intDay = -1; /* T_intDay */
static int hf_x509sat_intDay_item = -1; /* INTEGER */
static int hf_x509sat_bitDay = -1; /* T_bitDay */
static int hf_x509sat_dayOf = -1; /* XDayOf */
static int hf_x509sat_weeks = -1; /* T_weeks */
static int hf_x509sat_allWeeks = -1; /* NULL */
-static int hf_x509sat_intWeek = -1; /* SET_OF_INTEGER */
+static int hf_x509sat_intWeek = -1; /* T_intWeek */
static int hf_x509sat_intWeek_item = -1; /* INTEGER */
static int hf_x509sat_bitWeek = -1; /* T_bitWeek */
static int hf_x509sat_months = -1; /* T_months */
static int hf_x509sat_allMonths = -1; /* NULL */
-static int hf_x509sat_intMonth = -1; /* SET_OF_INTEGER */
+static int hf_x509sat_intMonth = -1; /* T_intMonth */
static int hf_x509sat_intMonth_item = -1; /* INTEGER */
static int hf_x509sat_bitMonth = -1; /* T_bitMonth */
-static int hf_x509sat_years = -1; /* SET_OF_INTEGER */
+static int hf_x509sat_years = -1; /* T_years */
static int hf_x509sat_years_item = -1; /* INTEGER */
-static int hf_x509sat_first = -1; /* NamedDay */
-static int hf_x509sat_second = -1; /* NamedDay */
-static int hf_x509sat_third = -1; /* NamedDay */
-static int hf_x509sat_fourth = -1; /* NamedDay */
-static int hf_x509sat_fifth = -1; /* NamedDay */
+static int hf_x509sat_first_dayof = -1; /* NamedDay */
+static int hf_x509sat_second_dayof = -1; /* NamedDay */
+static int hf_x509sat_third_dayof = -1; /* NamedDay */
+static int hf_x509sat_fourth_dayof = -1; /* NamedDay */
+static int hf_x509sat_fifth_dayof = -1; /* NamedDay */
static int hf_x509sat_intNamedDays = -1; /* T_intNamedDays */
static int hf_x509sat_bitNamedDays = -1; /* T_bitNamedDays */
static int hf_x509sat_startDayTime = -1; /* DayTime */
static int hf_x509sat_endDayTime = -1; /* DayTime */
static int hf_x509sat_hour = -1; /* INTEGER */
static int hf_x509sat_minute = -1; /* INTEGER */
-static int hf_x509sat_second1 = -1; /* INTEGER */
+static int hf_x509sat_second = -1; /* INTEGER */
static int hf_x509sat_now = -1; /* NULL */
static int hf_x509sat_at = -1; /* GeneralizedTime */
static int hf_x509sat_between = -1; /* T_between */
static gint ett_x509sat_FacsimileTelephoneNumber = -1;
static gint ett_x509sat_PreferredDeliveryMethod = -1;
static gint ett_x509sat_PresentationAddress = -1;
-static gint ett_x509sat_SET_OF_OCTET_STRING = -1;
+static gint ett_x509sat_T_nAddresses = -1;
static gint ett_x509sat_ProtocolInformation = -1;
-static gint ett_x509sat_SET_OF_OBJECT_IDENTIFIER = -1;
+static gint ett_x509sat_T_profiles = -1;
static gint ett_x509sat_NameAndOptionalUID = -1;
static gint ett_x509sat_MultipleMatchingLocalities = -1;
-static gint ett_x509sat_SEQUNCE_OF_AttributeValueAssertion = -1;
+static gint ett_x509sat_SEQUENCE_OF_AttributeValueAssertion = -1;
static gint ett_x509sat_SubstringAssertion = -1;
static gint ett_x509sat_SubstringAssertion_item = -1;
static gint ett_x509sat_CaseIgnoreListMatch = -1;
static gint ett_x509sat_Period = -1;
static gint ett_x509sat_SET_OF_DayTimeBand = -1;
static gint ett_x509sat_T_days = -1;
-static gint ett_x509sat_SET_OF_INTEGER = -1;
+static gint ett_x509sat_T_intDay = -1;
static gint ett_x509sat_T_bitDay = -1;
static gint ett_x509sat_T_weeks = -1;
+static gint ett_x509sat_T_intWeek = -1;
static gint ett_x509sat_T_bitWeek = -1;
static gint ett_x509sat_T_months = -1;
+static gint ett_x509sat_T_intMonth = -1;
static gint ett_x509sat_T_bitMonth = -1;
+static gint ett_x509sat_T_years = -1;
static gint ett_x509sat_XDayOf = -1;
static gint ett_x509sat_NamedDay = -1;
static gint ett_x509sat_T_bitNamedDays = -1;
}
-static const value_string CriteriaItem_vals[] = {
+static const value_string x509sat_CriteriaItem_vals[] = {
{ 0, "equality" },
{ 1, "substrings" },
{ 2, "greaterOrEqual" },
{ 0, NULL }
};
-static const ber_choice CriteriaItem_choice[] = {
+static const ber_choice_t CriteriaItem_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_equality },
{ 1, BER_CLASS_CON, 1, 0, dissect_substrings },
{ 2, BER_CLASS_CON, 2, 0, dissect_greaterOrEqual },
static int
dissect_x509sat_CriteriaItem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem, NULL);
return offset;
}
return dissect_x509sat_CriteriaItem(FALSE, tvb, offset, pinfo, tree, hf_x509sat_type);
}
-static const ber_sequence SET_OF_Criteria_set_of[1] = {
+static const ber_sequence_t SET_OF_Criteria_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
};
}
-const value_string Criteria_vals[] = {
+const value_string x509sat_Criteria_vals[] = {
{ 0, "type" },
{ 1, "and" },
{ 2, "or" },
{ 0, NULL }
};
-static const ber_choice Criteria_choice[] = {
+static const ber_choice_t Criteria_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_type },
{ 1, BER_CLASS_CON, 1, 0, dissect_and },
{ 2, BER_CLASS_CON, 2, 0, dissect_or },
int
dissect_x509sat_Criteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- Criteria_choice, hf_index, ett_x509sat_Criteria);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ Criteria_choice, hf_index, ett_x509sat_Criteria, NULL);
return offset;
}
+
static int
dissect_x509sat_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset,
- hf_index, NULL);
+ offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
}
-static const value_string T_subset_vals[] = {
+static const value_string x509sat_T_subset_vals[] = {
{ 0, "baseObject" },
{ 1, "oneLevel" },
{ 2, "wholeSubtree" },
static int
dissect_x509sat_T_subset(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
return dissect_x509sat_T_subset(FALSE, tvb, offset, pinfo, tree, hf_x509sat_subset);
}
-static const ber_sequence EnhancedGuide_sequence[] = {
+static const ber_sequence_t EnhancedGuide_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_objectClass },
{ BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_criteria },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_subset },
return offset;
}
-static const ber_sequence PostalAddress_sequence_of[1] = {
+static const ber_sequence_t PostalAddress_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_PostalAddress_item },
};
return dissect_x509sat_PrintableString(FALSE, tvb, offset, pinfo, tree, hf_x509sat_answerback);
}
-static const ber_sequence TelexNumber_sequence[] = {
+static const ber_sequence_t TelexNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telexNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_countryCode },
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_answerback },
return offset;
}
-static const ber_sequence FacsimileTelephoneNumber_sequence[] = {
+static const ber_sequence_t FacsimileTelephoneNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telephoneNumber },
{ 0, 0, 0, NULL }
};
}
-static const value_string PreferredDeliveryMethod_item_vals[] = {
+static const value_string x509sat_PreferredDeliveryMethod_item_vals[] = {
{ 0, "any-delivery-method" },
{ 1, "mhs-delivery" },
{ 2, "physical-delivery" },
static int
dissect_x509sat_PreferredDeliveryMethod_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
return dissect_x509sat_PreferredDeliveryMethod_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_PreferredDeliveryMethod_item);
}
-static const ber_sequence PreferredDeliveryMethod_sequence_of[1] = {
+static const ber_sequence_t PreferredDeliveryMethod_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_PreferredDeliveryMethod_item },
};
static int dissect_nAddress(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_nAddress);
}
-static int dissect_initial1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_initial1);
+static int dissect_initial_substring(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_initial_substring);
}
-static int dissect_any1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_any1);
+static int dissect_any_substring(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_any_substring);
}
-static int dissect_final1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_final1);
+static int dissect_finall_substring(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_finall_substring);
}
-static const ber_sequence SET_OF_OCTET_STRING_set_of[1] = {
+static const ber_sequence_t T_nAddresses_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddresses_item },
};
static int
-dissect_x509sat_SET_OF_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509sat_T_nAddresses(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
- SET_OF_OCTET_STRING_set_of, hf_index, ett_x509sat_SET_OF_OCTET_STRING);
+ T_nAddresses_set_of, hf_index, ett_x509sat_T_nAddresses);
return offset;
}
static int dissect_nAddresses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_SET_OF_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_nAddresses);
+ return dissect_x509sat_T_nAddresses(FALSE, tvb, offset, pinfo, tree, hf_x509sat_nAddresses);
}
-static const ber_sequence PresentationAddress_sequence[] = {
+static const ber_sequence_t PresentationAddress_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_pSelector },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_sSelector },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_tSelector },
return offset;
}
-static const ber_sequence SET_OF_OBJECT_IDENTIFIER_set_of[1] = {
+static const ber_sequence_t T_profiles_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_profiles_item },
};
static int
-dissect_x509sat_SET_OF_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509sat_T_profiles(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
- SET_OF_OBJECT_IDENTIFIER_set_of, hf_index, ett_x509sat_SET_OF_OBJECT_IDENTIFIER);
+ T_profiles_set_of, hf_index, ett_x509sat_T_profiles);
return offset;
}
static int dissect_profiles(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_SET_OF_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_profiles);
+ return dissect_x509sat_T_profiles(FALSE, tvb, offset, pinfo, tree, hf_x509sat_profiles);
}
-static const ber_sequence ProtocolInformation_sequence[] = {
+static const ber_sequence_t ProtocolInformation_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddress },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_profiles },
{ 0, 0, 0, NULL }
return offset;
}
-static const ber_sequence NameAndOptionalUID_sequence[] = {
+static const ber_sequence_t NameAndOptionalUID_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_dn },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_uid },
{ 0, 0, 0, NULL }
return offset;
}
-static const ber_sequence SEQUNCE_OF_AttributeValueAssertion_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_AttributeValueAssertion_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item },
};
static int
-dissect_x509sat_SEQUNCE_OF_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509sat_SEQUENCE_OF_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
- SEQUNCE_OF_AttributeValueAssertion_sequence_of, hf_index, ett_x509sat_SEQUNCE_OF_AttributeValueAssertion);
+ SEQUENCE_OF_AttributeValueAssertion_sequence_of, hf_index, ett_x509sat_SEQUENCE_OF_AttributeValueAssertion);
return offset;
}
static int dissect_attributeList(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_SEQUNCE_OF_AttributeValueAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509sat_attributeList);
+ return dissect_x509sat_SEQUENCE_OF_AttributeValueAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509sat_attributeList);
}
-static const ber_sequence MultipleMatchingLocalities_sequence[] = {
+static const ber_sequence_t MultipleMatchingLocalities_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_matchingRuleUsed },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList },
{ 0, 0, 0, NULL }
}
-static const value_string SubstringAssertion_item_vals[] = {
+static const value_string x509sat_SubstringAssertion_item_vals[] = {
{ 0, "initial" },
{ 1, "any" },
{ 2, "final" },
{ 0, NULL }
};
-static const ber_choice SubstringAssertion_item_choice[] = {
+static const ber_choice_t SubstringAssertion_item_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_initial },
{ 1, BER_CLASS_CON, 1, 0, dissect_any },
{ 2, BER_CLASS_CON, 2, 0, dissect_final },
static int
dissect_x509sat_SubstringAssertion_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item, NULL);
return offset;
}
return dissect_x509sat_SubstringAssertion_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_SubstringAssertion_item);
}
-static const ber_sequence SubstringAssertion_sequence_of[1] = {
+static const ber_sequence_t SubstringAssertion_sequence_of[1] = {
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SubstringAssertion_item },
};
return offset;
}
-static const ber_sequence CaseIgnoreListMatch_sequence_of[1] = {
+static const ber_sequence_t CaseIgnoreListMatch_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_CaseIgnoreListMatch_item },
};
}
-static const value_string OctetSubstringAssertion_item_vals[] = {
+static const value_string x509sat_OctetSubstringAssertion_item_vals[] = {
{ 0, "initial" },
{ 1, "any" },
{ 2, "final" },
{ 0, NULL }
};
-static const ber_choice OctetSubstringAssertion_item_choice[] = {
- { 0, BER_CLASS_CON, 0, 0, dissect_initial1 },
- { 1, BER_CLASS_CON, 1, 0, dissect_any1 },
- { 2, BER_CLASS_CON, 2, 0, dissect_final1 },
+static const ber_choice_t OctetSubstringAssertion_item_choice[] = {
+ { 0, BER_CLASS_CON, 0, 0, dissect_initial_substring },
+ { 1, BER_CLASS_CON, 1, 0, dissect_any_substring },
+ { 2, BER_CLASS_CON, 2, 0, dissect_finall_substring },
{ 0, 0, 0, 0, NULL }
};
static int
dissect_x509sat_OctetSubstringAssertion_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item, NULL);
return offset;
}
return dissect_x509sat_OctetSubstringAssertion_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_OctetSubstringAssertion_item);
}
-static const ber_sequence OctetSubstringAssertion_sequence_of[1] = {
+static const ber_sequence_t OctetSubstringAssertion_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_OctetSubstringAssertion_item },
};
return offset;
}
-static const ber_sequence ZonalSelect_sequence_of[1] = {
+static const ber_sequence_t ZonalSelect_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ZonalSelect_item },
};
}
-const value_string ZonalResult_vals[] = {
+const value_string x509sat_ZonalResult_vals[] = {
{ 0, "cannot-select-mapping" },
{ 2, "zero-mappings" },
{ 3, "multiple-mappings" },
static int
dissect_x509sat_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index);
+ offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
return offset;
}
return dissect_x509sat_GeneralizedTime(FALSE, tvb, offset, pinfo, tree, hf_x509sat_at);
}
-static const ber_sequence T_absolute_sequence[] = {
+static const ber_sequence_t T_absolute_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startTime },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime },
{ 0, 0, 0, NULL }
static int
dissect_x509sat_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
static int dissect_minute(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_x509sat_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_minute);
}
-static int dissect_second1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_second1);
+static int dissect_second(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_second);
}
-static const ber_sequence DayTime_sequence[] = {
+static const ber_sequence_t DayTime_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_hour },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_minute },
- { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_second1 },
+ { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_second },
{ 0, 0, 0, NULL }
};
return dissect_x509sat_DayTime(FALSE, tvb, offset, pinfo, tree, hf_x509sat_endDayTime);
}
-static const ber_sequence DayTimeBand_sequence[] = {
+static const ber_sequence_t DayTimeBand_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startDayTime },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endDayTime },
{ 0, 0, 0, NULL }
return dissect_x509sat_DayTimeBand(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timesOfDay_item);
}
-static const ber_sequence SET_OF_DayTimeBand_set_of[1] = {
+static const ber_sequence_t SET_OF_DayTimeBand_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_timesOfDay_item },
};
return dissect_x509sat_SET_OF_DayTimeBand(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timesOfDay);
}
-static const ber_sequence SET_OF_INTEGER_set_of[1] = {
+static const ber_sequence_t T_intDay_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intDay_item },
};
static int
-dissect_x509sat_SET_OF_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509sat_T_intDay(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
- SET_OF_INTEGER_set_of, hf_index, ett_x509sat_SET_OF_INTEGER);
+ T_intDay_set_of, hf_index, ett_x509sat_T_intDay);
return offset;
}
static int dissect_intDay(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_SET_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intDay);
-}
-static int dissect_intWeek(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_SET_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intWeek);
-}
-static int dissect_intMonth(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_SET_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intMonth);
-}
-static int dissect_years(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_SET_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_years);
+ return dissect_x509sat_T_intDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intDay);
}
static const asn_namedbit T_bitDay_bits[] = {
- { 0, &hf_x509sat_T_bitDay_sunday, -1, -1, NULL, NULL },
- { 1, &hf_x509sat_T_bitDay_monday, -1, -1, NULL, NULL },
- { 2, &hf_x509sat_T_bitDay_tuesday, -1, -1, NULL, NULL },
- { 3, &hf_x509sat_T_bitDay_wednesday, -1, -1, NULL, NULL },
- { 4, &hf_x509sat_T_bitDay_thursday, -1, -1, NULL, NULL },
- { 5, &hf_x509sat_T_bitDay_friday, -1, -1, NULL, NULL },
- { 6, &hf_x509sat_T_bitDay_saturday, -1, -1, NULL, NULL },
+ { 0, &hf_x509sat_T_bitDay_sunday, -1, -1, "sunday", NULL },
+ { 1, &hf_x509sat_T_bitDay_monday, -1, -1, "monday", NULL },
+ { 2, &hf_x509sat_T_bitDay_tuesday, -1, -1, "tuesday", NULL },
+ { 3, &hf_x509sat_T_bitDay_wednesday, -1, -1, "wednesday", NULL },
+ { 4, &hf_x509sat_T_bitDay_thursday, -1, -1, "thursday", NULL },
+ { 5, &hf_x509sat_T_bitDay_friday, -1, -1, "friday", NULL },
+ { 6, &hf_x509sat_T_bitDay_saturday, -1, -1, "saturday", NULL },
{ 0, NULL, 0, 0, NULL, NULL }
};
}
-static const value_string T_intNamedDays_vals[] = {
+static const value_string x509sat_T_intNamedDays_vals[] = {
{ 1, "sunday" },
{ 2, "monday" },
{ 3, "tuesday" },
}
static const asn_namedbit T_bitNamedDays_bits[] = {
- { 0, &hf_x509sat_T_bitNamedDays_sunday, -1, -1, NULL, NULL },
- { 1, &hf_x509sat_T_bitNamedDays_monday, -1, -1, NULL, NULL },
- { 2, &hf_x509sat_T_bitNamedDays_tuesday, -1, -1, NULL, NULL },
- { 3, &hf_x509sat_T_bitNamedDays_wednesday, -1, -1, NULL, NULL },
- { 4, &hf_x509sat_T_bitNamedDays_thursday, -1, -1, NULL, NULL },
- { 5, &hf_x509sat_T_bitNamedDays_friday, -1, -1, NULL, NULL },
- { 6, &hf_x509sat_T_bitNamedDays_saturday, -1, -1, NULL, NULL },
+ { 0, &hf_x509sat_T_bitNamedDays_sunday, -1, -1, "sunday", NULL },
+ { 1, &hf_x509sat_T_bitNamedDays_monday, -1, -1, "monday", NULL },
+ { 2, &hf_x509sat_T_bitNamedDays_tuesday, -1, -1, "tuesday", NULL },
+ { 3, &hf_x509sat_T_bitNamedDays_wednesday, -1, -1, "wednesday", NULL },
+ { 4, &hf_x509sat_T_bitNamedDays_thursday, -1, -1, "thursday", NULL },
+ { 5, &hf_x509sat_T_bitNamedDays_friday, -1, -1, "friday", NULL },
+ { 6, &hf_x509sat_T_bitNamedDays_saturday, -1, -1, "saturday", NULL },
{ 0, NULL, 0, 0, NULL, NULL }
};
}
-const value_string NamedDay_vals[] = {
+const value_string x509sat_NamedDay_vals[] = {
{ 0, "intNamedDays" },
{ 1, "bitNamedDays" },
{ 0, NULL }
};
-static const ber_choice NamedDay_choice[] = {
+static const ber_choice_t NamedDay_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_intNamedDays },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitNamedDays },
{ 0, 0, 0, 0, NULL }
int
dissect_x509sat_NamedDay(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- NamedDay_choice, hf_index, ett_x509sat_NamedDay);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ NamedDay_choice, hf_index, ett_x509sat_NamedDay, NULL);
return offset;
}
-static int dissect_first(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_NamedDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_first);
+static int dissect_first_dayof(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_NamedDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_first_dayof);
}
-static int dissect_second(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_NamedDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_second);
+static int dissect_second_dayof(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_NamedDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_second_dayof);
}
-static int dissect_third(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_NamedDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_third);
+static int dissect_third_dayof(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_NamedDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_third_dayof);
}
-static int dissect_fourth(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_NamedDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_fourth);
+static int dissect_fourth_dayof(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_NamedDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_fourth_dayof);
}
-static int dissect_fifth(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_x509sat_NamedDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_fifth);
+static int dissect_fifth_dayof(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_NamedDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_fifth_dayof);
}
-const value_string XDayOf_vals[] = {
+const value_string x509sat_XDayOf_vals[] = {
{ 1, "first" },
{ 2, "second" },
{ 3, "third" },
{ 0, NULL }
};
-static const ber_choice XDayOf_choice[] = {
- { 1, BER_CLASS_CON, 1, 0, dissect_first },
- { 2, BER_CLASS_CON, 2, 0, dissect_second },
- { 3, BER_CLASS_CON, 3, 0, dissect_third },
- { 4, BER_CLASS_CON, 4, 0, dissect_fourth },
- { 5, BER_CLASS_CON, 5, 0, dissect_fifth },
+static const ber_choice_t XDayOf_choice[] = {
+ { 1, BER_CLASS_CON, 1, 0, dissect_first_dayof },
+ { 2, BER_CLASS_CON, 2, 0, dissect_second_dayof },
+ { 3, BER_CLASS_CON, 3, 0, dissect_third_dayof },
+ { 4, BER_CLASS_CON, 4, 0, dissect_fourth_dayof },
+ { 5, BER_CLASS_CON, 5, 0, dissect_fifth_dayof },
{ 0, 0, 0, 0, NULL }
};
int
dissect_x509sat_XDayOf(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- XDayOf_choice, hf_index, ett_x509sat_XDayOf);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ XDayOf_choice, hf_index, ett_x509sat_XDayOf, NULL);
return offset;
}
}
-static const value_string T_days_vals[] = {
+static const value_string x509sat_T_days_vals[] = {
{ 0, "intDay" },
{ 1, "bitDay" },
{ 2, "dayOf" },
{ 0, NULL }
};
-static const ber_choice T_days_choice[] = {
+static const ber_choice_t T_days_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intDay },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitDay },
{ 2, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_dayOf },
static int
dissect_x509sat_T_days(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- T_days_choice, hf_index, ett_x509sat_T_days);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ T_days_choice, hf_index, ett_x509sat_T_days, NULL);
return offset;
}
}
+
static int
dissect_x509sat_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- { proto_item *ti_tmp;
- ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE);
- proto_item_append_text(ti_tmp, ": NULL");
- }
+ offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index);
return offset;
}
return dissect_x509sat_NULL(FALSE, tvb, offset, pinfo, tree, hf_x509sat_now);
}
+static const ber_sequence_t T_intWeek_set_of[1] = {
+ { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intWeek_item },
+};
+
+static int
+dissect_x509sat_T_intWeek(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+ offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
+ T_intWeek_set_of, hf_index, ett_x509sat_T_intWeek);
+
+ return offset;
+}
+static int dissect_intWeek(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_T_intWeek(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intWeek);
+}
+
static const asn_namedbit T_bitWeek_bits[] = {
- { 0, &hf_x509sat_T_bitWeek_week1, -1, -1, NULL, NULL },
- { 1, &hf_x509sat_T_bitWeek_week2, -1, -1, NULL, NULL },
- { 2, &hf_x509sat_T_bitWeek_week3, -1, -1, NULL, NULL },
- { 3, &hf_x509sat_T_bitWeek_week4, -1, -1, NULL, NULL },
- { 4, &hf_x509sat_T_bitWeek_week5, -1, -1, NULL, NULL },
+ { 0, &hf_x509sat_T_bitWeek_week1, -1, -1, "week1", NULL },
+ { 1, &hf_x509sat_T_bitWeek_week2, -1, -1, "week2", NULL },
+ { 2, &hf_x509sat_T_bitWeek_week3, -1, -1, "week3", NULL },
+ { 3, &hf_x509sat_T_bitWeek_week4, -1, -1, "week4", NULL },
+ { 4, &hf_x509sat_T_bitWeek_week5, -1, -1, "week5", NULL },
{ 0, NULL, 0, 0, NULL, NULL }
};
}
-static const value_string T_weeks_vals[] = {
+static const value_string x509sat_T_weeks_vals[] = {
{ 0, "allWeeks" },
{ 1, "intWeek" },
{ 2, "bitWeek" },
{ 0, NULL }
};
-static const ber_choice T_weeks_choice[] = {
+static const ber_choice_t T_weeks_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allWeeks },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intWeek },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitWeek },
static int
dissect_x509sat_T_weeks(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- T_weeks_choice, hf_index, ett_x509sat_T_weeks);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ T_weeks_choice, hf_index, ett_x509sat_T_weeks, NULL);
return offset;
}
return dissect_x509sat_T_weeks(FALSE, tvb, offset, pinfo, tree, hf_x509sat_weeks);
}
+static const ber_sequence_t T_intMonth_set_of[1] = {
+ { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intMonth_item },
+};
+
+static int
+dissect_x509sat_T_intMonth(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+ offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
+ T_intMonth_set_of, hf_index, ett_x509sat_T_intMonth);
+
+ return offset;
+}
+static int dissect_intMonth(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_T_intMonth(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intMonth);
+}
+
static const asn_namedbit T_bitMonth_bits[] = {
- { 0, &hf_x509sat_T_bitMonth_january, -1, -1, NULL, NULL },
- { 1, &hf_x509sat_T_bitMonth_february, -1, -1, NULL, NULL },
- { 2, &hf_x509sat_T_bitMonth_march, -1, -1, NULL, NULL },
- { 3, &hf_x509sat_T_bitMonth_april, -1, -1, NULL, NULL },
- { 4, &hf_x509sat_T_bitMonth_may, -1, -1, NULL, NULL },
- { 5, &hf_x509sat_T_bitMonth_june, -1, -1, NULL, NULL },
- { 6, &hf_x509sat_T_bitMonth_july, -1, -1, NULL, NULL },
- { 7, &hf_x509sat_T_bitMonth_august, -1, -1, NULL, NULL },
- { 8, &hf_x509sat_T_bitMonth_september, -1, -1, NULL, NULL },
- { 9, &hf_x509sat_T_bitMonth_october, -1, -1, NULL, NULL },
- { 10, &hf_x509sat_T_bitMonth_november, -1, -1, NULL, NULL },
- { 11, &hf_x509sat_T_bitMonth_december, -1, -1, NULL, NULL },
+ { 0, &hf_x509sat_T_bitMonth_january, -1, -1, "january", NULL },
+ { 1, &hf_x509sat_T_bitMonth_february, -1, -1, "february", NULL },
+ { 2, &hf_x509sat_T_bitMonth_march, -1, -1, "march", NULL },
+ { 3, &hf_x509sat_T_bitMonth_april, -1, -1, "april", NULL },
+ { 4, &hf_x509sat_T_bitMonth_may, -1, -1, "may", NULL },
+ { 5, &hf_x509sat_T_bitMonth_june, -1, -1, "june", NULL },
+ { 6, &hf_x509sat_T_bitMonth_july, -1, -1, "july", NULL },
+ { 7, &hf_x509sat_T_bitMonth_august, -1, -1, "august", NULL },
+ { 8, &hf_x509sat_T_bitMonth_september, -1, -1, "september", NULL },
+ { 9, &hf_x509sat_T_bitMonth_october, -1, -1, "october", NULL },
+ { 10, &hf_x509sat_T_bitMonth_november, -1, -1, "november", NULL },
+ { 11, &hf_x509sat_T_bitMonth_december, -1, -1, "december", NULL },
{ 0, NULL, 0, 0, NULL, NULL }
};
}
-static const value_string T_months_vals[] = {
+static const value_string x509sat_T_months_vals[] = {
{ 0, "allMonths" },
{ 1, "intMonth" },
{ 2, "bitMonth" },
{ 0, NULL }
};
-static const ber_choice T_months_choice[] = {
+static const ber_choice_t T_months_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allMonths },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intMonth },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitMonth },
static int
dissect_x509sat_T_months(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- T_months_choice, hf_index, ett_x509sat_T_months);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ T_months_choice, hf_index, ett_x509sat_T_months, NULL);
return offset;
}
return dissect_x509sat_T_months(FALSE, tvb, offset, pinfo, tree, hf_x509sat_months);
}
-static const ber_sequence Period_sequence[] = {
+static const ber_sequence_t T_years_set_of[1] = {
+ { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_years_item },
+};
+
+static int
+dissect_x509sat_T_years(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+ offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
+ T_years_set_of, hf_index, ett_x509sat_T_years);
+
+ return offset;
+}
+static int dissect_years(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_x509sat_T_years(FALSE, tvb, offset, pinfo, tree, hf_x509sat_years);
+}
+
+static const ber_sequence_t Period_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_timesOfDay },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_days },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_weeks },
return dissect_x509sat_Period(FALSE, tvb, offset, pinfo, tree, hf_x509sat_periodic_item);
}
-static const ber_sequence SET_OF_Period_set_of[1] = {
+static const ber_sequence_t SET_OF_Period_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_periodic_item },
};
}
-static const value_string T_time_vals[] = {
+static const value_string x509sat_T_time_vals[] = {
{ 0, "absolute" },
{ 1, "periodic" },
{ 0, NULL }
};
-static const ber_choice T_time_choice[] = {
+static const ber_choice_t T_time_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_absolute },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_periodic },
{ 0, 0, 0, 0, NULL }
static int
dissect_x509sat_T_time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- T_time_choice, hf_index, ett_x509sat_T_time);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ T_time_choice, hf_index, ett_x509sat_T_time, NULL);
return offset;
}
static int
dissect_x509sat_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+ offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
return offset;
}
int
dissect_x509sat_TimeZone(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
return dissect_x509sat_TimeZone(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timeZone);
}
-static const ber_sequence TimeSpecification_sequence[] = {
+static const ber_sequence_t TimeSpecification_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_time },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_notThisTime },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeZone },
return offset;
}
-static const ber_sequence T_between_sequence[] = {
+static const ber_sequence_t T_between_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_startTime },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entirely },
}
-const value_string TimeAssertion_vals[] = {
+const value_string x509sat_TimeAssertion_vals[] = {
{ 0, "now" },
{ 1, "at" },
{ 2, "between" },
{ 0, NULL }
};
-static const ber_choice TimeAssertion_choice[] = {
+static const ber_choice_t TimeAssertion_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_now },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_at },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_between },
int
dissect_x509sat_TimeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion, NULL);
return offset;
}
-const value_string LocaleContextSyntax_vals[] = {
+const value_string x509sat_LocaleContextSyntax_vals[] = {
{ 0, "localeID1" },
{ 1, "localeID2" },
{ 0, NULL }
};
-static const ber_choice LocaleContextSyntax_choice[] = {
+static const ber_choice_t LocaleContextSyntax_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_localeID1 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_localeID2 },
{ 0, 0, 0, 0, NULL }
int
dissect_x509sat_LocaleContextSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax);
+ offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+ LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax, NULL);
return offset;
}
"TelexNumber", HFILL }},
{ &hf_x509sat_type,
{ "type", "x509sat.type",
- FT_UINT32, BASE_DEC, VALS(CriteriaItem_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_CriteriaItem_vals), 0,
"Criteria/type", HFILL }},
{ &hf_x509sat_and,
{ "and", "x509sat.and",
"Criteria/and", HFILL }},
{ &hf_x509sat_and_item,
{ "Item", "x509sat.and_item",
- FT_UINT32, BASE_DEC, VALS(Criteria_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0,
"Criteria/and/_item", HFILL }},
{ &hf_x509sat_or,
{ "or", "x509sat.or",
"Criteria/or", HFILL }},
{ &hf_x509sat_or_item,
{ "Item", "x509sat.or_item",
- FT_UINT32, BASE_DEC, VALS(Criteria_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0,
"Criteria/or/_item", HFILL }},
{ &hf_x509sat_not,
{ "not", "x509sat.not",
- FT_UINT32, BASE_DEC, VALS(Criteria_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0,
"Criteria/not", HFILL }},
{ &hf_x509sat_equality,
{ "equality", "x509sat.equality",
"EnhancedGuide/objectClass", HFILL }},
{ &hf_x509sat_criteria,
{ "criteria", "x509sat.criteria",
- FT_UINT32, BASE_DEC, VALS(Criteria_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0,
"EnhancedGuide/criteria", HFILL }},
{ &hf_x509sat_subset,
{ "subset", "x509sat.subset",
- FT_INT32, BASE_DEC, VALS(T_subset_vals), 0,
+ FT_INT32, BASE_DEC, VALS(x509sat_T_subset_vals), 0,
"EnhancedGuide/subset", HFILL }},
{ &hf_x509sat_PostalAddress_item,
{ "Item", "x509sat.PostalAddress_item",
"FacsimileTelephoneNumber/telephoneNumber", HFILL }},
{ &hf_x509sat_PreferredDeliveryMethod_item,
{ "Item", "x509sat.PreferredDeliveryMethod_item",
- FT_INT32, BASE_DEC, VALS(PreferredDeliveryMethod_item_vals), 0,
+ FT_INT32, BASE_DEC, VALS(x509sat_PreferredDeliveryMethod_item_vals), 0,
"PreferredDeliveryMethod/_item", HFILL }},
{ &hf_x509sat_pSelector,
{ "pSelector", "x509sat.pSelector",
"MultipleMatchingLocalities/attributeList/_item", HFILL }},
{ &hf_x509sat_SubstringAssertion_item,
{ "Item", "x509sat.SubstringAssertion_item",
- FT_UINT32, BASE_DEC, VALS(SubstringAssertion_item_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_SubstringAssertion_item_vals), 0,
"SubstringAssertion/_item", HFILL }},
{ &hf_x509sat_initial,
{ "initial", "x509sat.initial",
"CaseIgnoreListMatch/_item", HFILL }},
{ &hf_x509sat_OctetSubstringAssertion_item,
{ "Item", "x509sat.OctetSubstringAssertion_item",
- FT_UINT32, BASE_DEC, VALS(OctetSubstringAssertion_item_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_OctetSubstringAssertion_item_vals), 0,
"OctetSubstringAssertion/_item", HFILL }},
- { &hf_x509sat_initial1,
+ { &hf_x509sat_initial_substring,
{ "initial", "x509sat.initial",
FT_BYTES, BASE_HEX, NULL, 0,
"OctetSubstringAssertion/_item/initial", HFILL }},
- { &hf_x509sat_any1,
+ { &hf_x509sat_any_substring,
{ "any", "x509sat.any",
FT_BYTES, BASE_HEX, NULL, 0,
"OctetSubstringAssertion/_item/any", HFILL }},
- { &hf_x509sat_final1,
+ { &hf_x509sat_finall_substring,
{ "final", "x509sat.final",
FT_BYTES, BASE_HEX, NULL, 0,
"OctetSubstringAssertion/_item/final", HFILL }},
"ZonalSelect/_item", HFILL }},
{ &hf_x509sat_time,
{ "time", "x509sat.time",
- FT_UINT32, BASE_DEC, VALS(T_time_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_T_time_vals), 0,
"TimeSpecification/time", HFILL }},
{ &hf_x509sat_absolute,
{ "absolute", "x509sat.absolute",
"Period/timesOfDay/_item", HFILL }},
{ &hf_x509sat_days,
{ "days", "x509sat.days",
- FT_UINT32, BASE_DEC, VALS(T_days_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_T_days_vals), 0,
"Period/days", HFILL }},
{ &hf_x509sat_intDay,
{ "intDay", "x509sat.intDay",
"Period/days/bitDay", HFILL }},
{ &hf_x509sat_dayOf,
{ "dayOf", "x509sat.dayOf",
- FT_UINT32, BASE_DEC, VALS(XDayOf_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_XDayOf_vals), 0,
"Period/days/dayOf", HFILL }},
{ &hf_x509sat_weeks,
{ "weeks", "x509sat.weeks",
- FT_UINT32, BASE_DEC, VALS(T_weeks_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_T_weeks_vals), 0,
"Period/weeks", HFILL }},
{ &hf_x509sat_allWeeks,
{ "allWeeks", "x509sat.allWeeks",
"Period/weeks/bitWeek", HFILL }},
{ &hf_x509sat_months,
{ "months", "x509sat.months",
- FT_UINT32, BASE_DEC, VALS(T_months_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_T_months_vals), 0,
"Period/months", HFILL }},
{ &hf_x509sat_allMonths,
{ "allMonths", "x509sat.allMonths",
{ "Item", "x509sat.years_item",
FT_INT32, BASE_DEC, NULL, 0,
"Period/years/_item", HFILL }},
- { &hf_x509sat_first,
+ { &hf_x509sat_first_dayof,
{ "first", "x509sat.first",
- FT_UINT32, BASE_DEC, VALS(NamedDay_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_NamedDay_vals), 0,
"XDayOf/first", HFILL }},
- { &hf_x509sat_second,
+ { &hf_x509sat_second_dayof,
{ "second", "x509sat.second",
- FT_UINT32, BASE_DEC, VALS(NamedDay_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_NamedDay_vals), 0,
"XDayOf/second", HFILL }},
- { &hf_x509sat_third,
+ { &hf_x509sat_third_dayof,
{ "third", "x509sat.third",
- FT_UINT32, BASE_DEC, VALS(NamedDay_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_NamedDay_vals), 0,
"XDayOf/third", HFILL }},
- { &hf_x509sat_fourth,
+ { &hf_x509sat_fourth_dayof,
{ "fourth", "x509sat.fourth",
- FT_UINT32, BASE_DEC, VALS(NamedDay_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_NamedDay_vals), 0,
"XDayOf/fourth", HFILL }},
- { &hf_x509sat_fifth,
+ { &hf_x509sat_fifth_dayof,
{ "fifth", "x509sat.fifth",
- FT_UINT32, BASE_DEC, VALS(NamedDay_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_NamedDay_vals), 0,
"XDayOf/fifth", HFILL }},
{ &hf_x509sat_intNamedDays,
{ "intNamedDays", "x509sat.intNamedDays",
- FT_UINT32, BASE_DEC, VALS(T_intNamedDays_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(x509sat_T_intNamedDays_vals), 0,
"NamedDay/intNamedDays", HFILL }},
{ &hf_x509sat_bitNamedDays,
{ "bitNamedDays", "x509sat.bitNamedDays",
{ "minute", "x509sat.minute",
FT_INT32, BASE_DEC, NULL, 0,
"DayTime/minute", HFILL }},
- { &hf_x509sat_second1,
+ { &hf_x509sat_second,
{ "second", "x509sat.second",
FT_INT32, BASE_DEC, NULL, 0,
"DayTime/second", HFILL }},
&ett_x509sat_FacsimileTelephoneNumber,
&ett_x509sat_PreferredDeliveryMethod,
&ett_x509sat_PresentationAddress,
- &ett_x509sat_SET_OF_OCTET_STRING,
+ &ett_x509sat_T_nAddresses,
&ett_x509sat_ProtocolInformation,
- &ett_x509sat_SET_OF_OBJECT_IDENTIFIER,
+ &ett_x509sat_T_profiles,
&ett_x509sat_NameAndOptionalUID,
&ett_x509sat_MultipleMatchingLocalities,
- &ett_x509sat_SEQUNCE_OF_AttributeValueAssertion,
+ &ett_x509sat_SEQUENCE_OF_AttributeValueAssertion,
&ett_x509sat_SubstringAssertion,
&ett_x509sat_SubstringAssertion_item,
&ett_x509sat_CaseIgnoreListMatch,
&ett_x509sat_Period,
&ett_x509sat_SET_OF_DayTimeBand,
&ett_x509sat_T_days,
- &ett_x509sat_SET_OF_INTEGER,
+ &ett_x509sat_T_intDay,
&ett_x509sat_T_bitDay,
&ett_x509sat_T_weeks,
+ &ett_x509sat_T_intWeek,
&ett_x509sat_T_bitWeek,
&ett_x509sat_T_months,
+ &ett_x509sat_T_intMonth,
&ett_x509sat_T_bitMonth,
+ &ett_x509sat_T_years,
&ett_x509sat_XDayOf,
&ett_x509sat_NamedDay,
&ett_x509sat_T_bitNamedDays,
git.samba.org / obnox / wireshark / wip.git / blobdiff