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)
103 lines
3.2 KiB
C
103 lines
3.2 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/asn1t.h>
|
|
#include <openssl/conf.h>
|
|
#include <openssl/x509v3.h>
|
|
#include "ext_dat.h"
|
|
|
|
static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
|
|
X509V3_CTX *ctx,
|
|
STACK_OF(CONF_VALUE) *nval);
|
|
static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
|
|
*method, void *eku, STACK_OF(CONF_VALUE)
|
|
*extlist);
|
|
|
|
const X509V3_EXT_METHOD ossl_v3_ext_ku = {
|
|
NID_ext_key_usage, 0,
|
|
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
|
|
0, 0, 0, 0,
|
|
0, 0,
|
|
i2v_EXTENDED_KEY_USAGE,
|
|
v2i_EXTENDED_KEY_USAGE,
|
|
0, 0,
|
|
NULL
|
|
};
|
|
|
|
/* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */
|
|
const X509V3_EXT_METHOD ossl_v3_ocsp_accresp = {
|
|
NID_id_pkix_OCSP_acceptableResponses, 0,
|
|
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
|
|
0, 0, 0, 0,
|
|
0, 0,
|
|
i2v_EXTENDED_KEY_USAGE,
|
|
v2i_EXTENDED_KEY_USAGE,
|
|
0, 0,
|
|
NULL
|
|
};
|
|
|
|
ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) =
|
|
ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
|
|
ASN1_ITEM_TEMPLATE_END(EXTENDED_KEY_USAGE)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
|
|
|
|
static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
|
|
*method, void *a, STACK_OF(CONF_VALUE)
|
|
*ext_list)
|
|
{
|
|
EXTENDED_KEY_USAGE *eku = a;
|
|
int i;
|
|
ASN1_OBJECT *obj;
|
|
char obj_tmp[80];
|
|
for (i = 0; i < sk_ASN1_OBJECT_num(eku); i++) {
|
|
obj = sk_ASN1_OBJECT_value(eku, i);
|
|
i2t_ASN1_OBJECT(obj_tmp, 80, obj);
|
|
X509V3_add_value(NULL, obj_tmp, &ext_list);
|
|
}
|
|
return ext_list;
|
|
}
|
|
|
|
static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
|
|
X509V3_CTX *ctx,
|
|
STACK_OF(CONF_VALUE) *nval)
|
|
{
|
|
EXTENDED_KEY_USAGE *extku;
|
|
char *extval;
|
|
ASN1_OBJECT *objtmp;
|
|
CONF_VALUE *val;
|
|
const int num = sk_CONF_VALUE_num(nval);
|
|
int i;
|
|
|
|
extku = sk_ASN1_OBJECT_new_reserve(NULL, num);
|
|
if (extku == NULL) {
|
|
ERR_raise(ERR_LIB_X509V3, ERR_R_CRYPTO_LIB);
|
|
sk_ASN1_OBJECT_free(extku);
|
|
return NULL;
|
|
}
|
|
|
|
for (i = 0; i < num; i++) {
|
|
val = sk_CONF_VALUE_value(nval, i);
|
|
if (val->value)
|
|
extval = val->value;
|
|
else
|
|
extval = val->name;
|
|
if ((objtmp = OBJ_txt2obj(extval, 0)) == NULL) {
|
|
sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free);
|
|
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER,
|
|
"%s", extval);
|
|
return NULL;
|
|
}
|
|
sk_ASN1_OBJECT_push(extku, objtmp); /* no failure as it was reserved */
|
|
}
|
|
return extku;
|
|
}
|