diff options
author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-07-23 08:21:51 +0000 |
---|---|---|
committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-07-23 08:21:51 +0000 |
commit | b662cf76417166cf82d8c68d2daec1dc19f6def1 (patch) | |
tree | 48646ba2d7f7a8cd1ec8549ee83c6f78d969c4a2 | |
parent | 89f9e1ee8840a88547bb7167db0039ab2ca675a0 (diff) |
add all the other (quite a lot of them) attributes that were of the type DirectoryString
(see how good it is to put markers for emacs macros in the files, it was pretty quick, wasnt it? i even tested the resulting code.)
svn path=/trunk/; revision=11481
-rw-r--r-- | asn1/x509sat/SelectedAttributeTypes.asn | 161 | ||||
-rw-r--r-- | asn1/x509sat/packet-x509sat-template.c | 339 | ||||
-rw-r--r-- | epan/dissectors/packet-x509sat.c | 339 |
3 files changed, 758 insertions, 81 deletions
diff --git a/asn1/x509sat/SelectedAttributeTypes.asn b/asn1/x509sat/SelectedAttributeTypes.asn index 696bc87a05..c47eb45342 100644 --- a/asn1/x509sat/SelectedAttributeTypes.asn +++ b/asn1/x509sat/SelectedAttributeTypes.asn @@ -952,15 +952,15 @@ id-at OBJECT IDENTIFIER ::= {joint-iso-itu-t ds(5) 4} -- id-at-aliasedEntryName OBJECT IDENTIFIER ::= {id-at 1} -- id-at-encryptedAliasedEntryName OBJECT IDENTIFIER ::= -- {id-at 1 2} --- --- id-at-knowledgeInformation OBJECT IDENTIFIER ::= {id-at 2} --- --- id-at-commonName OBJECT IDENTIFIER ::= {id-at 3} --- + +id-at-knowledgeInformation OBJECT IDENTIFIER ::= {id-at 2} + +id-at-commonName OBJECT IDENTIFIER ::= {id-at 3} + -- id-at-encryptedCommonName OBJECT IDENTIFIER ::= {id-at 3 2} --- --- id-at-surname OBJECT IDENTIFIER ::= {id-at 4} --- + +id-at-surname OBJECT IDENTIFIER ::= {id-at 4} + -- id-at-encryptedSurname OBJECT IDENTIFIER ::= {id-at 4 2} -- -- id-at-serialNumber OBJECT IDENTIFIER ::= {id-at 5} @@ -970,63 +970,63 @@ id-at OBJECT IDENTIFIER ::= {joint-iso-itu-t ds(5) 4} id-at-countryName OBJECT IDENTIFIER ::= {id-at 6} -- id-at-encryptedCountryName OBJECT IDENTIFIER ::= {id-at 6 2} --- --- id-at-localityName OBJECT IDENTIFIER ::= {id-at 7} --- + +id-at-localityName OBJECT IDENTIFIER ::= {id-at 7} + -- id-at-encryptedLocalityName OBJECT IDENTIFIER ::= {id-at 7 2} --- --- id-at-collectiveLocalityName OBJECT IDENTIFIER ::= {id-at 7 1} --- + +id-at-collectiveLocalityName OBJECT IDENTIFIER ::= {id-at 7 1} + -- id-at-encryptedCollectiveLocalityName OBJECT IDENTIFIER ::= {id-at 7 1 2} --- --- id-at-stateOrProvinceName OBJECT IDENTIFIER ::= {id-at 8} --- + +id-at-stateOrProvinceName OBJECT IDENTIFIER ::= {id-at 8} + -- id-at-encryptedStateOrProvinceName OBJECT IDENTIFIER ::= {id-at 8 2} --- --- id-at-collectiveStateOrProvinceName OBJECT IDENTIFIER ::= {id-at 8 1} --- + +id-at-collectiveStateOrProvinceName OBJECT IDENTIFIER ::= {id-at 8 1} + -- id-at-encryptedCollectiveStateOrProvinceName OBJECT IDENTIFIER ::= -- {id-at 8 1 2} --- --- id-at-streetAddress OBJECT IDENTIFIER ::= {id-at 9} --- + +id-at-streetAddress OBJECT IDENTIFIER ::= {id-at 9} + -- id-at-encryptedStreetAddress OBJECT IDENTIFIER ::= {id-at 9 2} --- --- id-at-collectiveStreetAddress OBJECT IDENTIFIER ::= {id-at 9 1} --- + +id-at-collectiveStreetAddress OBJECT IDENTIFIER ::= {id-at 9 1} + -- id-at-encryptedCollectiveStreetAddress OBJECT IDENTIFIER ::= {id-at 9 1 2} id-at-organizationName OBJECT IDENTIFIER ::= {id-at 10} -- id-at-encryptedOrganizationName OBJECT IDENTIFIER ::= {id-at 10 2} --- --- id-at-collectiveOrganizationName OBJECT IDENTIFIER ::= {id-at 10 1} --- + +id-at-collectiveOrganizationName OBJECT IDENTIFIER ::= {id-at 10 1} + -- id-at-encryptedCollectiveOrganizationName OBJECT IDENTIFIER ::= {id-at 10 1 2} --- --- id-at-organizationalUnitName OBJECT IDENTIFIER ::= {id-at 11} --- + +id-at-organizationalUnitName OBJECT IDENTIFIER ::= {id-at 11} + -- id-at-encryptedOrganizationalUnitName OBJECT IDENTIFIER ::= {id-at 11 2} --- --- id-at-collectiveOrganizationalUnitName OBJECT IDENTIFIER ::= {id-at 11 1} --- + +id-at-collectiveOrganizationalUnitName OBJECT IDENTIFIER ::= {id-at 11 1} + -- id-at-encryptedCollectiveOrganizationalUnitName OBJECT IDENTIFIER ::= -- {id-at 11 1 2} --- --- id-at-title OBJECT IDENTIFIER ::= {id-at 12} --- + +id-at-title OBJECT IDENTIFIER ::= {id-at 12} + -- id-at-encryptedTitle OBJECT IDENTIFIER ::= {id-at 12 2} --- --- id-at-description OBJECT IDENTIFIER ::= {id-at 13} --- + +id-at-description OBJECT IDENTIFIER ::= {id-at 13} + -- id-at-encryptedDescription OBJECT IDENTIFIER ::= {id-at 13 2} -- -- id-at-searchGuide OBJECT IDENTIFIER ::= {id-at 14} -- -- id-at-encryptedSearchGuide OBJECT IDENTIFIER ::= {id-at 14 2} --- --- id-at-businessCategory OBJECT IDENTIFIER ::= {id-at 15} --- + +id-at-businessCategory OBJECT IDENTIFIER ::= {id-at 15} + -- id-at-encryptedBusinessCategory OBJECT IDENTIFIER ::= {id-at 15 2} -- -- id-at-postalAddress OBJECT IDENTIFIER ::= {id-at 16} @@ -1036,29 +1036,29 @@ id-at-organizationName OBJECT IDENTIFIER ::= {id-at 10} -- id-at-collectivePostalAddress OBJECT IDENTIFIER ::= {id-at 16 1} -- -- id-at-encryptedCollectivePostalAddress OBJECT IDENTIFIER ::= {id-at 16 1 2} --- --- id-at-postalCode OBJECT IDENTIFIER ::= {id-at 17} --- + +id-at-postalCode OBJECT IDENTIFIER ::= {id-at 17} + -- id-at-encryptedPostalCode OBJECT IDENTIFIER ::= {id-at 17 2} --- --- id-at-collectivePostalCode OBJECT IDENTIFIER ::= {id-at 17 1} --- + +id-at-collectivePostalCode OBJECT IDENTIFIER ::= {id-at 17 1} + -- id-at-encryptedCollectivePostalCode OBJECT IDENTIFIER ::= {id-at 17 1 2} --- --- id-at-postOfficeBox OBJECT IDENTIFIER ::= {id-at 18} --- + +id-at-postOfficeBox OBJECT IDENTIFIER ::= {id-at 18} + -- id-at-encryptedPostOfficeBox OBJECT IDENTIFIER ::= {id-at 18 2} --- --- id-at-collectivePostOfficeBox OBJECT IDENTIFIER ::= {id-at 18 1} --- + +id-at-collectivePostOfficeBox OBJECT IDENTIFIER ::= {id-at 18 1} + -- id-at-encryptedCollectivePostOfficeBox OBJECT IDENTIFIER ::= {id-at 18 1 2} --- --- id-at-physicalDeliveryOfficeName OBJECT IDENTIFIER ::= {id-at 19} --- + +id-at-physicalDeliveryOfficeName OBJECT IDENTIFIER ::= {id-at 19} + -- id-at-encryptedPhysicalDeliveryOfficeName OBJECT IDENTIFIER ::= {id-at 19 2} --- --- id-at-collectivePhysicalDeliveryOfficeName OBJECT IDENTIFIER ::= {id-at 19 1} --- + +id-at-collectivePhysicalDeliveryOfficeName OBJECT IDENTIFIER ::= {id-at 19 1} + -- id-at-encryptedCollectivePhysicalDeliveryOfficeName OBJECT IDENTIFIER ::= -- {id-at 19 1 2} -- @@ -1165,19 +1165,19 @@ id-at-organizationName OBJECT IDENTIFIER ::= {id-at 10} -- id-at-crossCertificatePair OBJECT IDENTIFIER ::= {id-at 40} -- id-at-encryptedCrossCertificatePair OBJECT IDENTIFIER ::= -- {id-at 40 2} --- --- id-at-name OBJECT IDENTIFIER ::= {id-at 41} --- --- id-at-givenName OBJECT IDENTIFIER ::= {id-at 42} --- + +id-at-name OBJECT IDENTIFIER ::= {id-at 41} + +id-at-givenName OBJECT IDENTIFIER ::= {id-at 42} + -- id-at-encryptedGivenName OBJECT IDENTIFIER ::= {id-at 42 2} --- --- id-at-initials OBJECT IDENTIFIER ::= {id-at 43} --- + +id-at-initials OBJECT IDENTIFIER ::= {id-at 43} + -- id-at-encryptedInitials OBJECT IDENTIFIER ::= {id-at 43 2} --- --- id-at-generationQualifier OBJECT IDENTIFIER ::= {id-at 44} --- + +id-at-generationQualifier OBJECT IDENTIFIER ::= {id-at 44} + -- id-at-encryptedGenerationQualifier OBJECT IDENTIFIER ::= {id-at 44 2} -- -- id-at-uniqueIdentifier OBJECT IDENTIFIER ::= {id-at 45} @@ -1203,9 +1203,9 @@ id-at-organizationName OBJECT IDENTIFIER ::= {id-at 10} -- id-at-uniqueMember OBJECT IDENTIFIER ::= {id-at 50} -- -- id-at-encryptedUniqueMember OBJECT IDENTIFIER ::= {id-at 50 2} --- --- id-at-houseIdentifier OBJECT IDENTIFIER ::= {id-at 51} --- + +id-at-houseIdentifier OBJECT IDENTIFIER ::= {id-at 51} + -- id-at-encryptedHouseIdentifier OBJECT IDENTIFIER ::= {id-at 51 2} -- -- id-at-supportedAlgorithms OBJECT IDENTIFIER ::= {id-at 52} @@ -1215,9 +1215,9 @@ id-at-organizationName OBJECT IDENTIFIER ::= {id-at 10} -- id-at-deltaRevocationList OBJECT IDENTIFIER ::= {id-at 53} -- id-at-encryptedDeltaRevocationList OBJECT IDENTIFIER ::= -- {id-at 53 2} --- --- id-at-dmdName OBJECT IDENTIFIER ::= {id-at 54} --- + +id-at-dmdName OBJECT IDENTIFIER ::= {id-at 54} + -- id-at-encryptedDmdName OBJECT IDENTIFIER ::= {id-at 54 2} -- -- id-at-clearance OBJECT IDENTIFIER ::= {id-at 55} @@ -1245,8 +1245,7 @@ id-at-organizationName OBJECT IDENTIFIER ::= {id-at 10} -- {id-at 60 2} -- -- id-at-family-information OBJECT IDENTIFIER {id-at 64} --- id-at-pseudonym OBJECT IDENTIFIER ::= --- {id-at 65} +id-at-pseudonym OBJECT IDENTIFIER ::= {id-at 65} -- -- id-at-communicationsService OBJECT IDENTIFIER ::= {id-at 66} -- diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index 3001eab1f0..9a08e3f0f9 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -45,6 +45,34 @@ int proto_x509sat = -1; int hf_x509sat_countryName = -1; int hf_x509sat_organizationName = -1; +int hf_x509sat_knowledgeInformation = -1; +int hf_x509sat_name = -1; +int hf_x509sat_commonName = -1; +int hf_x509sat_surname = -1; +int hf_x509sat_givenName = -1; +int hf_x509sat_initials = -1; +int hf_x509sat_generationQualifier = -1; +int hf_x509sat_pseudonym = -1; +int hf_x509sat_localityName = -1; +int hf_x509sat_collectiveLocalityName = -1; +int hf_x509sat_stateOrProvinceName = -1; +int hf_x509sat_collectiveStateOrProvinceName = -1; +int hf_x509sat_streetAddress = -1; +int hf_x509sat_collectiveStreetAddress = -1; +int hf_x509sat_houseIdentifier = -1; +int hf_x509sat_collectiveOrganizationName = -1; +int hf_x509sat_organizationalUnitName = -1; +int hf_x509sat_collectiveOrganizationalUnitName = -1; +int hf_x509sat_title = -1; +int hf_x509sat_description = -1; +int hf_x509sat_businessCategory = -1; +int hf_x509sat_postalCode = -1; +int hf_x509sat_collectivePostalCode = -1; +int hf_x509sat_postOfficeBox = -1; +int hf_x509sat_collectivePostOfficeBox = -1; +int hf_x509sat_physicalDeliveryOfficeName = -1; +int hf_x509sat_collectivePhysicalDeliveryOfficeName = -1; +int hf_x509sat_dmdName = -1; /*aaa*/ #include "packet-x509sat-hf.c" @@ -120,6 +148,174 @@ dissect_x509sat_organizationName_callback(tvbuff_t *tvb, packet_info *pinfo, pro { dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_organizationName); } + +static void +dissect_x509sat_knowledgeInformation_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_knowledgeInformation); +} + +static void +dissect_x509sat_name_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_name); +} + +static void +dissect_x509sat_commonName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_commonName); +} + +static void +dissect_x509sat_surname_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_surname); +} + +static void +dissect_x509sat_givenName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_givenName); +} + +static void +dissect_x509sat_initials_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_initials); +} + +static void +dissect_x509sat_generationQualifier_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_generationQualifier); +} + +static void +dissect_x509sat_pseudonym_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_pseudonym); +} + +static void +dissect_x509sat_localityName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_localityName); +} + +static void +dissect_x509sat_collectiveLocalityName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectiveLocalityName); +} + +static void +dissect_x509sat_stateOrProvinceName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_stateOrProvinceName); +} + +static void +dissect_x509sat_collectiveStateOrProvinceName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectiveStateOrProvinceName); +} + +static void +dissect_x509sat_streetAddress_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_streetAddress); +} + +static void +dissect_x509sat_collectiveStreetAddress_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectiveStreetAddress); +} + +static void +dissect_x509sat_houseIdentifier_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_houseIdentifier); +} + +static void +dissect_x509sat_collectiveOrganizationName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectiveOrganizationName); +} + +static void +dissect_x509sat_organizationalUnitName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_organizationalUnitName); +} + +static void +dissect_x509sat_collectiveOrganizationalUnitName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectiveOrganizationalUnitName); +} + +static void +dissect_x509sat_title_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_title); +} + +static void +dissect_x509sat_description_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_description); +} + +static void +dissect_x509sat_businessCategory_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_businessCategory); +} + +static void +dissect_x509sat_postalCode_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_postalCode); +} + +static void +dissect_x509sat_collectivePostalCode_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectivePostalCode); +} + +static void +dissect_x509sat_postOfficeBox_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_postOfficeBox); +} + +static void +dissect_x509sat_collectivePostOfficeBox_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectivePostOfficeBox); +} + +static void +dissect_x509sat_physicalDeliveryOfficeName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_physicalDeliveryOfficeName); +} + +static void +dissect_x509sat_collectivePhysicalDeliveryOfficeName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectivePhysicalDeliveryOfficeName); +} + +static void +dissect_x509sat_dmdName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_dmdName); +} /*bbb*/ /*--- proto_register_x509sat ----------------------------------------------*/ @@ -135,6 +331,118 @@ void proto_register_x509sat(void) { { "organizationName", "x509sat.organizationName", FT_STRING, BASE_NONE, NULL, 0, "Organization Name", HFILL }}, + { &hf_x509sat_knowledgeInformation, + { "knowledgeInformation", "x509sat.knowledgeInformation", + FT_STRING, BASE_NONE, NULL, 0, + "knowledgeInformation", HFILL }}, + { &hf_x509sat_name, + { "name", "x509sat.name", + FT_STRING, BASE_NONE, NULL, 0, + "name", HFILL }}, + { &hf_x509sat_commonName, + { "commonName", "x509sat.commonName", + FT_STRING, BASE_NONE, NULL, 0, + "commonName", HFILL }}, + { &hf_x509sat_surname, + { "surname", "x509sat.surname", + FT_STRING, BASE_NONE, NULL, 0, + "surname", HFILL }}, + { &hf_x509sat_givenName, + { "givenName", "x509sat.givenName", + FT_STRING, BASE_NONE, NULL, 0, + "givenName", HFILL }}, + { &hf_x509sat_initials, + { "initials", "x509sat.initials", + FT_STRING, BASE_NONE, NULL, 0, + "initials", HFILL }}, + { &hf_x509sat_generationQualifier, + { "generationQualifier", "x509sat.generationQualifier", + FT_STRING, BASE_NONE, NULL, 0, + "generationQualifier", HFILL }}, + { &hf_x509sat_pseudonym, + { "pseudonym", "x509sat.pseudonym", + FT_STRING, BASE_NONE, NULL, 0, + "pseudonym", HFILL }}, + { &hf_x509sat_localityName, + { "localityName", "x509sat.localityName", + FT_STRING, BASE_NONE, NULL, 0, + "localityName", HFILL }}, + { &hf_x509sat_collectiveLocalityName, + { "collectiveLocalityName", "x509sat.collectiveLocalityName", + FT_STRING, BASE_NONE, NULL, 0, + "collectiveLocalityName", HFILL }}, + { &hf_x509sat_stateOrProvinceName, + { "stateOrProvinceName", "x509sat.stateOrProvinceName", + FT_STRING, BASE_NONE, NULL, 0, + "stateOrProvinceName", HFILL }}, + { &hf_x509sat_collectiveStateOrProvinceName, + { "collectiveStateOrProvinceName", "x509sat.collectiveStateOrProvinceName", + FT_STRING, BASE_NONE, NULL, 0, + "collectiveStateOrProvinceName", HFILL }}, + { &hf_x509sat_streetAddress, + { "streetAddress", "x509sat.streetAddress", + FT_STRING, BASE_NONE, NULL, 0, + "streetAddress", HFILL }}, + { &hf_x509sat_collectiveStreetAddress, + { "collectiveStreetAddress", "x509sat.collectiveStreetAddress", + FT_STRING, BASE_NONE, NULL, 0, + "collectiveStreetAddress", HFILL }}, + { &hf_x509sat_houseIdentifier, + { "houseIdentifier", "x509sat.houseIdentifier", + FT_STRING, BASE_NONE, NULL, 0, + "houseIdentifier", HFILL }}, + { &hf_x509sat_collectiveOrganizationName, + { "collectiveOrganizationName", "x509sat.collectiveOrganizationName", + FT_STRING, BASE_NONE, NULL, 0, + "collectiveOrganizationName", HFILL }}, + { &hf_x509sat_organizationalUnitName, + { "organizationalUnitName", "x509sat.organizationalUnitName", + FT_STRING, BASE_NONE, NULL, 0, + "organizationalUnitName", HFILL }}, + { &hf_x509sat_collectiveOrganizationalUnitName, + { "collectiveOrganizationalUnitName", "x509sat.collectiveOrganizationalUnitName", + FT_STRING, BASE_NONE, NULL, 0, + "collectiveOrganizationalUnitName", HFILL }}, + { &hf_x509sat_title, + { "title", "x509sat.title", + FT_STRING, BASE_NONE, NULL, 0, + "title", HFILL }}, + { &hf_x509sat_description, + { "description", "x509sat.description", + FT_STRING, BASE_NONE, NULL, 0, + "description", HFILL }}, + { &hf_x509sat_businessCategory, + { "businessCategory", "x509sat.businessCategory", + FT_STRING, BASE_NONE, NULL, 0, + "businessCategory", HFILL }}, + { &hf_x509sat_postalCode, + { "postalCode", "x509sat.postalCode", + FT_STRING, BASE_NONE, NULL, 0, + "postalCode", HFILL }}, + { &hf_x509sat_collectivePostalCode, + { "collectivePostalCode", "x509sat.collectivePostalCode", + FT_STRING, BASE_NONE, NULL, 0, + "collectivePostalCode", HFILL }}, + { &hf_x509sat_postOfficeBox, + { "postOfficeBox", "x509sat.postOfficeBox", + FT_STRING, BASE_NONE, NULL, 0, + "postOfficeBox", HFILL }}, + { &hf_x509sat_collectivePostOfficeBox, + { "collectivePostOfficeBox", "x509sat.collectivePostOfficeBox", + FT_STRING, BASE_NONE, NULL, 0, + "collectivePostOfficeBox", HFILL }}, + { &hf_x509sat_physicalDeliveryOfficeName, + { "physicalDeliveryOfficeName", "x509sat.physicalDeliveryOfficeName", + FT_STRING, BASE_NONE, NULL, 0, + "physicalDeliveryOfficeName", HFILL }}, + { &hf_x509sat_collectivePhysicalDeliveryOfficeName, + { "collectivePhysicalDeliveryOfficeName", "x509sat.collectivePhysicalDeliveryOfficeName", + FT_STRING, BASE_NONE, NULL, 0, + "collectivePhysicalDeliveryOfficeName", HFILL }}, + { &hf_x509sat_dmdName, + { "dmdName", "x509sat.dmdName", + FT_STRING, BASE_NONE, NULL, 0, + "dmdName", HFILL }}, /*ccc*/ #include "packet-x509sat-hfarr.c" }; @@ -157,8 +465,39 @@ void proto_register_x509sat(void) { /*--- proto_reg_handoff_x509sat -------------------------------------------*/ void proto_reg_handoff_x509sat(void) { + register_ber_oid_dissector("2.5.4.2", dissect_x509sat_knowledgeInformation_callback, proto_x509sat, "id-at-knowledgeInformation"); + register_ber_oid_dissector("2.5.4.3", dissect_x509sat_commonName_callback, proto_x509sat, "id-at-commonName"); + register_ber_oid_dissector("2.5.4.4", dissect_x509sat_surname_callback, proto_x509sat, "id-at-surname"); register_ber_oid_dissector("2.5.4.6", dissect_x509sat_countryName_callback, proto_x509sat, "id-at-countryName"); + register_ber_oid_dissector("2.5.4.7", dissect_x509sat_localityName_callback, proto_x509sat, "id-at-localityName"); + register_ber_oid_dissector("2.5.4.7.1", dissect_x509sat_collectiveLocalityName_callback, proto_x509sat, "id-at-collectiveLocalityName"); + register_ber_oid_dissector("2.5.4.8", dissect_x509sat_stateOrProvinceName_callback, proto_x509sat, "id-at-stateOrProvinceName"); + register_ber_oid_dissector("2.5.4.8.1", dissect_x509sat_collectiveStateOrProvinceName_callback, proto_x509sat, "id-at-collectiveStateOrProvinceName"); + register_ber_oid_dissector("2.5.4.9", dissect_x509sat_streetAddress_callback, proto_x509sat, "id-at-streetAddress"); + register_ber_oid_dissector("2.5.4.9.1", dissect_x509sat_collectiveStreetAddress_callback, proto_x509sat, "id-at-collectiveStreetAddress"); register_ber_oid_dissector("2.5.4.10", dissect_x509sat_organizationName_callback, proto_x509sat, "id-at-organizationName"); + register_ber_oid_dissector("2.5.4.10.1", dissect_x509sat_collectiveOrganizationName_callback, proto_x509sat, "id-at-collectiveOrganizationName"); + register_ber_oid_dissector("2.5.4.11", dissect_x509sat_organizationalUnitName_callback, proto_x509sat, "id-at-organizationalUnitName"); + register_ber_oid_dissector("2.5.4.11.1", dissect_x509sat_collectiveOrganizationalUnitName_callback, proto_x509sat, "id-at-collectiveOrganizationalUnitName"); + register_ber_oid_dissector("2.5.4.12", dissect_x509sat_title_callback, proto_x509sat, "id-at-title"); + register_ber_oid_dissector("2.5.4.13", dissect_x509sat_description_callback, proto_x509sat, "id-at-description"); + register_ber_oid_dissector("2.5.4.15", dissect_x509sat_businessCategory_callback, proto_x509sat, "id-at-businessCategory"); + register_ber_oid_dissector("2.5.4.17", dissect_x509sat_postalCode_callback, proto_x509sat, "id-at-postalCode"); + register_ber_oid_dissector("2.5.4.17.1", dissect_x509sat_collectivePostalCode_callback, proto_x509sat, "id-at-collectivePostalCode"); + register_ber_oid_dissector("2.5.4.18", dissect_x509sat_postOfficeBox_callback, proto_x509sat, "id-at-postOfficeBox"); + register_ber_oid_dissector("2.5.4.18.1", dissect_x509sat_collectivePostOfficeBox_callback, proto_x509sat, "id-at-collectivePostOfficeBox"); + register_ber_oid_dissector("2.5.4.19", dissect_x509sat_physicalDeliveryOfficeName_callback, proto_x509sat, "id-at-physicalDeliveryOfficeName"); + register_ber_oid_dissector("2.5.4.19.1", dissect_x509sat_collectivePhysicalDeliveryOfficeName_callback, proto_x509sat, "id-at-collectivePhysicalDeliveryOfficeName"); + register_ber_oid_dissector("2.5.4.41", dissect_x509sat_name_callback, proto_x509sat, "id-at-name"); + register_ber_oid_dissector("2.5.4.42", dissect_x509sat_givenName_callback, proto_x509sat, "id-at-givenName"); + register_ber_oid_dissector("2.5.4.43", dissect_x509sat_initials_callback, proto_x509sat, "id-at-initials"); + register_ber_oid_dissector("2.5.4.44", dissect_x509sat_generationQualifier_callback, proto_x509sat, "id-at-generationQualifier"); + register_ber_oid_dissector("2.5.4.51", dissect_x509sat_houseIdentifier_callback, proto_x509sat, "id-at-houseIdentifier"); + register_ber_oid_dissector("2.5.4.54", dissect_x509sat_dmdName_callback, proto_x509sat, "id-at-dmdName"); + register_ber_oid_dissector("2.5.4.65", dissect_x509sat_pseudonym_callback, proto_x509sat, "id-at-pseudonym"); + /*ddd*/ } + + diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 98a39463d9..7721b79191 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -53,6 +53,34 @@ int proto_x509sat = -1; int hf_x509sat_countryName = -1; int hf_x509sat_organizationName = -1; +int hf_x509sat_knowledgeInformation = -1; +int hf_x509sat_name = -1; +int hf_x509sat_commonName = -1; +int hf_x509sat_surname = -1; +int hf_x509sat_givenName = -1; +int hf_x509sat_initials = -1; +int hf_x509sat_generationQualifier = -1; +int hf_x509sat_pseudonym = -1; +int hf_x509sat_localityName = -1; +int hf_x509sat_collectiveLocalityName = -1; +int hf_x509sat_stateOrProvinceName = -1; +int hf_x509sat_collectiveStateOrProvinceName = -1; +int hf_x509sat_streetAddress = -1; +int hf_x509sat_collectiveStreetAddress = -1; +int hf_x509sat_houseIdentifier = -1; +int hf_x509sat_collectiveOrganizationName = -1; +int hf_x509sat_organizationalUnitName = -1; +int hf_x509sat_collectiveOrganizationalUnitName = -1; +int hf_x509sat_title = -1; +int hf_x509sat_description = -1; +int hf_x509sat_businessCategory = -1; +int hf_x509sat_postalCode = -1; +int hf_x509sat_collectivePostalCode = -1; +int hf_x509sat_postOfficeBox = -1; +int hf_x509sat_collectivePostOfficeBox = -1; +int hf_x509sat_physicalDeliveryOfficeName = -1; +int hf_x509sat_collectivePhysicalDeliveryOfficeName = -1; +int hf_x509sat_dmdName = -1; /*aaa*/ /*--- Included file: packet-x509sat-hf.c ---*/ @@ -226,6 +254,174 @@ dissect_x509sat_organizationName_callback(tvbuff_t *tvb, packet_info *pinfo, pro { dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_organizationName); } + +static void +dissect_x509sat_knowledgeInformation_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_knowledgeInformation); +} + +static void +dissect_x509sat_name_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_name); +} + +static void +dissect_x509sat_commonName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_commonName); +} + +static void +dissect_x509sat_surname_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_surname); +} + +static void +dissect_x509sat_givenName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_givenName); +} + +static void +dissect_x509sat_initials_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_initials); +} + +static void +dissect_x509sat_generationQualifier_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_generationQualifier); +} + +static void +dissect_x509sat_pseudonym_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_pseudonym); +} + +static void +dissect_x509sat_localityName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_localityName); +} + +static void +dissect_x509sat_collectiveLocalityName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectiveLocalityName); +} + +static void +dissect_x509sat_stateOrProvinceName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_stateOrProvinceName); +} + +static void +dissect_x509sat_collectiveStateOrProvinceName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectiveStateOrProvinceName); +} + +static void +dissect_x509sat_streetAddress_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_streetAddress); +} + +static void +dissect_x509sat_collectiveStreetAddress_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectiveStreetAddress); +} + +static void +dissect_x509sat_houseIdentifier_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_houseIdentifier); +} + +static void +dissect_x509sat_collectiveOrganizationName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectiveOrganizationName); +} + +static void +dissect_x509sat_organizationalUnitName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_organizationalUnitName); +} + +static void +dissect_x509sat_collectiveOrganizationalUnitName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectiveOrganizationalUnitName); +} + +static void +dissect_x509sat_title_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_title); +} + +static void +dissect_x509sat_description_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_description); +} + +static void +dissect_x509sat_businessCategory_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_businessCategory); +} + +static void +dissect_x509sat_postalCode_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_postalCode); +} + +static void +dissect_x509sat_collectivePostalCode_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectivePostalCode); +} + +static void +dissect_x509sat_postOfficeBox_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_postOfficeBox); +} + +static void +dissect_x509sat_collectivePostOfficeBox_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectivePostOfficeBox); +} + +static void +dissect_x509sat_physicalDeliveryOfficeName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_physicalDeliveryOfficeName); +} + +static void +dissect_x509sat_collectivePhysicalDeliveryOfficeName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_collectivePhysicalDeliveryOfficeName); +} + +static void +dissect_x509sat_dmdName_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_x509sat_DirectoryString(FALSE, tvb, 0, pinfo, tree, hf_x509sat_dmdName); +} /*bbb*/ /*--- proto_register_x509sat ----------------------------------------------*/ @@ -241,6 +437,118 @@ void proto_register_x509sat(void) { { "organizationName", "x509sat.organizationName", FT_STRING, BASE_NONE, NULL, 0, "Organization Name", HFILL }}, + { &hf_x509sat_knowledgeInformation, + { "knowledgeInformation", "x509sat.knowledgeInformation", + FT_STRING, BASE_NONE, NULL, 0, + "knowledgeInformation", HFILL }}, + { &hf_x509sat_name, + { "name", "x509sat.name", + FT_STRING, BASE_NONE, NULL, 0, + "name", HFILL }}, + { &hf_x509sat_commonName, + { "commonName", "x509sat.commonName", + FT_STRING, BASE_NONE, NULL, 0, + "commonName", HFILL }}, + { &hf_x509sat_surname, + { "surname", "x509sat.surname", + FT_STRING, BASE_NONE, NULL, 0, + "surname", HFILL }}, + { &hf_x509sat_givenName, + { "givenName", "x509sat.givenName", + FT_STRING, BASE_NONE, NULL, 0, + "givenName", HFILL }}, + { &hf_x509sat_initials, + { "initials", "x509sat.initials", + FT_STRING, BASE_NONE, NULL, 0, + "initials", HFILL }}, + { &hf_x509sat_generationQualifier, + { "generationQualifier", "x509sat.generationQualifier", + FT_STRING, BASE_NONE, NULL, 0, + "generationQualifier", HFILL }}, + { &hf_x509sat_pseudonym, + { "pseudonym", "x509sat.pseudonym", + FT_STRING, BASE_NONE, NULL, 0, + "pseudonym", HFILL }}, + { &hf_x509sat_localityName, + { "localityName", "x509sat.localityName", + FT_STRING, BASE_NONE, NULL, 0, + "localityName", HFILL }}, + { &hf_x509sat_collectiveLocalityName, + { "collectiveLocalityName", "x509sat.collectiveLocalityName", + FT_STRING, BASE_NONE, NULL, 0, + "collectiveLocalityName", HFILL }}, + { &hf_x509sat_stateOrProvinceName, + { "stateOrProvinceName", "x509sat.stateOrProvinceName", + FT_STRING, BASE_NONE, NULL, 0, + "stateOrProvinceName", HFILL }}, + { &hf_x509sat_collectiveStateOrProvinceName, + { "collectiveStateOrProvinceName", "x509sat.collectiveStateOrProvinceName", + FT_STRING, BASE_NONE, NULL, 0, + "collectiveStateOrProvinceName", HFILL }}, + { &hf_x509sat_streetAddress, + { "streetAddress", "x509sat.streetAddress", + FT_STRING, BASE_NONE, NULL, 0, + "streetAddress", HFILL }}, + { &hf_x509sat_collectiveStreetAddress, + { "collectiveStreetAddress", "x509sat.collectiveStreetAddress", + FT_STRING, BASE_NONE, NULL, 0, + "collectiveStreetAddress", HFILL }}, + { &hf_x509sat_houseIdentifier, + { "houseIdentifier", "x509sat.houseIdentifier", + FT_STRING, BASE_NONE, NULL, 0, + "houseIdentifier", HFILL }}, + { &hf_x509sat_collectiveOrganizationName, + { "collectiveOrganizationName", "x509sat.collectiveOrganizationName", + FT_STRING, BASE_NONE, NULL, 0, + "collectiveOrganizationName", HFILL }}, + { &hf_x509sat_organizationalUnitName, + { "organizationalUnitName", "x509sat.organizationalUnitName", + FT_STRING, BASE_NONE, NULL, 0, + "organizationalUnitName", HFILL }}, + { &hf_x509sat_collectiveOrganizationalUnitName, + { "collectiveOrganizationalUnitName", "x509sat.collectiveOrganizationalUnitName", + FT_STRING, BASE_NONE, NULL, 0, + "collectiveOrganizationalUnitName", HFILL }}, + { &hf_x509sat_title, + { "title", "x509sat.title", + FT_STRING, BASE_NONE, NULL, 0, + "title", HFILL }}, + { &hf_x509sat_description, + { "description", "x509sat.description", + FT_STRING, BASE_NONE, NULL, 0, + "description", HFILL }}, + { &hf_x509sat_businessCategory, + { "businessCategory", "x509sat.businessCategory", + FT_STRING, BASE_NONE, NULL, 0, + "businessCategory", HFILL }}, + { &hf_x509sat_postalCode, + { "postalCode", "x509sat.postalCode", + FT_STRING, BASE_NONE, NULL, 0, + "postalCode", HFILL }}, + { &hf_x509sat_collectivePostalCode, + { "collectivePostalCode", "x509sat.collectivePostalCode", + FT_STRING, BASE_NONE, NULL, 0, + "collectivePostalCode", HFILL }}, + { &hf_x509sat_postOfficeBox, + { "postOfficeBox", "x509sat.postOfficeBox", + FT_STRING, BASE_NONE, NULL, 0, + "postOfficeBox", HFILL }}, + { &hf_x509sat_collectivePostOfficeBox, + { "collectivePostOfficeBox", "x509sat.collectivePostOfficeBox", + FT_STRING, BASE_NONE, NULL, 0, + "collectivePostOfficeBox", HFILL }}, + { &hf_x509sat_physicalDeliveryOfficeName, + { "physicalDeliveryOfficeName", "x509sat.physicalDeliveryOfficeName", + FT_STRING, BASE_NONE, NULL, 0, + "physicalDeliveryOfficeName", HFILL }}, + { &hf_x509sat_collectivePhysicalDeliveryOfficeName, + { "collectivePhysicalDeliveryOfficeName", "x509sat.collectivePhysicalDeliveryOfficeName", + FT_STRING, BASE_NONE, NULL, 0, + "collectivePhysicalDeliveryOfficeName", HFILL }}, + { &hf_x509sat_dmdName, + { "dmdName", "x509sat.dmdName", + FT_STRING, BASE_NONE, NULL, 0, + "dmdName", HFILL }}, /*ccc*/ /*--- Included file: packet-x509sat-hfarr.c ---*/ @@ -304,8 +612,39 @@ void proto_register_x509sat(void) { /*--- proto_reg_handoff_x509sat -------------------------------------------*/ void proto_reg_handoff_x509sat(void) { + register_ber_oid_dissector("2.5.4.2", dissect_x509sat_knowledgeInformation_callback, proto_x509sat, "id-at-knowledgeInformation"); + register_ber_oid_dissector("2.5.4.3", dissect_x509sat_commonName_callback, proto_x509sat, "id-at-commonName"); + register_ber_oid_dissector("2.5.4.4", dissect_x509sat_surname_callback, proto_x509sat, "id-at-surname"); register_ber_oid_dissector("2.5.4.6", dissect_x509sat_countryName_callback, proto_x509sat, "id-at-countryName"); + register_ber_oid_dissector("2.5.4.7", dissect_x509sat_localityName_callback, proto_x509sat, "id-at-localityName"); + register_ber_oid_dissector("2.5.4.7.1", dissect_x509sat_collectiveLocalityName_callback, proto_x509sat, "id-at-collectiveLocalityName"); + register_ber_oid_dissector("2.5.4.8", dissect_x509sat_stateOrProvinceName_callback, proto_x509sat, "id-at-stateOrProvinceName"); + register_ber_oid_dissector("2.5.4.8.1", dissect_x509sat_collectiveStateOrProvinceName_callback, proto_x509sat, "id-at-collectiveStateOrProvinceName"); + register_ber_oid_dissector("2.5.4.9", dissect_x509sat_streetAddress_callback, proto_x509sat, "id-at-streetAddress"); + register_ber_oid_dissector("2.5.4.9.1", dissect_x509sat_collectiveStreetAddress_callback, proto_x509sat, "id-at-collectiveStreetAddress"); register_ber_oid_dissector("2.5.4.10", dissect_x509sat_organizationName_callback, proto_x509sat, "id-at-organizationName"); + register_ber_oid_dissector("2.5.4.10.1", dissect_x509sat_collectiveOrganizationName_callback, proto_x509sat, "id-at-collectiveOrganizationName"); + register_ber_oid_dissector("2.5.4.11", dissect_x509sat_organizationalUnitName_callback, proto_x509sat, "id-at-organizationalUnitName"); + register_ber_oid_dissector("2.5.4.11.1", dissect_x509sat_collectiveOrganizationalUnitName_callback, proto_x509sat, "id-at-collectiveOrganizationalUnitName"); + register_ber_oid_dissector("2.5.4.12", dissect_x509sat_title_callback, proto_x509sat, "id-at-title"); + register_ber_oid_dissector("2.5.4.13", dissect_x509sat_description_callback, proto_x509sat, "id-at-description"); + register_ber_oid_dissector("2.5.4.15", dissect_x509sat_businessCategory_callback, proto_x509sat, "id-at-businessCategory"); + register_ber_oid_dissector("2.5.4.17", dissect_x509sat_postalCode_callback, proto_x509sat, "id-at-postalCode"); + register_ber_oid_dissector("2.5.4.17.1", dissect_x509sat_collectivePostalCode_callback, proto_x509sat, "id-at-collectivePostalCode"); + register_ber_oid_dissector("2.5.4.18", dissect_x509sat_postOfficeBox_callback, proto_x509sat, "id-at-postOfficeBox"); + register_ber_oid_dissector("2.5.4.18.1", dissect_x509sat_collectivePostOfficeBox_callback, proto_x509sat, "id-at-collectivePostOfficeBox"); + register_ber_oid_dissector("2.5.4.19", dissect_x509sat_physicalDeliveryOfficeName_callback, proto_x509sat, "id-at-physicalDeliveryOfficeName"); + register_ber_oid_dissector("2.5.4.19.1", dissect_x509sat_collectivePhysicalDeliveryOfficeName_callback, proto_x509sat, "id-at-collectivePhysicalDeliveryOfficeName"); + register_ber_oid_dissector("2.5.4.41", dissect_x509sat_name_callback, proto_x509sat, "id-at-name"); + register_ber_oid_dissector("2.5.4.42", dissect_x509sat_givenName_callback, proto_x509sat, "id-at-givenName"); + register_ber_oid_dissector("2.5.4.43", dissect_x509sat_initials_callback, proto_x509sat, "id-at-initials"); + register_ber_oid_dissector("2.5.4.44", dissect_x509sat_generationQualifier_callback, proto_x509sat, "id-at-generationQualifier"); + register_ber_oid_dissector("2.5.4.51", dissect_x509sat_houseIdentifier_callback, proto_x509sat, "id-at-houseIdentifier"); + register_ber_oid_dissector("2.5.4.54", dissect_x509sat_dmdName_callback, proto_x509sat, "id-at-dmdName"); + register_ber_oid_dissector("2.5.4.65", dissect_x509sat_pseudonym_callback, proto_x509sat, "id-at-pseudonym"); + /*ddd*/ } + + |