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)
93 lines
2.3 KiB
C
93 lines
2.3 KiB
C
/*
|
|
* Copyright 1995-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
|
|
*/
|
|
|
|
/* We need to use some engine deprecated APIs */
|
|
#define OPENSSL_SUPPRESS_DEPRECATED
|
|
|
|
#include <stdio.h>
|
|
#include <time.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "internal/cryptlib.h"
|
|
|
|
#include <openssl/engine.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/buffer.h>
|
|
#include <openssl/x509.h>
|
|
#include "crypto/x509.h"
|
|
|
|
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
|
|
|
int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
|
|
unsigned char *md, unsigned int *len)
|
|
{
|
|
int inl;
|
|
unsigned char *str, *p;
|
|
|
|
inl = i2d(data, NULL);
|
|
if (inl <= 0) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_INTERNAL_ERROR);
|
|
return 0;
|
|
}
|
|
if ((str = OPENSSL_malloc(inl)) == NULL)
|
|
return 0;
|
|
p = str;
|
|
i2d(data, &p);
|
|
|
|
if (!EVP_Digest(str, inl, md, len, type, NULL)) {
|
|
OPENSSL_free(str);
|
|
return 0;
|
|
}
|
|
OPENSSL_free(str);
|
|
return 1;
|
|
}
|
|
|
|
#endif
|
|
|
|
int ossl_asn1_item_digest_ex(const ASN1_ITEM *it, const EVP_MD *md, void *asn,
|
|
unsigned char *data, unsigned int *len,
|
|
OSSL_LIB_CTX *libctx, const char *propq)
|
|
{
|
|
int i, ret = 0;
|
|
unsigned char *str = NULL;
|
|
EVP_MD *fetched_md = (EVP_MD *)md;
|
|
|
|
i = ASN1_item_i2d(asn, &str, it);
|
|
if (i < 0 || str == NULL)
|
|
return 0;
|
|
|
|
if (EVP_MD_get0_provider(md) == NULL) {
|
|
#if !defined(OPENSSL_NO_ENGINE)
|
|
ENGINE *tmpeng = ENGINE_get_digest_engine(EVP_MD_get_type(md));
|
|
|
|
if (tmpeng != NULL)
|
|
ENGINE_finish(tmpeng);
|
|
else
|
|
#endif
|
|
fetched_md = EVP_MD_fetch(libctx, EVP_MD_get0_name(md), propq);
|
|
}
|
|
if (fetched_md == NULL)
|
|
goto err;
|
|
|
|
ret = EVP_Digest(str, i, data, len, fetched_md, NULL);
|
|
err:
|
|
OPENSSL_free(str);
|
|
if (fetched_md != md)
|
|
EVP_MD_free(fetched_md);
|
|
return ret;
|
|
}
|
|
|
|
int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *md, void *asn,
|
|
unsigned char *data, unsigned int *len)
|
|
{
|
|
return ossl_asn1_item_digest_ex(it, md, asn, data, len, NULL, NULL);
|
|
}
|
|
|