mirror of
https://github.com/openssl/openssl.git
synced 2024-12-27 06:21:43 +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)
82 lines
2.2 KiB
C
82 lines
2.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 "pcy_local.h"
|
|
|
|
/* Policy Node routines */
|
|
|
|
void ossl_policy_data_free(X509_POLICY_DATA *data)
|
|
{
|
|
if (data == NULL)
|
|
return;
|
|
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 RFC3280: data with from a CertificatePolicies extension and
|
|
* additional data with just the qualifiers of anyPolicy and ID from another
|
|
* source.
|
|
*/
|
|
|
|
X509_POLICY_DATA *ossl_policy_data_new(POLICYINFO *policy,
|
|
const ASN1_OBJECT *cid, int crit)
|
|
{
|
|
X509_POLICY_DATA *ret;
|
|
ASN1_OBJECT *id;
|
|
|
|
if (policy == NULL && cid == NULL)
|
|
return NULL;
|
|
if (cid) {
|
|
id = OBJ_dup(cid);
|
|
if (id == NULL)
|
|
return NULL;
|
|
} else
|
|
id = NULL;
|
|
ret = OPENSSL_zalloc(sizeof(*ret));
|
|
if (ret == NULL) {
|
|
ASN1_OBJECT_free(id);
|
|
return NULL;
|
|
}
|
|
ret->expected_policy_set = sk_ASN1_OBJECT_new_null();
|
|
if (ret->expected_policy_set == NULL) {
|
|
OPENSSL_free(ret);
|
|
ASN1_OBJECT_free(id);
|
|
ERR_raise(ERR_LIB_X509V3, ERR_R_CRYPTO_LIB);
|
|
return NULL;
|
|
}
|
|
|
|
if (crit)
|
|
ret->flags = POLICY_DATA_FLAG_CRITICAL;
|
|
|
|
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;
|
|
}
|
|
|
|
return ret;
|
|
}
|