From 7329ae8ac61702df4ea49ce73067002983d091d5 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Wed, 31 Oct 2007 23:11:15 +0000 Subject: Use oid_add_from_string for adding names. fix compil of gsmmap and inap. Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?) svn path=/trunk/; revision=23325 --- asn1/x509sat/packet-x509sat-template.c | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'asn1/x509sat/packet-x509sat-template.c') diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index c16491f63e..f0dc5ee129 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -83,37 +83,37 @@ void proto_reg_handoff_x509sat(void) { /* OBJECT CLASSES */ - 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"); + oid_add_from_string("top","2.5.6.0"); + oid_add_from_string("alias","2.5.6.1"); + oid_add_from_string("country","2.5.6.2"); + oid_add_from_string("locality","2.5.6.3"); + oid_add_from_string("organization","2.5.6.4"); + oid_add_from_string("organizationalUnit","2.5.6.1"); + oid_add_from_string("person","2.5.6.6"); + oid_add_from_string("organizationalPerson","2.5.6.7"); + oid_add_from_string("organizationalRole","2.5.6.8"); + oid_add_from_string("groupOfNames","2.5.6.9"); + oid_add_from_string("residentialPerson","2.5.6.10"); + oid_add_from_string("applicationProcess","2.5.6.11"); + oid_add_from_string("applicationEntity","2.5.6.12"); + oid_add_from_string("dSA","2.5.6.13"); + oid_add_from_string("device","2.5.6.14"); + oid_add_from_string("strongAuthenticationUser","2.5.6.15"); + oid_add_from_string("certificationAuthority","2.5.6.16"); + oid_add_from_string("certificationAuthorityV2","2.5.6.16.2"); + oid_add_from_string("groupOfUniqueNames","2.5.6.17"); + oid_add_from_string("userSecurityInformation","2.5.6.18"); + oid_add_from_string("cRLDistributionPoint","2.5.6.19"); + oid_add_from_string("dmd","2.5.6.20"); + oid_add_from_string("pkiUser","2.5.6.21"); + oid_add_from_string("pkiCA","2.5.6.22"); - add_oid_str_name("2.5.6.28", "parent"); - add_oid_str_name("2.5.6.29", "child"); + oid_add_from_string("parent","2.5.6.28"); + oid_add_from_string("child","2.5.6.29"); /* RFC 2247 */ - add_oid_str_name("1.3.6.1.4.1.1446.344", "dcObject"); - add_oid_str_name("0.9.2342.19200300.100.4.13", "domain"); + oid_add_from_string("dcObject","1.3.6.1.4.1.1446.344"); + oid_add_from_string("domain","0.9.2342.19200300.100.4.13"); } -- cgit v1.2.3