mirror of
https://github.com/openssl/openssl.git
synced 2024-11-21 01:15:20 +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)
47 lines
1.1 KiB
C
47 lines
1.1 KiB
C
/*
|
|
* Copyright 1995-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 <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/evp.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/x509.h>
|
|
|
|
X509_PKEY *X509_PKEY_new(void)
|
|
{
|
|
X509_PKEY *ret = NULL;
|
|
|
|
ret = OPENSSL_zalloc(sizeof(*ret));
|
|
if (ret == NULL)
|
|
return NULL;
|
|
|
|
ret->enc_algor = X509_ALGOR_new();
|
|
ret->enc_pkey = ASN1_OCTET_STRING_new();
|
|
if (ret->enc_algor == NULL || ret->enc_pkey == NULL) {
|
|
X509_PKEY_free(ret);
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
|
|
return NULL;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
void X509_PKEY_free(X509_PKEY *x)
|
|
{
|
|
if (x == NULL)
|
|
return;
|
|
|
|
X509_ALGOR_free(x->enc_algor);
|
|
ASN1_OCTET_STRING_free(x->enc_pkey);
|
|
EVP_PKEY_free(x->dec_pkey);
|
|
if (x->key_free)
|
|
OPENSSL_free(x->key_data);
|
|
OPENSSL_free(x);
|
|
}
|