mirror of
https://github.com/openssl/openssl.git
synced 2024-12-15 06:01:37 +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)
86 lines
2.9 KiB
C
86 lines
2.9 KiB
C
/*
|
|
* Copyright 1999-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 <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/asn1t.h>
|
|
#include <openssl/conf.h>
|
|
#include <openssl/x509v3.h>
|
|
#include "ext_dat.h"
|
|
#include "x509_local.h"
|
|
|
|
static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
|
|
BASIC_CONSTRAINTS *bcons,
|
|
STACK_OF(CONF_VALUE)
|
|
*extlist);
|
|
static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
|
|
X509V3_CTX *ctx,
|
|
STACK_OF(CONF_VALUE) *values);
|
|
|
|
const X509V3_EXT_METHOD ossl_v3_bcons = {
|
|
NID_basic_constraints, 0,
|
|
ASN1_ITEM_ref(BASIC_CONSTRAINTS),
|
|
0, 0, 0, 0,
|
|
0, 0,
|
|
(X509V3_EXT_I2V) i2v_BASIC_CONSTRAINTS,
|
|
(X509V3_EXT_V2I)v2i_BASIC_CONSTRAINTS,
|
|
NULL, NULL,
|
|
NULL
|
|
};
|
|
|
|
ASN1_SEQUENCE(BASIC_CONSTRAINTS) = {
|
|
ASN1_OPT(BASIC_CONSTRAINTS, ca, ASN1_FBOOLEAN),
|
|
ASN1_OPT(BASIC_CONSTRAINTS, pathlen, ASN1_INTEGER)
|
|
} ASN1_SEQUENCE_END(BASIC_CONSTRAINTS)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
|
|
|
|
static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
|
|
BASIC_CONSTRAINTS *bcons,
|
|
STACK_OF(CONF_VALUE)
|
|
*extlist)
|
|
{
|
|
X509V3_add_value_bool("CA", bcons->ca, &extlist);
|
|
X509V3_add_value_int("pathlen", bcons->pathlen, &extlist);
|
|
return extlist;
|
|
}
|
|
|
|
static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
|
|
X509V3_CTX *ctx,
|
|
STACK_OF(CONF_VALUE) *values)
|
|
{
|
|
BASIC_CONSTRAINTS *bcons = NULL;
|
|
CONF_VALUE *val;
|
|
int i;
|
|
|
|
if ((bcons = BASIC_CONSTRAINTS_new()) == NULL) {
|
|
ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
|
|
return NULL;
|
|
}
|
|
for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
|
|
val = sk_CONF_VALUE_value(values, i);
|
|
if (strcmp(val->name, "CA") == 0) {
|
|
if (!X509V3_get_value_bool(val, &bcons->ca))
|
|
goto err;
|
|
} else if (strcmp(val->name, "pathlen") == 0) {
|
|
if (!X509V3_get_value_int(val, &bcons->pathlen))
|
|
goto err;
|
|
} else {
|
|
ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_NAME);
|
|
X509V3_conf_add_error_name_value(val);
|
|
goto err;
|
|
}
|
|
}
|
|
return bcons;
|
|
err:
|
|
BASIC_CONSTRAINTS_free(bcons);
|
|
return NULL;
|
|
}
|