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

Use OID variable instead of function.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25247 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-05-28 01:19:55 +00:00
parent f0f5f236dc
commit 3d88641010
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hx509/print.c
View File

@@ -750,14 +750,14 @@ check_authorityInfoAccess(hx509_validate_ctx ctx,
struct { struct {
const char *name; const char *name;
const heim_oid *(*oid)(void); const heim_oid *oid;
int (*func)(hx509_validate_ctx ctx, int (*func)(hx509_validate_ctx ctx,
struct cert_status *status, struct cert_status *status,
enum critical_flag cf, enum critical_flag cf,
const Extension *); const Extension *);
enum critical_flag cf; enum critical_flag cf;
} check_extension[] = { } check_extension[] = {
#define ext(name, checkname) #name, &oid_id_x509_ce_##name, check_##checkname #define ext(name, checkname) #name, &asn1_oid_id_x509_ce_##name, check_##checkname
{ ext(subjectDirectoryAttributes, Null), M_N_C }, { ext(subjectDirectoryAttributes, Null), M_N_C },
{ ext(subjectKeyIdentifier, subjectKeyIdentifier), M_N_C }, { ext(subjectKeyIdentifier, subjectKeyIdentifier), M_N_C },
{ ext(keyUsage, Null), S_C }, { ext(keyUsage, Null), S_C },
@@ -781,13 +781,13 @@ struct {
{ ext(freshestCRL, Null), M_N_C }, { ext(freshestCRL, Null), M_N_C },
{ ext(inhibitAnyPolicy, Null), M_C }, { ext(inhibitAnyPolicy, Null), M_C },
#undef ext #undef ext
#define ext(name, checkname) #name, &oid_id_pkix_pe_##name, check_##checkname #define ext(name, checkname) #name, &asn1_oid_id_pkix_pe_##name, check_##checkname
{ ext(proxyCertInfo, proxyCertInfo), M_C }, { ext(proxyCertInfo, proxyCertInfo), M_C },
{ ext(authorityInfoAccess, authorityInfoAccess), M_C }, { ext(authorityInfoAccess, authorityInfoAccess), M_C },
#undef ext #undef ext
{ "US Fed PKI - PIV Interim", oid_id_uspkicommon_piv_interim, { "US Fed PKI - PIV Interim", &asn1_oid_id_uspkicommon_piv_interim,
check_Null, D_C }, check_Null, D_C },
{ "Netscape cert comment", oid_id_netscape_cert_comment, { "Netscape cert comment", &asn1_oid_id_netscape_cert_comment,
check_Null, D_C }, check_Null, D_C },
{ NULL } { NULL }
}; };
@@ -948,7 +948,7 @@ hx509_validate_cert(hx509_context context,
for (i = 0; i < t->extensions->len; i++) { for (i = 0; i < t->extensions->len; i++) {
for (j = 0; check_extension[j].name; j++) for (j = 0; check_extension[j].name; j++)
if (der_heim_oid_cmp((*check_extension[j].oid)(), if (der_heim_oid_cmp(check_extension[j].oid,
&t->extensions->val[i].extnID) == 0) &t->extensions->val[i].extnID) == 0)
break; break;
if (check_extension[j].name == NULL) { if (check_extension[j].name == NULL) {