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)
64 lines
1.3 KiB
C
64 lines
1.3 KiB
C
/*
|
|
* Copyright 2010-2020 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 <stddef.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/asn1t.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/buffer.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/x509v3.h>
|
|
#include "asn1_local.h"
|
|
|
|
/*
|
|
* General ASN1 structure recursive scanner: iterate through all fields
|
|
* passing details to a callback.
|
|
*/
|
|
|
|
ASN1_SCTX *ASN1_SCTX_new(int (*scan_cb) (ASN1_SCTX *ctx))
|
|
{
|
|
ASN1_SCTX *ret = OPENSSL_zalloc(sizeof(*ret));
|
|
|
|
if (ret == NULL)
|
|
return NULL;
|
|
ret->scan_cb = scan_cb;
|
|
return ret;
|
|
}
|
|
|
|
void ASN1_SCTX_free(ASN1_SCTX *p)
|
|
{
|
|
OPENSSL_free(p);
|
|
}
|
|
|
|
const ASN1_ITEM *ASN1_SCTX_get_item(ASN1_SCTX *p)
|
|
{
|
|
return p->it;
|
|
}
|
|
|
|
const ASN1_TEMPLATE *ASN1_SCTX_get_template(ASN1_SCTX *p)
|
|
{
|
|
return p->tt;
|
|
}
|
|
|
|
unsigned long ASN1_SCTX_get_flags(ASN1_SCTX *p)
|
|
{
|
|
return p->flags;
|
|
}
|
|
|
|
void ASN1_SCTX_set_app_data(ASN1_SCTX *p, void *data)
|
|
{
|
|
p->app_data = data;
|
|
}
|
|
|
|
void *ASN1_SCTX_get_app_data(ASN1_SCTX *p)
|
|
{
|
|
return p->app_data;
|
|
}
|