@fails-components/webtransport 0.0.1 → 0.0.2

package/third_party/boringssl/src/crypto/x509v3/pcy_cache.c

@@ -68,220 +68,228 @@ static int policy_data_cmp(const X509_POLICY_DATA **a,
                            const X509_POLICY_DATA **b);
 static int policy_cache_set_int(long *out, ASN1_INTEGER *value);
 
-/*
- * Set cache entry according to CertificatePolicies extension. Note: this
- * destroys the passed CERTIFICATEPOLICIES structure.
- */
-
-static int policy_cache_create(X509 *x,
-                               CERTIFICATEPOLICIES *policies, int crit)
-{
-    size_t i;
-    int ret = 0;
-    X509_POLICY_CACHE *cache = x->policy_cache;
-    X509_POLICY_DATA *data = NULL;
-    POLICYINFO *policy;
-    if (sk_POLICYINFO_num(policies) == 0)
-        goto bad_policy;
-    cache->data = sk_X509_POLICY_DATA_new(policy_data_cmp);
-    if (!cache->data)
-        goto bad_policy;
-    for (i = 0; i < sk_POLICYINFO_num(policies); i++) {
-        policy = sk_POLICYINFO_value(policies, i);
-        data = policy_data_new(policy, NULL, crit);
-        if (!data)
-            goto bad_policy;
-        /*
-         * Duplicate policy OIDs are illegal: reject if matches found.
-         */
-        sk_X509_POLICY_DATA_sort(cache->data);
-        if (OBJ_obj2nid(data->valid_policy) == NID_any_policy) {
-            if (cache->anyPolicy) {
-                ret = -1;
-                goto bad_policy;
-            }
-            cache->anyPolicy = data;
-        } else if (sk_X509_POLICY_DATA_find(cache->data, NULL, data)) {
-            ret = -1;
-            goto bad_policy;
-        } else if (!sk_X509_POLICY_DATA_push(cache->data, data))
-            goto bad_policy;
-        data = NULL;
+// Set cache entry according to CertificatePolicies extension. Note: this
+// destroys the passed CERTIFICATEPOLICIES structure.
+
+static int policy_cache_create(X509 *x, CERTIFICATEPOLICIES *policies,
+                               int crit) {
+  size_t i;
+  int ret = 0;
+  X509_POLICY_CACHE *cache = x->policy_cache;
+  X509_POLICY_DATA *data = NULL;
+  POLICYINFO *policy;
+  if (sk_POLICYINFO_num(policies) == 0) {
+    goto bad_policy;
+  }
+  cache->data = sk_X509_POLICY_DATA_new(policy_data_cmp);
+  if (!cache->data) {
+    goto bad_policy;
+  }
+  for (i = 0; i < sk_POLICYINFO_num(policies); i++) {
+    policy = sk_POLICYINFO_value(policies, i);
+    data = policy_data_new(policy, NULL, crit);
+    if (!data) {
+      goto bad_policy;
     }
-    ret = 1;
- bad_policy:
-    if (ret == -1)
-        x->ex_flags |= EXFLAG_INVALID_POLICY;
-    if (data)
-        policy_data_free(data);
-    sk_POLICYINFO_pop_free(policies, POLICYINFO_free);
-    if (ret <= 0) {
-        sk_X509_POLICY_DATA_pop_free(cache->data, policy_data_free);
-        cache->data = NULL;
+    // Duplicate policy OIDs are illegal: reject if matches found.
+    sk_X509_POLICY_DATA_sort(cache->data);
+    if (OBJ_obj2nid(data->valid_policy) == NID_any_policy) {
+      if (cache->anyPolicy) {
+        ret = -1;
+        goto bad_policy;
+      }
+      cache->anyPolicy = data;
+    } else if (sk_X509_POLICY_DATA_find(cache->data, NULL, data)) {
+      ret = -1;
+      goto bad_policy;
+    } else if (!sk_X509_POLICY_DATA_push(cache->data, data)) {
+      goto bad_policy;
     }
-    return ret;
+    data = NULL;
+  }
+  ret = 1;
+bad_policy:
+  if (ret == -1) {
+    x->ex_flags |= EXFLAG_INVALID_POLICY;
+  }
+  if (data) {
+    policy_data_free(data);
+  }
+  sk_POLICYINFO_pop_free(policies, POLICYINFO_free);
+  if (ret <= 0) {
+    sk_X509_POLICY_DATA_pop_free(cache->data, policy_data_free);
+    cache->data = NULL;
+  }
+  return ret;
 }
 
-static int policy_cache_new(X509 *x)
-{
-    X509_POLICY_CACHE *cache;
-    ASN1_INTEGER *ext_any = NULL;
-    POLICY_CONSTRAINTS *ext_pcons = NULL;
-    CERTIFICATEPOLICIES *ext_cpols = NULL;
-    POLICY_MAPPINGS *ext_pmaps = NULL;
-    int i;
-    cache = OPENSSL_malloc(sizeof(X509_POLICY_CACHE));
-    if (!cache)
-        return 0;
-    cache->anyPolicy = NULL;
-    cache->data = NULL;
-    cache->any_skip = -1;
-    cache->explicit_skip = -1;
-    cache->map_skip = -1;
-
-    x->policy_cache = cache;
-
-    /*
-     * Handle requireExplicitPolicy *first*. Need to process this even if we
-     * don't have any policies.
-     */
-    ext_pcons = X509_get_ext_d2i(x, NID_policy_constraints, &i, NULL);
-
-    if (!ext_pcons) {
-        if (i != -1)
-            goto bad_cache;
-    } else {
-        if (!ext_pcons->requireExplicitPolicy
-            && !ext_pcons->inhibitPolicyMapping)
-            goto bad_cache;
-        if (!policy_cache_set_int(&cache->explicit_skip,
-                                  ext_pcons->requireExplicitPolicy))
-            goto bad_cache;
-        if (!policy_cache_set_int(&cache->map_skip,
-                                  ext_pcons->inhibitPolicyMapping))
-            goto bad_cache;
+static int policy_cache_new(X509 *x) {
+  X509_POLICY_CACHE *cache;
+  ASN1_INTEGER *ext_any = NULL;
+  POLICY_CONSTRAINTS *ext_pcons = NULL;
+  CERTIFICATEPOLICIES *ext_cpols = NULL;
+  POLICY_MAPPINGS *ext_pmaps = NULL;
+  int i;
+  cache = OPENSSL_malloc(sizeof(X509_POLICY_CACHE));
+  if (!cache) {
+    return 0;
+  }
+  cache->anyPolicy = NULL;
+  cache->data = NULL;
+  cache->any_skip = -1;
+  cache->explicit_skip = -1;
+  cache->map_skip = -1;
+
+  x->policy_cache = cache;
+
+  // Handle requireExplicitPolicy *first*. Need to process this even if we
+  // don't have any policies.
+  ext_pcons = X509_get_ext_d2i(x, NID_policy_constraints, &i, NULL);
+
+  if (!ext_pcons) {
+    if (i != -1) {
+      goto bad_cache;
+    }
+  } else {
+    if (!ext_pcons->requireExplicitPolicy && !ext_pcons->inhibitPolicyMapping) {
+      goto bad_cache;
+    }
+    if (!policy_cache_set_int(&cache->explicit_skip,
+                              ext_pcons->requireExplicitPolicy)) {
+      goto bad_cache;
+    }
+    if (!policy_cache_set_int(&cache->map_skip,
+                              ext_pcons->inhibitPolicyMapping)) {
+      goto bad_cache;
     }
+  }
 
-    /* Process CertificatePolicies */
-
-    ext_cpols = X509_get_ext_d2i(x, NID_certificate_policies, &i, NULL);
-    /*
-     * If no CertificatePolicies extension or problem decoding then there is
-     * no point continuing because the valid policies will be NULL.
-     */
-    if (!ext_cpols) {
-        /* If not absent some problem with extension */
-        if (i != -1)
-            goto bad_cache;
-        return 1;
+  // Process CertificatePolicies
+
+  ext_cpols = X509_get_ext_d2i(x, NID_certificate_policies, &i, NULL);
+  // If no CertificatePolicies extension or problem decoding then there is
+  // no point continuing because the valid policies will be NULL.
+  if (!ext_cpols) {
+    // If not absent some problem with extension
+    if (i != -1) {
+      goto bad_cache;
     }
+    return 1;
+  }
 
-    i = policy_cache_create(x, ext_cpols, i);
+  i = policy_cache_create(x, ext_cpols, i);
 
-    /* NB: ext_cpols freed by policy_cache_set_policies */
+  // NB: ext_cpols freed by policy_cache_set_policies
 
-    if (i <= 0)
-        return i;
+  if (i <= 0) {
+    return i;
+  }
 
-    ext_pmaps = X509_get_ext_d2i(x, NID_policy_mappings, &i, NULL);
+  ext_pmaps = X509_get_ext_d2i(x, NID_policy_mappings, &i, NULL);
 
-    if (!ext_pmaps) {
-        /* If not absent some problem with extension */
-        if (i != -1)
-            goto bad_cache;
-    } else {
-        i = policy_cache_set_mapping(x, ext_pmaps);
-        if (i <= 0)
-            goto bad_cache;
+  if (!ext_pmaps) {
+    // If not absent some problem with extension
+    if (i != -1) {
+      goto bad_cache;
     }
+  } else {
+    i = policy_cache_set_mapping(x, ext_pmaps);
+    if (i <= 0) {
+      goto bad_cache;
+    }
+  }
 
-    ext_any = X509_get_ext_d2i(x, NID_inhibit_any_policy, &i, NULL);
-
-    if (!ext_any) {
-        if (i != -1)
-            goto bad_cache;
-    } else if (!policy_cache_set_int(&cache->any_skip, ext_any))
-        goto bad_cache;
+  ext_any = X509_get_ext_d2i(x, NID_inhibit_any_policy, &i, NULL);
 
-    if (0) {
- bad_cache:
-        x->ex_flags |= EXFLAG_INVALID_POLICY;
+  if (!ext_any) {
+    if (i != -1) {
+      goto bad_cache;
     }
+  } else if (!policy_cache_set_int(&cache->any_skip, ext_any)) {
+    goto bad_cache;
+  }
 
-    if (ext_pcons)
-        POLICY_CONSTRAINTS_free(ext_pcons);
+  if (0) {
+  bad_cache:
+    x->ex_flags |= EXFLAG_INVALID_POLICY;
+  }
 
-    if (ext_any)
-        ASN1_INTEGER_free(ext_any);
+  if (ext_pcons) {
+    POLICY_CONSTRAINTS_free(ext_pcons);
+  }
 
-    return 1;
+  if (ext_any) {
+    ASN1_INTEGER_free(ext_any);
+  }
 
+  return 1;
 }
 
-void policy_cache_free(X509_POLICY_CACHE *cache)
-{
-    if (!cache)
-        return;
-    if (cache->anyPolicy)
-        policy_data_free(cache->anyPolicy);
-    if (cache->data)
-        sk_X509_POLICY_DATA_pop_free(cache->data, policy_data_free);
-    OPENSSL_free(cache);
+void policy_cache_free(X509_POLICY_CACHE *cache) {
+  if (!cache) {
+    return;
+  }
+  if (cache->anyPolicy) {
+    policy_data_free(cache->anyPolicy);
+  }
+  if (cache->data) {
+    sk_X509_POLICY_DATA_pop_free(cache->data, policy_data_free);
+  }
+  OPENSSL_free(cache);
 }
 
-/*
- * g_x509_policy_cache_lock is used to protect against concurrent calls to
- * |policy_cache_new|. Ideally this would be done with a |CRYPTO_once_t| in
- * the |X509| structure, but |CRYPTO_once_t| isn't public.
- */
+// g_x509_policy_cache_lock is used to protect against concurrent calls to
+// |policy_cache_new|. Ideally this would be done with a |CRYPTO_once_t| in
+// the |X509| structure, but |CRYPTO_once_t| isn't public.
 static struct CRYPTO_STATIC_MUTEX g_x509_policy_cache_lock =
     CRYPTO_STATIC_MUTEX_INIT;
 
-const X509_POLICY_CACHE *policy_cache_set(X509 *x)
-{
-    X509_POLICY_CACHE *cache;
+const X509_POLICY_CACHE *policy_cache_set(X509 *x) {
+  X509_POLICY_CACHE *cache;
 
-    CRYPTO_STATIC_MUTEX_lock_read(&g_x509_policy_cache_lock);
-    cache = x->policy_cache;
-    CRYPTO_STATIC_MUTEX_unlock_read(&g_x509_policy_cache_lock);
+  CRYPTO_STATIC_MUTEX_lock_read(&g_x509_policy_cache_lock);
+  cache = x->policy_cache;
+  CRYPTO_STATIC_MUTEX_unlock_read(&g_x509_policy_cache_lock);
 
-    if (cache != NULL)
-        return cache;
+  if (cache != NULL) {
+    return cache;
+  }
 
-    CRYPTO_STATIC_MUTEX_lock_write(&g_x509_policy_cache_lock);
-    if (x->policy_cache == NULL)
-        policy_cache_new(x);
-    cache = x->policy_cache;
-    CRYPTO_STATIC_MUTEX_unlock_write(&g_x509_policy_cache_lock);
+  CRYPTO_STATIC_MUTEX_lock_write(&g_x509_policy_cache_lock);
+  if (x->policy_cache == NULL) {
+    policy_cache_new(x);
+  }
+  cache = x->policy_cache;
+  CRYPTO_STATIC_MUTEX_unlock_write(&g_x509_policy_cache_lock);
 
-    return cache;
+  return cache;
 }
 
 X509_POLICY_DATA *policy_cache_find_data(const X509_POLICY_CACHE *cache,
-                                         const ASN1_OBJECT *id)
-{
-    size_t idx;
-    X509_POLICY_DATA tmp;
-
-    tmp.valid_policy = (ASN1_OBJECT *)id;
-    sk_X509_POLICY_DATA_sort(cache->data);
-    if (!sk_X509_POLICY_DATA_find(cache->data, &idx, &tmp))
-        return NULL;
-    return sk_X509_POLICY_DATA_value(cache->data, idx);
+                                         const ASN1_OBJECT *id) {
+  size_t idx;
+  X509_POLICY_DATA tmp;
+
+  tmp.valid_policy = (ASN1_OBJECT *)id;
+  sk_X509_POLICY_DATA_sort(cache->data);
+  if (!sk_X509_POLICY_DATA_find(cache->data, &idx, &tmp)) {
+    return NULL;
+  }
+  return sk_X509_POLICY_DATA_value(cache->data, idx);
 }
 
 static int policy_data_cmp(const X509_POLICY_DATA **a,
-                           const X509_POLICY_DATA **b)
-{
-    return OBJ_cmp((*a)->valid_policy, (*b)->valid_policy);
+                           const X509_POLICY_DATA **b) {
+  return OBJ_cmp((*a)->valid_policy, (*b)->valid_policy);
 }
 
-static int policy_cache_set_int(long *out, ASN1_INTEGER *value)
-{
-    if (value == NULL)
-        return 1;
-    if (value->type == V_ASN1_NEG_INTEGER)
-        return 0;
-    *out = ASN1_INTEGER_get(value);
+static int policy_cache_set_int(long *out, ASN1_INTEGER *value) {
+  if (value == NULL) {
     return 1;
+  }
+  if (value->type == V_ASN1_NEG_INTEGER) {
+    return 0;
+  }
+  *out = ASN1_INTEGER_get(value);
+  return 1;
 }

package/third_party/boringssl/src/crypto/x509v3/pcy_data.c

@@ -64,69 +64,71 @@
 
 #include "internal.h"
 
-/* Policy Node routines */
+// Policy Node routines
 
-void policy_data_free(X509_POLICY_DATA *data)
-{
-    ASN1_OBJECT_free(data->valid_policy);
-    /* Don't free qualifiers if shared */
-    if (!(data->flags & POLICY_DATA_FLAG_SHARED_QUALIFIERS))
-        sk_POLICYQUALINFO_pop_free(data->qualifier_set, POLICYQUALINFO_free);
-    sk_ASN1_OBJECT_pop_free(data->expected_policy_set, ASN1_OBJECT_free);
-    OPENSSL_free(data);
+void policy_data_free(X509_POLICY_DATA *data) {
+  ASN1_OBJECT_free(data->valid_policy);
+  // Don't free qualifiers if shared
+  if (!(data->flags & POLICY_DATA_FLAG_SHARED_QUALIFIERS)) {
+    sk_POLICYQUALINFO_pop_free(data->qualifier_set, POLICYQUALINFO_free);
+  }
+  sk_ASN1_OBJECT_pop_free(data->expected_policy_set, ASN1_OBJECT_free);
+  OPENSSL_free(data);
 }
 
-/*
- * Create a data based on an existing policy. If 'id' is NULL use the oid in
- * the policy, otherwise use 'id'. This behaviour covers the two types of
- * data in RFC 3280: data with from a CertificatePolcies extension and
- * additional data with just the qualifiers of anyPolicy and ID from another
- * source.
- */
+// Create a data based on an existing policy. If 'id' is NULL use the oid in
+// the policy, otherwise use 'id'. This behaviour covers the two types of
+// data in RFC 3280: data with from a CertificatePolcies extension and
+// additional data with just the qualifiers of anyPolicy and ID from another
+// source.
 
-X509_POLICY_DATA *policy_data_new(POLICYINFO *policy,
-                                  const ASN1_OBJECT *cid, int crit)
-{
-    X509_POLICY_DATA *ret;
-    ASN1_OBJECT *id;
-    if (!policy && !cid)
-        return NULL;
-    if (cid) {
-        id = OBJ_dup(cid);
-        if (!id)
-            return NULL;
-    } else
-        id = NULL;
-    ret = OPENSSL_malloc(sizeof(X509_POLICY_DATA));
-    if (!ret) {
-        OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
-        ASN1_OBJECT_free(id);
-        return NULL;
-    }
-    ret->expected_policy_set = sk_ASN1_OBJECT_new_null();
-    if (!ret->expected_policy_set) {
-        OPENSSL_free(ret);
-        ASN1_OBJECT_free(id);
-        return NULL;
+X509_POLICY_DATA *policy_data_new(POLICYINFO *policy, const ASN1_OBJECT *cid,
+                                  int crit) {
+  X509_POLICY_DATA *ret;
+  ASN1_OBJECT *id;
+  if (!policy && !cid) {
+    return NULL;
+  }
+  if (cid) {
+    id = OBJ_dup(cid);
+    if (!id) {
+      return NULL;
     }
+  } else {
+    id = NULL;
+  }
+  ret = OPENSSL_malloc(sizeof(X509_POLICY_DATA));
+  if (!ret) {
+    OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
+    ASN1_OBJECT_free(id);
+    return NULL;
+  }
+  ret->expected_policy_set = sk_ASN1_OBJECT_new_null();
+  if (!ret->expected_policy_set) {
+    OPENSSL_free(ret);
+    ASN1_OBJECT_free(id);
+    return NULL;
+  }
 
-    if (crit)
-        ret->flags = POLICY_DATA_FLAG_CRITICAL;
-    else
-        ret->flags = 0;
+  if (crit) {
+    ret->flags = POLICY_DATA_FLAG_CRITICAL;
+  } else {
+    ret->flags = 0;
+  }
 
-    if (id)
-        ret->valid_policy = id;
-    else {
-        ret->valid_policy = policy->policyid;
-        policy->policyid = NULL;
-    }
+  if (id) {
+    ret->valid_policy = id;
+  } else {
+    ret->valid_policy = policy->policyid;
+    policy->policyid = NULL;
+  }
 
-    if (policy) {
-        ret->qualifier_set = policy->qualifiers;
-        policy->qualifiers = NULL;
-    } else
-        ret->qualifier_set = NULL;
+  if (policy) {
+    ret->qualifier_set = policy->qualifiers;
+    policy->qualifiers = NULL;
+  } else {
+    ret->qualifier_set = NULL;
+  }
 
-    return ret;
+  return ret;
 }