I'll remember to try to compile this with warnings enabled next time :-)
const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node);
const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node);
-STACK_OF(POLICYQUALIFIER) *
+STACK_OF(POLICYQUALINFO) *
X509_policy_node_get0_qualifiers(const X509_POLICY_NODE *node);
const X509_POLICY_NODE *
X509_policy_node_get0_parent(const X509_POLICY_NODE *node);
X509_policy_node_get0_qualifiers(const X509_POLICY_NODE *node);
const X509_POLICY_NODE *
X509_policy_node_get0_parent(const X509_POLICY_NODE *node);
-static int policy_data_cmp(void *pa, void *pb);
+static int policy_data_cmp(const X509_POLICY_DATA * const *a,
+ const X509_POLICY_DATA * const *b);
static int policy_cache_set_int(long *out, ASN1_INTEGER *value);
/* Set cache entry according to CertificatePolicies extension.
static int policy_cache_set_int(long *out, ASN1_INTEGER *value);
/* Set cache entry according to CertificatePolicies extension.
return sk_X509_POLICY_DATA_value(cache->data, idx);
}
return sk_X509_POLICY_DATA_value(cache->data, idx);
}
-static int policy_data_cmp(void *pa, void *pb)
+static int policy_data_cmp(const X509_POLICY_DATA * const *a,
+ const X509_POLICY_DATA * const *b)
- X509_POLICY_DATA **a = pa; X509_POLICY_DATA **b = pb;
return OBJ_cmp((*a)->valid_policy, (*b)->valid_policy);
}
return OBJ_cmp((*a)->valid_policy, (*b)->valid_policy);
}
ASN1_OBJECT_free(data->valid_policy);
/* Don't free qualifiers if shared */
if (!(data->flags & POLICY_DATA_FLAG_SHARED_QUALIFIERS))
ASN1_OBJECT_free(data->valid_policy);
/* Don't free qualifiers if shared */
if (!(data->flags & POLICY_DATA_FLAG_SHARED_QUALIFIERS))
- sk_POLICYINFO_pop_free(data->qualifier_set,
+ sk_POLICYQUALINFO_pop_free(data->qualifier_set,
POLICYQUALINFO_free);
sk_ASN1_OBJECT_pop_free(data->expected_policy_set, ASN1_OBJECT_free);
OPENSSL_free(data);
POLICYQUALINFO_free);
sk_ASN1_OBJECT_pop_free(data->expected_policy_set, ASN1_OBJECT_free);
OPENSSL_free(data);
unsigned int flags;
/* Policy OID and qualifiers for this data */
ASN1_OBJECT *valid_policy;
unsigned int flags;
/* Policy OID and qualifiers for this data */
ASN1_OBJECT *valid_policy;
- STACK_OF(POLICYQUALIFIER) *qualifier_set;
+ STACK_OF(POLICYQUALINFO) *qualifier_set;
STACK_OF(ASN1_OBJECT) *expected_policy_set;
};
STACK_OF(ASN1_OBJECT) *expected_policy_set;
};
/* other policy data */
STACK_OF(X509_POLICY_DATA) *data;
/* If policyMappings extension present a table of mapped policies */
/* other policy data */
STACK_OF(X509_POLICY_DATA) *data;
/* If policyMappings extension present a table of mapped policies */
- STACK_OF(POLICY_REF) *maps;
+ STACK_OF(X509_POLICY_REF) *maps;
/* If InhibitAnyPolicy present this is its value or -1 if absent. */
long any_skip;
/* If policyConstraints and requireExplicitPolicy present this is its
/* If InhibitAnyPolicy present this is its value or -1 if absent. */
long any_skip;
/* If policyConstraints and requireExplicitPolicy present this is its
X509_POLICY_NODE *level_find_node(const X509_POLICY_LEVEL *level,
const ASN1_OBJECT *id);
X509_POLICY_NODE *level_find_node(const X509_POLICY_LEVEL *level,
const ASN1_OBJECT *id);
-X509_POLICY_NODE *tree_find_sk(STACK_OF(X509_POLICY_TREE) *sk,
+X509_POLICY_NODE *tree_find_sk(STACK_OF(X509_POLICY_NODE) *sk,
const ASN1_OBJECT *id);
X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
const ASN1_OBJECT *id);
X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
- const X509_POLICY_DATA *data,
+ X509_POLICY_DATA *data,
X509_POLICY_NODE *parent,
X509_POLICY_TREE *tree);
void policy_node_free(X509_POLICY_NODE *node);
X509_POLICY_NODE *parent,
X509_POLICY_TREE *tree);
void policy_node_free(X509_POLICY_NODE *node);
-STACK_OF(POLICYQUALIFIER) *
+STACK_OF(POLICYQUALINFO) *
X509_policy_node_get0_qualifiers(const X509_POLICY_NODE *node)
{
if (!node)
X509_policy_node_get0_qualifiers(const X509_POLICY_NODE *node)
{
if (!node)
-static int ref_cmp(void *pa, void *pb)
+static int ref_cmp(const X509_POLICY_REF * const *a,
+ const X509_POLICY_REF * const *b)
- X509_POLICY_REF **a = pa; X509_POLICY_REF **b = pb;
return OBJ_cmp((*a)->subjectDomainPolicy, (*b)->subjectDomainPolicy);
}
return OBJ_cmp((*a)->subjectDomainPolicy, (*b)->subjectDomainPolicy);
}
-static int node_cmp(void *pa, void *pb)
+static int node_cmp(const X509_POLICY_NODE * const *a,
+ const X509_POLICY_NODE * const *b)
- X509_POLICY_NODE **a = pa, **b = pb;
return OBJ_cmp((*a)->data->valid_policy, (*b)->data->valid_policy);
}
return OBJ_cmp((*a)->data->valid_policy, (*b)->data->valid_policy);
}
}
X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
}
X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
- const X509_POLICY_DATA *data,
+ X509_POLICY_DATA *data,
X509_POLICY_NODE *parent,
X509_POLICY_TREE *tree)
{
X509_POLICY_NODE *parent,
X509_POLICY_TREE *tree)
{
*/
static int tree_calculate_authority_set(X509_POLICY_TREE *tree,
*/
static int tree_calculate_authority_set(X509_POLICY_TREE *tree,
- STACK_OF(X509_POLICY_NODES) **pnodes)
+ STACK_OF(X509_POLICY_NODE) **pnodes)
{
X509_POLICY_LEVEL *curr;
X509_POLICY_NODE *node, *anyptr;
{
X509_POLICY_LEVEL *curr;
X509_POLICY_NODE *node, *anyptr;
- STACK_OF(X509_POLICY_NODES) **addnodes;
+ STACK_OF(X509_POLICY_NODE) **addnodes;
int i, j;
curr = tree->levels + tree->nlevel - 1;
int i, j;
curr = tree->levels + tree->nlevel - 1;
{
int ret;
X509_POLICY_TREE *tree = NULL;
{
int ret;
X509_POLICY_TREE *tree = NULL;
- STACK_OF(X509_NODE) *nodes, *auth_nodes = NULL;
+ STACK_OF(X509_POLICY_NODE) *nodes, *auth_nodes = NULL;
*ptree = NULL;
*explicit = 0;
*ptree = NULL;
*explicit = 0;