diff options
| author | Rob Austein <sra@hactrn.net> | 2006-08-26 19:14:06 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-08-26 19:14:06 +0000 |
| commit | 52dacdd430e0b0d70ffabf33380b044b0132347a (patch) | |
| tree | b10079b095d4ef3975eb1b25805dc93d3b246852 /openssl/trunk/crypto/x509v3/v3_asid.c | |
| parent | 99b382d77e50198e59869fbb9c3cb52f0bf79ff5 (diff) | |
Add inheritance and subset tests.
svn path=/openssl/README; revision=233
Diffstat (limited to 'openssl/trunk/crypto/x509v3/v3_asid.c')
| -rw-r--r-- | openssl/trunk/crypto/x509v3/v3_asid.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/openssl/trunk/crypto/x509v3/v3_asid.c b/openssl/trunk/crypto/x509v3/v3_asid.c index 79dd262b..70bd5581 100644 --- a/openssl/trunk/crypto/x509v3/v3_asid.c +++ b/openssl/trunk/crypto/x509v3/v3_asid.c @@ -563,7 +563,7 @@ X509V3_EXT_METHOD v3_asid = { /* * Figure out whether extension uses inheritance. */ -static int asid_inherits(ASIdentifiers *asid) +int v3_asid_inherits(ASIdentifiers *asid) { return (asid != NULL && ((asid->asnum != NULL && @@ -604,6 +604,22 @@ static int asid_contains(ASIdOrRanges *parent, ASIdOrRanges *child) } /* + * Test whether a is a subet of b. + */ +int v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b) +{ + return (a == NULL || + a == b || + (b != NULL && + !v3_asid_inherits(a) && + !v3_asid_inherits(b) && + asid_contains(b->asnum->u.asIdsOrRanges, + a->asnum->u.asIdsOrRanges) && + asid_contains(b->rdi->u.asIdsOrRanges, + a->rdi->u.asIdsOrRanges))); +} + +/* * Validation error handling via callback. */ #define validation_err(_err_) \ @@ -756,7 +772,7 @@ int v3_asid_validate_resource_set(STACK_OF(X509) *chain, return 1; if (chain == NULL || sk_X509_num(chain) == 0) return 0; - if (!allow_inheritance && asid_inherits(ext)) + if (!allow_inheritance && v3_asid_inherits(ext)) return 0; return v3_asid_validate_path_internal(NULL, chain, ext); } |