diff options
author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-06-28 14:19:08 +0000 |
---|---|---|
committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-06-28 14:19:08 +0000 |
commit | 56d7db0c08d734d672c64d6c5c566ae3d70b7ed7 (patch) | |
tree | 8630f1f8a3129f886a07f432a88db41cad2af16d /asn1/acp133/packet-acp133-template.c | |
parent | 45aac4eb43f1c822625dd95551f4b694ee770e20 (diff) |
remove functions register_ber_oid_name() and get_ber_oid_name() from packet-ber.c, they were only OID but not BER related
use add_oid_str_name() and get_oid_str_name() instead of them
svn path=/trunk/; revision=18595
Diffstat (limited to 'asn1/acp133/packet-acp133-template.c')
-rw-r--r-- | asn1/acp133/packet-acp133-template.c | 91 |
1 files changed, 46 insertions, 45 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"); } |