From af50ddfc8cd7409b6577826223496779c69cd1e0 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Mon, 21 Apr 2014 08:41:26 +0000 Subject: KNF. --- src/lib/libcrypto/x509v3/pcy_map.c | 49 +++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 27 deletions(-) (limited to 'src/lib/libcrypto/x509v3/pcy_map.c') diff --git a/src/lib/libcrypto/x509v3/pcy_map.c b/src/lib/libcrypto/x509v3/pcy_map.c index 21163b529d..295988a411 100644 --- a/src/lib/libcrypto/x509v3/pcy_map.c +++ b/src/lib/libcrypto/x509v3/pcy_map.c @@ -10,7 +10,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -66,28 +66,27 @@ * Note: this modifies the passed POLICY_MAPPINGS structure */ -int policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) - { +int +policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) +{ POLICY_MAPPING *map; X509_POLICY_DATA *data; X509_POLICY_CACHE *cache = x->policy_cache; int i; int ret = 0; - if (sk_POLICY_MAPPING_num(maps) == 0) - { + + if (sk_POLICY_MAPPING_num(maps) == 0) { ret = -1; goto bad_mapping; - } - for (i = 0; i < sk_POLICY_MAPPING_num(maps); i++) - { + } + for (i = 0; i < sk_POLICY_MAPPING_num(maps); i++) { map = sk_POLICY_MAPPING_value(maps, i); /* Reject if map to or from anyPolicy */ - if ((OBJ_obj2nid(map->subjectDomainPolicy) == NID_any_policy) - || (OBJ_obj2nid(map->issuerDomainPolicy) == NID_any_policy)) - { + if ((OBJ_obj2nid(map->subjectDomainPolicy) == NID_any_policy) || + (OBJ_obj2nid(map->issuerDomainPolicy) == NID_any_policy)) { ret = -1; goto bad_mapping; - } + } /* Attempt to find matching policy data */ data = policy_cache_find_data(cache, map->issuerDomainPolicy); @@ -96,37 +95,33 @@ int policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) continue; /* Create a NODE from anyPolicy */ - if (!data) - { + if (!data) { data = policy_data_new(NULL, map->issuerDomainPolicy, - cache->anyPolicy->flags - & POLICY_DATA_FLAG_CRITICAL); + cache->anyPolicy->flags & + POLICY_DATA_FLAG_CRITICAL); if (!data) goto bad_mapping; data->qualifier_set = cache->anyPolicy->qualifier_set; /*map->issuerDomainPolicy = NULL;*/ data->flags |= POLICY_DATA_FLAG_MAPPED_ANY; data->flags |= POLICY_DATA_FLAG_SHARED_QUALIFIERS; - if (!sk_X509_POLICY_DATA_push(cache->data, data)) - { + if (!sk_X509_POLICY_DATA_push(cache->data, data)) { policy_data_free(data); goto bad_mapping; - } } - else + } else data->flags |= POLICY_DATA_FLAG_MAPPED; - if (!sk_ASN1_OBJECT_push(data->expected_policy_set, - map->subjectDomainPolicy)) + if (!sk_ASN1_OBJECT_push(data->expected_policy_set, + map->subjectDomainPolicy)) goto bad_mapping; map->subjectDomainPolicy = NULL; - - } + } ret = 1; - bad_mapping: + +bad_mapping: if (ret == -1) x->ex_flags |= EXFLAG_INVALID_POLICY; sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free); return ret; - - } +} -- cgit v1.2.3-55-g6feb