oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Switch over to asn1 generaed oids.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17208 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-24 10:29:16 +00:00
parent 92764f2109
commit 8e39cadc48
1 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/hx509/name.c
View File

@@ -40,34 +40,17 @@ RCSID("$Id$");
* rfc3280 * rfc3280
*/ */
#define oid_enc(n) { sizeof(n)/sizeof(n[0]), n }
static unsigned country_num[] = { 2, 5, 4, 6 };
static heim_oid country_oid = oid_enc(country_num);
static unsigned organizationName_num[] = { 2, 5, 4, 10 };
static heim_oid organizationName_oid = oid_enc(organizationName_num);
static unsigned commonName_num[] = { 2, 5, 4, 3 };
static heim_oid commonName_oid = oid_enc(commonName_num);
static unsigned localityName_num[] = { 2, 5, 4, 7 };
static heim_oid localityName_oid = oid_enc(localityName_num);
static unsigned email_num[] = { 1, 2, 840, 113549, 1, 9, 1 };
static heim_oid email_oid = oid_enc(email_num);
static unsigned uid_num[] = { 0, 9, 2342, 19200300, 100, 1, 1 };
static heim_oid uid_oid = oid_enc(uid_num);
static unsigned dc_num[] = { 0, 9, 2342, 19200300, 100, 1, 25 };
static heim_oid dc_oid = oid_enc(dc_num);
static const struct { static const struct {
char *n; char *n;
heim_oid *o; const heim_oid *(*o)(void);
} no[] = { } no[] = {
{ "C", &country_oid }, { "C", oid_id_at_countryName },
{ "CN", &commonName_oid }, { "CN", oid_id_at_commonName },
{ "O", &organizationName_oid }, { "O", oid_id_at_organizationName },
{ "L", &localityName_oid }, { "L", oid_id_at_localityName },
{ "Email", &email_oid }, { "Email", oid_id_pkcs9_emailAddress },
{ "UID", &uid_oid }, { "UID", oid_id_Userid },
{ "DC", &dc_oid } { "DC", oid_id_domainComponent }
}; };
static char * static char *
@@ -134,7 +117,7 @@ oidtostring(const heim_oid *type)
size_t i, total_len = 0; size_t i, total_len = 0;
for (i = 0; i < sizeof(no)/sizeof(no[0]); i++) { for (i = 0; i < sizeof(no)/sizeof(no[0]); i++) {
if (heim_oid_cmp(no[i].o, type) == 0) if (heim_oid_cmp((*no[i].o)(), type) == 0)
return strdup(no[i].n); return strdup(no[i].n);
} }
@@ -148,6 +131,19 @@ oidtostring(const heim_oid *type)
return s; return s;
} }
static const heim_oid *
stringtooid(const char *name, size_t len)
{
int i;
for (i = 0; i < sizeof(no)/sizeof(no[0]); i++) {
if (strncasecmp(no[i].n, name, len) == 0)
return (*no[i].o)();
}
return NULL;
}
int int
hx509_name_to_string(const hx509_name name, char **str) hx509_name_to_string(const hx509_name name, char **str)
{ {
@@ -339,7 +335,7 @@ hx509_parse_name(const char *str, hx509_name *name)
p = str; p = str;
while (p != NULL && *p != '\0') { while (p != NULL && *p != '\0') {
heim_oid *oid; const heim_oid *oid;
int last; int last;
q = strchr(p, ','); q = strchr(p, ',');
@@ -354,15 +350,14 @@ hx509_parse_name(const char *str, hx509_name *name)
q = strchr(p, '='); q = strchr(p, '=');
if (q == NULL) if (q == NULL)
_hx509_abort("missing = in %s", p); _hx509_abort("missing = in %s", p);
if (q == p)
_hx509_abort("missing name before = in %s", p);
if ((q - p) > len) if ((q - p) > len)
_hx509_abort(" = after , in %s", p); _hx509_abort(" = after , in %s", p);
if (strncasecmp(p, "DC=", 3) == 0) { oid = stringtooid(p, q - p - 1);
oid = &dc_oid; if (oid == NULL) {
} else if (strncasecmp(p, "CN=", 3) == 0) {
oid = &commonName_oid;
} else {
_hx509_abort("unknown type: %.*s", (int)(q - p) - 1, p); _hx509_abort("unknown type: %.*s", (int)(q - p) - 1, p);
exit(1); exit(1);
} }