aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
Diffstat (limited to 'asn1')
-rw-r--r--asn1/acp133/packet-acp133-template.c91
-rw-r--r--asn1/acse/packet-acse-template.c3
-rw-r--r--asn1/camel/packet-camel-template.c3
-rw-r--r--asn1/cdt/cdt.cnf2
-rw-r--r--asn1/cmip/packet-cmip-template.c5
-rw-r--r--asn1/cms/cms.cnf2
-rw-r--r--asn1/dap/packet-dap-template.c3
-rw-r--r--asn1/disp/packet-disp-template.c11
-rw-r--r--asn1/dop/dop.cnf2
-rw-r--r--asn1/dop/packet-dop-template.c35
-rw-r--r--asn1/dsp/packet-dsp-template.c3
-rw-r--r--asn1/ftam/packet-ftam-template.c25
-rw-r--r--asn1/gsmmap/packet-gsm_map-template.c7
-rw-r--r--asn1/ldap/packet-ldap-template.c40
-rw-r--r--asn1/pkixproxy/packet-pkixproxy-template.c7
-rw-r--r--asn1/tcap/packet-tcap-template.c3
-rw-r--r--asn1/wlancertextn/packet-wlancertextn-template.c5
-rw-r--r--asn1/x411/packet-x411-template.c5
-rw-r--r--asn1/x411/x411.cnf4
-rw-r--r--asn1/x420/x420.cnf2
-rw-r--r--asn1/x509af/x509af.cnf4
-rw-r--r--asn1/x509if/x509if.cnf4
-rw-r--r--asn1/x509sat/packet-x509sat-template.c53
23 files changed, 167 insertions, 152 deletions
diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c
index c3d47d6dfe..241c5877c9 100644
--- a/asn1/acp133/packet-acp133-template.c
+++ b/asn1/acp133/packet-acp133-template.c
@@ -30,6 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -91,56 +92,56 @@ void proto_reg_handoff_acp133(void) {
#include "packet-acp133-dis-tab.c"
/* X.402 Object Classes */
- register_ber_oid_name("2.6.5.1.0","id-oc-mhs-distribution-list");
- register_ber_oid_name("2.6.5.1.1","id-oc-mhs-message-store");
- register_ber_oid_name("2.6.5.1.2","id-oc-mhs-message-transfer-agent");
- register_ber_oid_name("2.6.5.1.3","id-oc-mhs-user");
+ add_oid_str_name("2.6.5.1.0","id-oc-mhs-distribution-list");
+ add_oid_str_name("2.6.5.1.1","id-oc-mhs-message-store");
+ add_oid_str_name("2.6.5.1.2","id-oc-mhs-message-transfer-agent");
+ add_oid_str_name("2.6.5.1.3","id-oc-mhs-user");
/* SDN.701 Object Classes */
- register_ber_oid_name("2.16.840.1.101.2.1.4.13", "id-oc-secure-user");
- register_ber_oid_name("2.16.840.1.101.2.1.4.16", "id-oc-ukms");
+ add_oid_str_name("2.16.840.1.101.2.1.4.13", "id-oc-secure-user");
+ add_oid_str_name("2.16.840.1.101.2.1.4.16", "id-oc-ukms");
/* ACP133 Object Classes */
- register_ber_oid_name("2.16.840.1.101.2.2.3.26", "id-oc-plaData");
- register_ber_oid_name("2.16.840.1.101.2.2.3.28", "id-oc-cadACP127");
- register_ber_oid_name("2.16.840.1.101.2.2.3.31", "id-oc-mLA");
- register_ber_oid_name("2.16.840.1.101.2.2.3.34", "id-oc-orgACP127");
- register_ber_oid_name("2.16.840.1.101.2.2.3.35", "id-oc-plaCollectiveACP127");
- register_ber_oid_name("2.16.840.1.101.2.2.3.37", "id-oc-routingIndicator");
- register_ber_oid_name("2.16.840.1.101.2.2.3.38", "id-oc-sigintPLA");
- register_ber_oid_name("2.16.840.1.101.2.2.3.39", "id-oc-sIPLA");
- register_ber_oid_name("2.16.840.1.101.2.2.3.40", "id-oc-spotPLA");
- register_ber_oid_name("2.16.840.1.101.2.2.3.41", "id-oc-taskForceACP127");
- register_ber_oid_name("2.16.840.1.101.2.2.3.42", "id-oc-tenantACP127");
- register_ber_oid_name("2.16.840.1.101.2.2.3.47", "id-oc-plaACP127");
- register_ber_oid_name("2.16.840.1.101.2.2.3.52", "id-oc-aliasCommonName");
- register_ber_oid_name("2.16.840.1.101.2.2.3.53", "id-oc-aliasOrganizationalUnit");
- register_ber_oid_name("2.16.840.1.101.2.2.3.54", "id-oc-distributionCodesHandled");
- register_ber_oid_name("2.16.840.1.101.2.2.3.55", "id-oc-distributionCodeDescription");
- register_ber_oid_name("2.16.840.1.101.2.2.3.56", "id-oc-plaUser");
- register_ber_oid_name("2.16.840.1.101.2.2.3.57", "id-oc-addressList");
- register_ber_oid_name("2.16.840.1.101.2.2.3.58", "id-oc-altSpellingACP127");
- register_ber_oid_name("2.16.840.1.101.2.2.3.59", "id-oc-messagingGateway");
- register_ber_oid_name("2.16.840.1.101.2.2.3.60", "id-oc-network");
- register_ber_oid_name("2.16.840.1.101.2.2.3.61", "id-oc-networkInstructions");
- register_ber_oid_name("2.16.840.1.101.2.2.3.62", "id-oc-otherContactInformation");
- register_ber_oid_name("2.16.840.1.101.2.2.3.63", "id-oc-releaseAuthorityPerson");
- register_ber_oid_name("2.16.840.1.101.2.2.3.64", "id-oc-mLAgent");
- register_ber_oid_name("2.16.840.1.101.2.2.3.65", "id-oc-releaseAuthorityPersonA");
- register_ber_oid_name("2.16.840.1.101.2.2.3.66", "id-oc-securePkiUser");
- register_ber_oid_name("2.16.840.1.101.2.2.3.67", "id-oc-dSSCSPLA");
- register_ber_oid_name("2.16.840.1.101.2.2.3.68", "id-oc-aCPNetworkEdB");
- register_ber_oid_name("2.16.840.1.101.2.2.3.69", "id-oc-aCPNetworkInstructionsEdB");
+ add_oid_str_name("2.16.840.1.101.2.2.3.26", "id-oc-plaData");
+ add_oid_str_name("2.16.840.1.101.2.2.3.28", "id-oc-cadACP127");
+ add_oid_str_name("2.16.840.1.101.2.2.3.31", "id-oc-mLA");
+ add_oid_str_name("2.16.840.1.101.2.2.3.34", "id-oc-orgACP127");
+ add_oid_str_name("2.16.840.1.101.2.2.3.35", "id-oc-plaCollectiveACP127");
+ add_oid_str_name("2.16.840.1.101.2.2.3.37", "id-oc-routingIndicator");
+ add_oid_str_name("2.16.840.1.101.2.2.3.38", "id-oc-sigintPLA");
+ add_oid_str_name("2.16.840.1.101.2.2.3.39", "id-oc-sIPLA");
+ add_oid_str_name("2.16.840.1.101.2.2.3.40", "id-oc-spotPLA");
+ add_oid_str_name("2.16.840.1.101.2.2.3.41", "id-oc-taskForceACP127");
+ add_oid_str_name("2.16.840.1.101.2.2.3.42", "id-oc-tenantACP127");
+ add_oid_str_name("2.16.840.1.101.2.2.3.47", "id-oc-plaACP127");
+ add_oid_str_name("2.16.840.1.101.2.2.3.52", "id-oc-aliasCommonName");
+ add_oid_str_name("2.16.840.1.101.2.2.3.53", "id-oc-aliasOrganizationalUnit");
+ add_oid_str_name("2.16.840.1.101.2.2.3.54", "id-oc-distributionCodesHandled");
+ add_oid_str_name("2.16.840.1.101.2.2.3.55", "id-oc-distributionCodeDescription");
+ add_oid_str_name("2.16.840.1.101.2.2.3.56", "id-oc-plaUser");
+ add_oid_str_name("2.16.840.1.101.2.2.3.57", "id-oc-addressList");
+ add_oid_str_name("2.16.840.1.101.2.2.3.58", "id-oc-altSpellingACP127");
+ add_oid_str_name("2.16.840.1.101.2.2.3.59", "id-oc-messagingGateway");
+ add_oid_str_name("2.16.840.1.101.2.2.3.60", "id-oc-network");
+ add_oid_str_name("2.16.840.1.101.2.2.3.61", "id-oc-networkInstructions");
+ add_oid_str_name("2.16.840.1.101.2.2.3.62", "id-oc-otherContactInformation");
+ add_oid_str_name("2.16.840.1.101.2.2.3.63", "id-oc-releaseAuthorityPerson");
+ add_oid_str_name("2.16.840.1.101.2.2.3.64", "id-oc-mLAgent");
+ add_oid_str_name("2.16.840.1.101.2.2.3.65", "id-oc-releaseAuthorityPersonA");
+ add_oid_str_name("2.16.840.1.101.2.2.3.66", "id-oc-securePkiUser");
+ add_oid_str_name("2.16.840.1.101.2.2.3.67", "id-oc-dSSCSPLA");
+ add_oid_str_name("2.16.840.1.101.2.2.3.68", "id-oc-aCPNetworkEdB");
+ add_oid_str_name("2.16.840.1.101.2.2.3.69", "id-oc-aCPNetworkInstructionsEdB");
/* gateway types */
- register_ber_oid_name("2.16.840.1.101.2.2.5.0", "acp120-acp127");
- register_ber_oid_name("2.16.840.1.101.2.2.5.1", "acp120-janap128");
- register_ber_oid_name("2.16.840.1.101.2.2.5.2", "acp120-mhs");
- register_ber_oid_name("2.16.840.1.101.2.2.5.3", "acp120-mmhs");
- register_ber_oid_name("2.16.840.1.101.2.2.5.4", "acp120-rfc822");
- register_ber_oid_name("2.16.840.1.101.2.2.5.5", "boundaryMTA");
- register_ber_oid_name("2.16.840.1.101.2.2.5.6", "mmhs-mhs");
- register_ber_oid_name("2.16.840.1.101.2.2.5.7", "mmhs-rfc822");
- register_ber_oid_name("2.16.840.1.101.2.2.5.8", "mta-acp127");
+ add_oid_str_name("2.16.840.1.101.2.2.5.0", "acp120-acp127");
+ add_oid_str_name("2.16.840.1.101.2.2.5.1", "acp120-janap128");
+ add_oid_str_name("2.16.840.1.101.2.2.5.2", "acp120-mhs");
+ add_oid_str_name("2.16.840.1.101.2.2.5.3", "acp120-mmhs");
+ add_oid_str_name("2.16.840.1.101.2.2.5.4", "acp120-rfc822");
+ add_oid_str_name("2.16.840.1.101.2.2.5.5", "boundaryMTA");
+ add_oid_str_name("2.16.840.1.101.2.2.5.6", "mmhs-mhs");
+ add_oid_str_name("2.16.840.1.101.2.2.5.7", "mmhs-rfc822");
+ add_oid_str_name("2.16.840.1.101.2.2.5.8", "mta-acp127");
}
diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c
index cea1aeb173..f756ba2208 100644
--- a/asn1/acse/packet-acse-template.c
+++ b/asn1/acse/packet-acse-template.c
@@ -42,6 +42,7 @@
#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -268,7 +269,7 @@ void proto_register_acse(void) {
void proto_reg_handoff_acse(void) {
/*#include "packet-acse-dis-tab.c"*/
- register_ber_oid_name("2.2.3.1.1","aCSE-id");
+ add_oid_str_name("2.2.3.1.1","aCSE-id");
register_ber_oid_dissector(ACSE_APDU_OID, dissect_acse, proto_acse, "acse-as-id");
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index 7a3c5e3fbc..1649967848 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -40,6 +40,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <epan/tap.h>
#include <stdio.h>
@@ -760,7 +761,7 @@ void proto_register_camel(void) {
register_ber_oid_dissector_handle("0.4.0.0.1.0.52.1",camel_handle, proto_camel, "itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network|umts-Network(1) applicationContext(0) cap-gsmSRF-to-gsmscf(52) version2(1)" );
register_ber_oid_dissector_handle("0.4.0.0.1.21.3.50",camel_handle, proto_camel, "itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) cAP3OE(21) ac(3) id-ac-CAP-gprsSSF-gsmSCF-AC(50)" );
- register_ber_oid_name("0.4.0.0.1.1.5.2","iitu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) abstractSyntax(1) cap-GPRS-ReferenceNumber(5) version3(2)");
+ add_oid_str_name("0.4.0.0.1.1.5.2","iitu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) abstractSyntax(1) cap-GPRS-ReferenceNumber(5) version3(2)");
diff --git a/asn1/cdt/cdt.cnf b/asn1/cdt/cdt.cnf
index e7e1ee8ae1..13a1a2711d 100644
--- a/asn1/cdt/cdt.cnf
+++ b/asn1/cdt/cdt.cnf
@@ -49,7 +49,7 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt"
%(DEFAULT_BODY)s
if (obj_id) {
- const char *name = get_ber_oid_name (obj_id);
+ const char *name = get_oid_str_name (obj_id);
if (!name) {
name = obj_id;
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index a69354ea76..cd85d95891 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -30,6 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -256,8 +257,8 @@ void proto_reg_handoff_cmip(void) {
register_ber_oid_dissector("2.9.3.2.7.63", dissect_cmip_attribute_63, proto_cmip, "smi2AttributeID (7) nameBinding(63)");
register_ber_oid_dissector("2.9.3.2.7.65", dissect_cmip_attribute_65, proto_cmip, "smi2AttributeID (7) objectClass(65)");
- register_ber_oid_name("2.9.3.2.3.4","eventForwardingDiscriminator(4)");
- register_ber_oid_name("2.9.1.1.4","joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)");
+ add_oid_str_name("2.9.3.2.3.4","eventForwardingDiscriminator(4)");
+ add_oid_str_name("2.9.1.1.4","joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)");
}
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf
index bfb002e3dc..04d2d72217 100644
--- a/asn1/cms/cms.cnf
+++ b/asn1/cms/cms.cnf
@@ -96,7 +96,7 @@ EncryptedContentInfo/contentType encryptedContentType
%(DEFAULT_BODY)s
if(object_identifier_id) {
- name = get_ber_oid_name(object_identifier_id);
+ name = get_oid_str_name(object_identifier_id);
proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id);
}
diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c
index d2fb2049f0..4bc4a31d3b 100644
--- a/asn1/dap/packet-dap-template.c
+++ b/asn1/dap/packet-dap-template.c
@@ -31,6 +31,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -316,7 +317,7 @@ void proto_reg_handoff_dap(void) {
/* APPLICATION CONTEXT */
- register_ber_oid_name("2.5.3.1", "id-ac-directory-access");
+ add_oid_str_name("2.5.3.1", "id-ac-directory-access");
/* ABSTRACT SYNTAXES */
diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index ab4a1055e8..73383f36c4 100644
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.c
@@ -31,6 +31,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -243,10 +244,10 @@ void proto_reg_handoff_disp(void) {
/* APPLICATION CONTEXT */
- register_ber_oid_name("2.5.3.4", "id-ac-shadow-consumer-initiated");
- register_ber_oid_name("2.5.3.5", "id-ac-shadow-supplier-initiated");
- register_ber_oid_name("2.5.3.6", "id-ac-reliable-shadow-consumer-initiated");
- register_ber_oid_name("2.5.3.7", "id-ac-reliable-shadow-supplier-initiated");
+ add_oid_str_name("2.5.3.4", "id-ac-shadow-consumer-initiated");
+ add_oid_str_name("2.5.3.5", "id-ac-shadow-supplier-initiated");
+ add_oid_str_name("2.5.3.6", "id-ac-reliable-shadow-consumer-initiated");
+ add_oid_str_name("2.5.3.7", "id-ac-reliable-shadow-supplier-initiated");
/* ABSTRACT SYNTAXES */
@@ -259,7 +260,7 @@ void proto_reg_handoff_disp(void) {
}
/* OPERATIONAL BINDING */
- register_ber_oid_name("2.5.1.0.5.1", "id-op-binding-shadow");
+ add_oid_str_name("2.5.1.0.5.1", "id-op-binding-shadow");
tpkt_handle = find_dissector("tpkt");
diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf
index 11b3e96ce8..19f10a0784 100644
--- a/asn1/dop/dop.cnf
+++ b/asn1/dop/dop.cnf
@@ -96,7 +96,7 @@ ACIItem B "2.5.24.6" "id-aca-subentryACI"
%(DEFAULT_BODY)s
if(check_col(pinfo->cinfo, COL_INFO)) {
- name = get_ber_oid_name(binding_type);
+ name = get_oid_str_name(binding_type);
col_append_fstr(pinfo->cinfo, COL_INFO, " %%s", name ? name : binding_type);
}
diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c
index 72a9b11768..801ee49a39 100644
--- a/asn1/dop/packet-dop-template.c
+++ b/asn1/dop/packet-dop-template.c
@@ -31,6 +31,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -259,7 +260,7 @@ void proto_reg_handoff_dop(void) {
#include "packet-dop-dis-tab.c"
/* APPLICATION CONTEXT */
- register_ber_oid_name("2.5.3.3", "id-ac-directory-operational-binding-management");
+ add_oid_str_name("2.5.3.3", "id-ac-directory-operational-binding-management");
/* ABSTRACT SYNTAXES */
@@ -270,26 +271,26 @@ void proto_reg_handoff_dop(void) {
/* BINDING TYPES */
- register_ber_oid_name("2.5.19.1", "shadow-agreement");
- register_ber_oid_name("2.5.19.2", "hierarchical-agreement");
- register_ber_oid_name("2.5.19.3", "non-specific-hierarchical-agreement");
+ add_oid_str_name("2.5.19.1", "shadow-agreement");
+ add_oid_str_name("2.5.19.2", "hierarchical-agreement");
+ add_oid_str_name("2.5.19.3", "non-specific-hierarchical-agreement");
/* ACCESS CONTROL SCHEMES */
- register_ber_oid_name("2.5.28.1", "basic-ACS");
- register_ber_oid_name("2.5.28.2", "simplified-ACS");
- register_ber_oid_name("2.5.28.3", "ruleBased-ACS");
- register_ber_oid_name("2.5.28.4", "ruleAndBasic-ACS");
- register_ber_oid_name("2.5.28.5", "ruleAndSimple-ACS");
+ add_oid_str_name("2.5.28.1", "basic-ACS");
+ add_oid_str_name("2.5.28.2", "simplified-ACS");
+ add_oid_str_name("2.5.28.3", "ruleBased-ACS");
+ add_oid_str_name("2.5.28.4", "ruleAndBasic-ACS");
+ add_oid_str_name("2.5.28.5", "ruleAndSimple-ACS");
/* ADMINISTRATIVE ROLES */
- register_ber_oid_name("2.5.23.1", "id-ar-autonomousArea");
- register_ber_oid_name("2.5.23.2", "id-ar-accessControlSpecificArea");
- register_ber_oid_name("2.5.23.3", "id-ar-accessControlInnerArea");
- register_ber_oid_name("2.5.23.4", "id-ar-subschemaAdminSpecificArea");
- register_ber_oid_name("2.5.23.5", "id-ar-collectiveAttributeSpecificArea");
- register_ber_oid_name("2.5.23.6", "id-ar-collectiveAttributeInnerArea");
- register_ber_oid_name("2.5.23.7", "id-ar-contextDefaultSpecificArea");
- register_ber_oid_name("2.5.23.8", "id-ar-serviceSpecificArea");
+ add_oid_str_name("2.5.23.1", "id-ar-autonomousArea");
+ add_oid_str_name("2.5.23.2", "id-ar-accessControlSpecificArea");
+ add_oid_str_name("2.5.23.3", "id-ar-accessControlInnerArea");
+ add_oid_str_name("2.5.23.4", "id-ar-subschemaAdminSpecificArea");
+ add_oid_str_name("2.5.23.5", "id-ar-collectiveAttributeSpecificArea");
+ add_oid_str_name("2.5.23.6", "id-ar-collectiveAttributeInnerArea");
+ add_oid_str_name("2.5.23.7", "id-ar-contextDefaultSpecificArea");
+ add_oid_str_name("2.5.23.8", "id-ar-serviceSpecificArea");
/* remember the tpkt handler for change in preferences */
tpkt_handle = find_dissector("tpkt");
diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c
index 085b24331b..fb449d735c 100644
--- a/asn1/dsp/packet-dsp-template.c
+++ b/asn1/dsp/packet-dsp-template.c
@@ -31,6 +31,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -321,7 +322,7 @@ void proto_reg_handoff_dsp(void) {
/* APPLICATION CONTEXT */
- register_ber_oid_name("2.5.3.2", "id-ac-directory-system");
+ add_oid_str_name("2.5.3.2", "id-ac-directory-system");
/* ABSTRACT SYNTAXES */
diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c
index 66d33238ef..5a5fe32280 100644
--- a/asn1/ftam/packet-ftam-template.c
+++ b/asn1/ftam/packet-ftam-template.c
@@ -35,6 +35,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -126,22 +127,22 @@ void proto_reg_handoff_ftam(void) {
register_ber_oid_dissector("1.3.14.5.2.2", dissect_ftam, proto_ftam,"NIST file directory entry abstract syntax");
/* Unstructured text file document type FTAM-1 */
- register_ber_oid_name("1.0.8571.5.1","ISO FTAM unstructured text");
- register_ber_oid_name("1.0.8571.5.2","ISO FTAM sequential text");
- register_ber_oid_name("1.0.8571.2.3","FTAM unstructured text abstract syntax");
- register_ber_oid_name("1.0.8571.2.4","FTAM sequential text abstract syntax");
- register_ber_oid_name("1.0.8571.2.5","FTAM simple-hierarchy");
- register_ber_oid_name("1.0.8571.3.1","FTAM hierarchical file model");
- register_ber_oid_name("1.0.8571.4.1","FTAM unstructured constraint set");
+ add_oid_str_name("1.0.8571.5.1","ISO FTAM unstructured text");
+ add_oid_str_name("1.0.8571.5.2","ISO FTAM sequential text");
+ add_oid_str_name("1.0.8571.2.3","FTAM unstructured text abstract syntax");
+ add_oid_str_name("1.0.8571.2.4","FTAM sequential text abstract syntax");
+ add_oid_str_name("1.0.8571.2.5","FTAM simple-hierarchy");
+ add_oid_str_name("1.0.8571.3.1","FTAM hierarchical file model");
+ add_oid_str_name("1.0.8571.4.1","FTAM unstructured constraint set");
/* Unstructured text file document type FTAM-3 */
- register_ber_oid_name("1.0.8571.5.3","ISO FTAM unstructured binary");
- register_ber_oid_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax");
+ add_oid_str_name("1.0.8571.5.3","ISO FTAM unstructured binary");
+ add_oid_str_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax");
/* Filedirectory file document type NBS-9 */
- register_ber_oid_name("1.3.14.5.5.9","NBS-9 FTAM file directory file");
+ add_oid_str_name("1.3.14.5.5.9","NBS-9 FTAM file directory file");
/* Filedirectory file document type NBS-9 (WITH OLD NIST OIDs)*/
- register_ber_oid_name("1.3.9999.1.5.9","NBS-9-OLD FTAM file directory file");
- register_ber_oid_name("1.3.9999.1.2.2","NIST file directory entry abstract syntax");
+ add_oid_str_name("1.3.9999.1.5.9","NBS-9-OLD FTAM file directory file");
+ add_oid_str_name("1.3.9999.1.2.2","NIST file directory entry abstract syntax");
}
diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c
index e95c2cebcc..d1b47a4865 100644
--- a/asn1/gsmmap/packet-gsm_map-template.c
+++ b/asn1/gsmmap/packet-gsm_map-template.c
@@ -39,6 +39,7 @@
#include <epan/conversation.h>
#include <epan/tap.h>
#include <epan/emem.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -2238,9 +2239,9 @@ void proto_register_gsm_map(void) {
gsm_map_tap = register_tap("gsm_map");
/* #include "packet-gsm_map-dis-tab.c" */
- register_ber_oid_name("1.2.826.0.1249.58.1.0","iso(1) member-body(2) bsi(826) disc(0) ericsson(1249) gsmNetworkApplicationsDefinition(58) gsm-Map(1) gsm-Map-Ext(0)" );
- register_ber_oid_name("1.3.12.2.1107.3.66.1.2","accessTypeNotAllowed-id" );
- /*register_ber_oid_name("0.4.0.0.1.0.1.3","itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) networkLocUp(1) version3(3)" );
+ add_oid_str_name("1.2.826.0.1249.58.1.0","iso(1) member-body(2) bsi(826) disc(0) ericsson(1249) gsmNetworkApplicationsDefinition(58) gsm-Map(1) gsm-Map-Ext(0)" );
+ add_oid_str_name("1.3.12.2.1107.3.66.1.2","accessTypeNotAllowed-id" );
+ /*add_oid_str_name("0.4.0.0.1.0.1.3","itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) networkLocUp(1) version3(3)" );
*
* Register our configuration options, particularly our ssn:s
* Set default SSNs
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 6c5734c942..27463785e2 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -1424,26 +1424,26 @@ proto_reg_handoff_ldap(void)
gssapi_wrap_handle = find_dissector("gssapi_verf");
/* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dsml/dsml/ldap_controls_and_session_support.asp */
- register_ber_oid_name("1.2.840.113556.1.4.319","LDAP_PAGED_RESULT_OID_STRING");
- register_ber_oid_name("1.2.840.113556.1.4.417","LDAP_SERVER_SHOW_DELETED_OID");
- register_ber_oid_name("1.2.840.113556.1.4.473","LDAP_SERVER_SORT_OID");
- register_ber_oid_name("1.2.840.113556.1.4.521","LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID");
- register_ber_oid_name("1.2.840.113556.1.4.528","LDAP_SERVER_NOTIFICATION_OID");
- register_ber_oid_name("1.2.840.113556.1.4.529","LDAP_SERVER_EXTENDED_DN_OID");
- register_ber_oid_name("1.2.840.113556.1.4.619","LDAP_SERVER_LAZY_COMMIT_OID");
- register_ber_oid_name("1.2.840.113556.1.4.801","LDAP_SERVER_SD_FLAGS_OID");
- register_ber_oid_name("1.2.840.113556.1.4.805","LDAP_SERVER_TREE_DELETE_OID");
- register_ber_oid_name("1.2.840.113556.1.4.841","LDAP_SERVER_DIRSYNC_OID");
- register_ber_oid_name("1.2.840.113556.1.4.970 ","None");
- register_ber_oid_name("1.2.840.113556.1.4.1338","LDAP_SERVER_VERIFY_NAME_OID");
- register_ber_oid_name("1.2.840.113556.1.4.1339","LDAP_SERVER_DOMAIN_SCOPE_OID");
- register_ber_oid_name("1.2.840.113556.1.4.1340","LDAP_SERVER_SEARCH_OPTIONS_OID");
- register_ber_oid_name("1.2.840.113556.1.4.1413","LDAP_SERVER_PERMISSIVE_MODIFY_OID");
- register_ber_oid_name("1.2.840.113556.1.4.1504","LDAP_SERVER_ASQ_OID");
- register_ber_oid_name("1.2.840.113556.1.4.1781","LDAP_SERVER_FAST_BIND_OID");
- register_ber_oid_name("1.3.6.1.4.1.1466.101.119.1","None");
- register_ber_oid_name("1.3.6.1.4.1.1466.20037","LDAP_START_TLS_OID");
- register_ber_oid_name("2.16.840.1.113730.3.4.9","LDAP_CONTROL_VLVREQUEST VLV");
+ add_oid_str_name("1.2.840.113556.1.4.319","LDAP_PAGED_RESULT_OID_STRING");
+ add_oid_str_name("1.2.840.113556.1.4.417","LDAP_SERVER_SHOW_DELETED_OID");
+ add_oid_str_name("1.2.840.113556.1.4.473","LDAP_SERVER_SORT_OID");
+ add_oid_str_name("1.2.840.113556.1.4.521","LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID");
+ add_oid_str_name("1.2.840.113556.1.4.528","LDAP_SERVER_NOTIFICATION_OID");
+ add_oid_str_name("1.2.840.113556.1.4.529","LDAP_SERVER_EXTENDED_DN_OID");
+ add_oid_str_name("1.2.840.113556.1.4.619","LDAP_SERVER_LAZY_COMMIT_OID");
+ add_oid_str_name("1.2.840.113556.1.4.801","LDAP_SERVER_SD_FLAGS_OID");
+ add_oid_str_name("1.2.840.113556.1.4.805","LDAP_SERVER_TREE_DELETE_OID");
+ add_oid_str_name("1.2.840.113556.1.4.841","LDAP_SERVER_DIRSYNC_OID");
+ add_oid_str_name("1.2.840.113556.1.4.970 ","None");
+ add_oid_str_name("1.2.840.113556.1.4.1338","LDAP_SERVER_VERIFY_NAME_OID");
+ add_oid_str_name("1.2.840.113556.1.4.1339","LDAP_SERVER_DOMAIN_SCOPE_OID");
+ add_oid_str_name("1.2.840.113556.1.4.1340","LDAP_SERVER_SEARCH_OPTIONS_OID");
+ add_oid_str_name("1.2.840.113556.1.4.1413","LDAP_SERVER_PERMISSIVE_MODIFY_OID");
+ add_oid_str_name("1.2.840.113556.1.4.1504","LDAP_SERVER_ASQ_OID");
+ add_oid_str_name("1.2.840.113556.1.4.1781","LDAP_SERVER_FAST_BIND_OID");
+ add_oid_str_name("1.3.6.1.4.1.1466.101.119.1","None");
+ add_oid_str_name("1.3.6.1.4.1.1466.20037","LDAP_START_TLS_OID");
+ add_oid_str_name("2.16.840.1.113730.3.4.9","LDAP_CONTROL_VLVREQUEST VLV");
register_ldap_name_dissector("netlogon", dissect_NetLogon_PDU, proto_cldap);
diff --git a/asn1/pkixproxy/packet-pkixproxy-template.c b/asn1/pkixproxy/packet-pkixproxy-template.c
index 1bc6d1053a..45f32b10cf 100644
--- a/asn1/pkixproxy/packet-pkixproxy-template.c
+++ b/asn1/pkixproxy/packet-pkixproxy-template.c
@@ -29,6 +29,7 @@
#include <glib.h>
#include <epan/packet.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -76,8 +77,8 @@ void proto_register_pkixproxy(void) {
/*--- proto_reg_handoff_pkixproxy -------------------------------------------*/
void proto_reg_handoff_pkixproxy(void) {
#include "packet-pkixproxy-dis-tab.c"
- register_ber_oid_name("1.3.6.1.5.5.7.21.0", "id-ppl-anyLanguage");
- register_ber_oid_name("1.3.6.1.5.5.7.21.1", "id-ppl-inheritAll");
- register_ber_oid_name("1.3.6.1.5.5.7.21.2", "id-ppl-independent");
+ add_oid_str_name("1.3.6.1.5.5.7.21.0", "id-ppl-anyLanguage");
+ add_oid_str_name("1.3.6.1.5.5.7.21.1", "id-ppl-inheritAll");
+ add_oid_str_name("1.3.6.1.5.5.7.21.2", "id-ppl-independent");
}
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index 352f5c1427..0ff052a398 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -32,6 +32,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -161,7 +162,7 @@ proto_reg_handoff_tcap(void)
prefs_initialized = TRUE;
}
- register_ber_oid_name("0.0.17.773.1.1.1",
+ add_oid_str_name("0.0.17.773.1.1.1",
"itu-t(0) recommendation(0) q(17) 773 as(1) dialogue-as(1) version1(1)");
data_handle = find_dissector("data");
diff --git a/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c
index d1a5de13e0..133ce7609e 100644
--- a/asn1/wlancertextn/packet-wlancertextn-template.c
+++ b/asn1/wlancertextn/packet-wlancertextn-template.c
@@ -30,6 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -80,7 +81,7 @@ void proto_register_wlancertextn(void) {
/*--- proto_reg_handoff_wlancertextn -------------------------------------------*/
void proto_reg_handoff_wlancertextn(void) {
#include "packet-wlancertextn-dis-tab.c"
- register_ber_oid_name("1.3.6.1.5.5.7.3.13","id-kp-eapOverPPP");
- register_ber_oid_name("1.3.6.1.5.5.7.3.14","id-kp-eapOverLAN");
+ add_oid_str_name("1.3.6.1.5.5.7.3.13","id-kp-eapOverPPP");
+ add_oid_str_name("1.3.6.1.5.5.7.3.14","id-kp-eapOverLAN");
}
diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c
index a21c95bb96..5dcfdb4860 100644
--- a/asn1/x411/packet-x411-template.c
+++ b/asn1/x411/packet-x411-template.c
@@ -30,6 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -86,7 +87,7 @@ call_x411_oid_callback(char *base_oid, tvbuff_t *tvb, int offset, packet_info *p
sprintf(extension_oid, "%s.%d", base_oid, extension_id);
- name = get_ber_oid_name(extension_oid);
+ name = get_oid_str_name(extension_oid);
proto_item_append_text(tree, " (%s)", name ? name : extension_oid);
return call_ber_oid_callback(extension_oid, tvb, offset, pinfo, tree);
@@ -230,7 +231,7 @@ void proto_reg_handoff_x411(void) {
/* APPLICATION CONTEXT */
- register_ber_oid_name("2.6.0.1.6", "id-ac-mts-transfer");
+ add_oid_str_name("2.6.0.1.6", "id-ac-mts-transfer");
/* ABSTRACT SYNTAXES */
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index e11d91bd73..70536a7b9f 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -229,7 +229,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
offset=call_x411_oid_callback("x411.extension", tvb, offset, pinfo, tree);
else if(object_identifier_id) {
call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
- name = get_ber_oid_name(object_identifier_id);
+ name = get_oid_str_name(object_identifier_id);
proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id);
}
@@ -327,7 +327,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
%(DEFAULT_BODY)s
if(content_type_id) {
- name = get_ber_oid_name(content_type_id);
+ name = get_oid_str_name(content_type_id);
if(!name) name = content_type_id;
diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf
index 7768873e5a..213eb75d4e 100644
--- a/asn1/x420/x420.cnf
+++ b/asn1/x420/x420.cnf
@@ -114,7 +114,7 @@ ForwardedContentParameters B "2.6.1.11.17.1.3.26.0.4406.0.4.1" "id-ep-content-
%(DEFAULT_BODY)s
- name = get_ber_oid_name(object_identifier_id);
+ name = get_oid_str_name(object_identifier_id);
proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id);
#.FN_BODY T_value
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index e0cf45e4d2..e8842d6c8b 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -71,7 +71,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate
%(DEFAULT_BODY)s
if(algorithm_id) {
- name = get_ber_oid_name(algorithm_id);
+ name = get_oid_str_name(algorithm_id);
proto_item_append_text(tree, " (%%s)", name ? name : algorithm_id);
}
@@ -88,7 +88,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate
%(DEFAULT_BODY)s
if(extension_id) {
- name = get_ber_oid_name(extension_id);
+ name = get_oid_str_name(extension_id);
proto_item_append_text(tree, " (%%s)", name ? name : extension_id);
}
diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf
index e4f96c29a3..7c12f17764 100644
--- a/asn1/x509if/x509if.cnf
+++ b/asn1/x509if/x509if.cnf
@@ -141,7 +141,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison"
if(object_identifier_id) {
/* see if we can find a nice name */
- name = get_ber_oid_name(object_identifier_id);
+ name = get_oid_str_name(object_identifier_id);
if(!name) name = object_identifier_id;
if(doing_dn) { /* append it to the RDN */
@@ -197,7 +197,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison"
if((fmt = val_to_str(ava_hf_index, fmt_vals, "")) && *fmt) {
/* we have a format */
- if(!(name = get_ber_oid_name(object_identifier_id)))
+ if(!(name = get_oid_str_name(object_identifier_id)))
name = object_identifier_id;
g_snprintf(last_ava, MAX_AVA_STR_LEN, "%%s %%s %%s", name, fmt, value);
diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c
index 3ee2ecdc26..f8433bf71e 100644
--- a/asn1/x509sat/packet-x509sat-template.c
+++ b/asn1/x509sat/packet-x509sat-template.c
@@ -30,6 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
+#include <epan/oid_resolv.h>
#include <stdio.h>
#include <string.h>
@@ -81,33 +82,33 @@ void proto_reg_handoff_x509sat(void) {
/* OBJECT CLASSES */
- register_ber_oid_name("2.5.6.0", "top");
- register_ber_oid_name("2.5.6.1", "alias");
- register_ber_oid_name("2.5.6.2", "country");
- register_ber_oid_name("2.5.6.3", "locality");
- register_ber_oid_name("2.5.6.4", "organization");
- register_ber_oid_name("2.5.6.1", "organizationalUnit");
- register_ber_oid_name("2.5.6.6", "person");
- register_ber_oid_name("2.5.6.7", "organizationalPerson");
- register_ber_oid_name("2.5.6.8", "organizationalRole");
- register_ber_oid_name("2.5.6.9", "groupOfNames");
- register_ber_oid_name("2.5.6.10", "residentialPerson");
- register_ber_oid_name("2.5.6.11", "applicationProcess");
- register_ber_oid_name("2.5.6.12", "applicationEntity");
- register_ber_oid_name("2.5.6.13", "dSA");
- register_ber_oid_name("2.5.6.14", "device");
- register_ber_oid_name("2.5.6.15", "strongAuthenticationUser");
- register_ber_oid_name("2.5.6.16", "certificationAuthority");
- register_ber_oid_name("2.5.6.16.2", "certificationAuthorityV2");
- register_ber_oid_name("2.5.6.17", "groupOfUniqueNames");
- register_ber_oid_name("2.5.6.18", "userSecurityInformation");
- register_ber_oid_name("2.5.6.19", "cRLDistributionPoint");
- register_ber_oid_name("2.5.6.20", "dmd");
- register_ber_oid_name("2.5.6.21", "pkiUser");
- register_ber_oid_name("2.5.6.22", "pkiCA");
+ add_oid_str_name("2.5.6.0", "top");
+ add_oid_str_name("2.5.6.1", "alias");
+ add_oid_str_name("2.5.6.2", "country");
+ add_oid_str_name("2.5.6.3", "locality");
+ add_oid_str_name("2.5.6.4", "organization");
+ add_oid_str_name("2.5.6.1", "organizationalUnit");
+ add_oid_str_name("2.5.6.6", "person");
+ add_oid_str_name("2.5.6.7", "organizationalPerson");
+ add_oid_str_name("2.5.6.8", "organizationalRole");
+ add_oid_str_name("2.5.6.9", "groupOfNames");
+ add_oid_str_name("2.5.6.10", "residentialPerson");
+ add_oid_str_name("2.5.6.11", "applicationProcess");
+ add_oid_str_name("2.5.6.12", "applicationEntity");
+ add_oid_str_name("2.5.6.13", "dSA");
+ add_oid_str_name("2.5.6.14", "device");
+ add_oid_str_name("2.5.6.15", "strongAuthenticationUser");
+ add_oid_str_name("2.5.6.16", "certificationAuthority");
+ add_oid_str_name("2.5.6.16.2", "certificationAuthorityV2");
+ add_oid_str_name("2.5.6.17", "groupOfUniqueNames");
+ add_oid_str_name("2.5.6.18", "userSecurityInformation");
+ add_oid_str_name("2.5.6.19", "cRLDistributionPoint");
+ add_oid_str_name("2.5.6.20", "dmd");
+ add_oid_str_name("2.5.6.21", "pkiUser");
+ add_oid_str_name("2.5.6.22", "pkiCA");
- register_ber_oid_name("2.5.6.28", "parent");
- register_ber_oid_name("2.5.6.29", "child");
+ add_oid_str_name("2.5.6.28", "parent");
+ add_oid_str_name("2.5.6.29", "child");
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 05:13:35 +0000