mirror of
https://github.com/openssl/openssl.git
synced 2024-12-21 06:09:35 +08:00
e077455e9e
Since OPENSSL_malloc() and friends report ERR_R_MALLOC_FAILURE, and at least handle the file name and line number they are called from, there's no need to report ERR_R_MALLOC_FAILURE where they are called directly, or when SSLfatal() and RLAYERfatal() is used, the reason `ERR_R_MALLOC_FAILURE` is changed to `ERR_R_CRYPTO_LIB`. There were a number of places where `ERR_R_MALLOC_FAILURE` was reported even though it was a function from a different sub-system that was called. Those places are changed to report ERR_R_{lib}_LIB, where {lib} is the name of that sub-system. Some of them are tricky to get right, as we have a lot of functions that belong in the ASN1 sub-system, and all the `sk_` calls or from the CRYPTO sub-system. Some extra adaptation was necessary where there were custom OPENSSL_malloc() wrappers, and some bugs are fixed alongside these changes. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19301)
224 lines
6.2 KiB
C
224 lines
6.2 KiB
C
/*
|
|
* Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (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 "internal/cryptlib.h"
|
|
#include <openssl/x509.h>
|
|
#include <openssl/x509v3.h>
|
|
#include "crypto/x509.h"
|
|
|
|
#include "pcy_local.h"
|
|
|
|
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. Note: this
|
|
* destroys the passed CERTIFICATEPOLICIES structure.
|
|
*/
|
|
|
|
static int policy_cache_create(X509 *x,
|
|
CERTIFICATEPOLICIES *policies, int crit)
|
|
{
|
|
int i, num, ret = 0;
|
|
X509_POLICY_CACHE *cache = x->policy_cache;
|
|
X509_POLICY_DATA *data = NULL;
|
|
POLICYINFO *policy;
|
|
|
|
if ((num = sk_POLICYINFO_num(policies)) <= 0)
|
|
goto bad_policy;
|
|
cache->data = sk_X509_POLICY_DATA_new(policy_data_cmp);
|
|
if (cache->data == NULL) {
|
|
ERR_raise(ERR_LIB_X509V3, ERR_R_CRYPTO_LIB);
|
|
goto just_cleanup;
|
|
}
|
|
for (i = 0; i < num; i++) {
|
|
policy = sk_POLICYINFO_value(policies, i);
|
|
data = ossl_policy_data_new(policy, NULL, crit);
|
|
if (data == NULL) {
|
|
ERR_raise(ERR_LIB_X509V3, ERR_R_X509_LIB);
|
|
goto just_cleanup;
|
|
}
|
|
/*
|
|
* Duplicate policy OIDs are illegal: reject if matches found.
|
|
*/
|
|
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, data) >=0) {
|
|
ret = -1;
|
|
goto bad_policy;
|
|
} else if (!sk_X509_POLICY_DATA_push(cache->data, data)) {
|
|
ERR_raise(ERR_LIB_X509V3, ERR_R_CRYPTO_LIB);
|
|
goto bad_policy;
|
|
}
|
|
data = NULL;
|
|
}
|
|
ret = 1;
|
|
|
|
bad_policy:
|
|
if (ret == -1)
|
|
x->ex_flags |= EXFLAG_INVALID_POLICY;
|
|
ossl_policy_data_free(data);
|
|
just_cleanup:
|
|
sk_POLICYINFO_pop_free(policies, POLICYINFO_free);
|
|
if (ret <= 0) {
|
|
sk_X509_POLICY_DATA_pop_free(cache->data, ossl_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;
|
|
|
|
if (x->policy_cache != NULL)
|
|
return 1;
|
|
cache = OPENSSL_malloc(sizeof(*cache));
|
|
if (cache == NULL)
|
|
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;
|
|
}
|
|
|
|
i = policy_cache_create(x, ext_cpols, i);
|
|
|
|
/* NB: ext_cpols freed by policy_cache_set_policies */
|
|
|
|
if (i <= 0)
|
|
return i;
|
|
|
|
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 = ossl_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;
|
|
goto just_cleanup;
|
|
|
|
bad_cache:
|
|
x->ex_flags |= EXFLAG_INVALID_POLICY;
|
|
|
|
just_cleanup:
|
|
POLICY_CONSTRAINTS_free(ext_pcons);
|
|
ASN1_INTEGER_free(ext_any);
|
|
return 1;
|
|
|
|
}
|
|
|
|
void ossl_policy_cache_free(X509_POLICY_CACHE *cache)
|
|
{
|
|
if (!cache)
|
|
return;
|
|
ossl_policy_data_free(cache->anyPolicy);
|
|
sk_X509_POLICY_DATA_pop_free(cache->data, ossl_policy_data_free);
|
|
OPENSSL_free(cache);
|
|
}
|
|
|
|
const X509_POLICY_CACHE *ossl_policy_cache_set(X509 *x)
|
|
{
|
|
|
|
if (x->policy_cache == NULL) {
|
|
if (!CRYPTO_THREAD_write_lock(x->lock))
|
|
return NULL;
|
|
policy_cache_new(x);
|
|
CRYPTO_THREAD_unlock(x->lock);
|
|
}
|
|
|
|
return x->policy_cache;
|
|
|
|
}
|
|
|
|
X509_POLICY_DATA *ossl_policy_cache_find_data(const X509_POLICY_CACHE *cache,
|
|
const ASN1_OBJECT *id)
|
|
{
|
|
int idx;
|
|
X509_POLICY_DATA tmp;
|
|
tmp.valid_policy = (ASN1_OBJECT *)id;
|
|
idx = sk_X509_POLICY_DATA_find(cache->data, &tmp);
|
|
return sk_X509_POLICY_DATA_value(cache->data, idx);
|
|
}
|
|
|
|
static int policy_data_cmp(const X509_POLICY_DATA *const *a,
|
|
const X509_POLICY_DATA *const *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);
|
|
return 1;
|
|
}
|