5b37fef04a
In some cases it's about redundant check for return value, in some cases it's about replacing check for -1 with comparison to 0. Otherwise compiler might generate redundant check for <-1. [Even formatting and readability fixes.] Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6860)
147 lines
4.1 KiB
C
147 lines
4.1 KiB
C
/*
|
|
* Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/x509v3.h>
|
|
#include <openssl/err.h>
|
|
|
|
#include "pcy_int.h"
|
|
|
|
static int node_cmp(const X509_POLICY_NODE *const *a,
|
|
const X509_POLICY_NODE *const *b)
|
|
{
|
|
return OBJ_cmp((*a)->data->valid_policy, (*b)->data->valid_policy);
|
|
}
|
|
|
|
STACK_OF(X509_POLICY_NODE) *policy_node_cmp_new(void)
|
|
{
|
|
return sk_X509_POLICY_NODE_new(node_cmp);
|
|
}
|
|
|
|
X509_POLICY_NODE *tree_find_sk(STACK_OF(X509_POLICY_NODE) *nodes,
|
|
const ASN1_OBJECT *id)
|
|
{
|
|
X509_POLICY_DATA n;
|
|
X509_POLICY_NODE l;
|
|
int idx;
|
|
|
|
n.valid_policy = (ASN1_OBJECT *)id;
|
|
l.data = &n;
|
|
|
|
idx = sk_X509_POLICY_NODE_find(nodes, &l);
|
|
return sk_X509_POLICY_NODE_value(nodes, idx);
|
|
|
|
}
|
|
|
|
X509_POLICY_NODE *level_find_node(const X509_POLICY_LEVEL *level,
|
|
const X509_POLICY_NODE *parent,
|
|
const ASN1_OBJECT *id)
|
|
{
|
|
X509_POLICY_NODE *node;
|
|
int i;
|
|
for (i = 0; i < sk_X509_POLICY_NODE_num(level->nodes); i++) {
|
|
node = sk_X509_POLICY_NODE_value(level->nodes, i);
|
|
if (node->parent == parent) {
|
|
if (!OBJ_cmp(node->data->valid_policy, id))
|
|
return node;
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
|
|
X509_POLICY_DATA *data,
|
|
X509_POLICY_NODE *parent,
|
|
X509_POLICY_TREE *tree)
|
|
{
|
|
X509_POLICY_NODE *node;
|
|
|
|
node = OPENSSL_zalloc(sizeof(*node));
|
|
if (node == NULL) {
|
|
X509V3err(X509V3_F_LEVEL_ADD_NODE, ERR_R_MALLOC_FAILURE);
|
|
return NULL;
|
|
}
|
|
node->data = data;
|
|
node->parent = parent;
|
|
if (level) {
|
|
if (OBJ_obj2nid(data->valid_policy) == NID_any_policy) {
|
|
if (level->anyPolicy)
|
|
goto node_error;
|
|
level->anyPolicy = node;
|
|
} else {
|
|
|
|
if (level->nodes == NULL)
|
|
level->nodes = policy_node_cmp_new();
|
|
if (level->nodes == NULL) {
|
|
X509V3err(X509V3_F_LEVEL_ADD_NODE, ERR_R_MALLOC_FAILURE);
|
|
goto node_error;
|
|
}
|
|
if (!sk_X509_POLICY_NODE_push(level->nodes, node)) {
|
|
X509V3err(X509V3_F_LEVEL_ADD_NODE, ERR_R_MALLOC_FAILURE);
|
|
goto node_error;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (tree) {
|
|
if (tree->extra_data == NULL)
|
|
tree->extra_data = sk_X509_POLICY_DATA_new_null();
|
|
if (tree->extra_data == NULL){
|
|
X509V3err(X509V3_F_LEVEL_ADD_NODE, ERR_R_MALLOC_FAILURE);
|
|
goto node_error;
|
|
}
|
|
if (!sk_X509_POLICY_DATA_push(tree->extra_data, data)) {
|
|
X509V3err(X509V3_F_LEVEL_ADD_NODE, ERR_R_MALLOC_FAILURE);
|
|
goto node_error;
|
|
}
|
|
}
|
|
|
|
if (parent)
|
|
parent->nchild++;
|
|
|
|
return node;
|
|
|
|
node_error:
|
|
policy_node_free(node);
|
|
return NULL;
|
|
}
|
|
|
|
void policy_node_free(X509_POLICY_NODE *node)
|
|
{
|
|
OPENSSL_free(node);
|
|
}
|
|
|
|
/*
|
|
* See if a policy node matches a policy OID. If mapping enabled look through
|
|
* expected policy set otherwise just valid policy.
|
|
*/
|
|
|
|
int policy_node_match(const X509_POLICY_LEVEL *lvl,
|
|
const X509_POLICY_NODE *node, const ASN1_OBJECT *oid)
|
|
{
|
|
int i;
|
|
ASN1_OBJECT *policy_oid;
|
|
const X509_POLICY_DATA *x = node->data;
|
|
|
|
if ((lvl->flags & X509_V_FLAG_INHIBIT_MAP)
|
|
|| !(x->flags & POLICY_DATA_FLAG_MAP_MASK)) {
|
|
if (!OBJ_cmp(x->valid_policy, oid))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
for (i = 0; i < sk_ASN1_OBJECT_num(x->expected_policy_set); i++) {
|
|
policy_oid = sk_ASN1_OBJECT_value(x->expected_policy_set, i);
|
|
if (!OBJ_cmp(policy_oid, oid))
|
|
return 1;
|
|
}
|
|
return 0;
|
|
|
|
}
|