mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +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)
77 lines
1.9 KiB
C
77 lines
1.9 KiB
C
/*
|
|
* Copyright 2002-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
|
|
*/
|
|
|
|
/*
|
|
* Suppress deprecation warnings for EC low level implementations that are
|
|
* kept until removal.
|
|
*/
|
|
#define OPENSSL_SUPPRESS_DEPRECATED
|
|
|
|
#include <openssl/crypto.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/ec.h>
|
|
|
|
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
|
BIGNUM *EC_POINT_point2bn(const EC_GROUP *group,
|
|
const EC_POINT *point,
|
|
point_conversion_form_t form,
|
|
BIGNUM *ret, BN_CTX *ctx)
|
|
{
|
|
size_t buf_len = 0;
|
|
unsigned char *buf;
|
|
|
|
buf_len = EC_POINT_point2buf(group, point, form, &buf, ctx);
|
|
|
|
if (buf_len == 0)
|
|
return NULL;
|
|
|
|
ret = BN_bin2bn(buf, buf_len, ret);
|
|
|
|
OPENSSL_free(buf);
|
|
|
|
return ret;
|
|
}
|
|
|
|
EC_POINT *EC_POINT_bn2point(const EC_GROUP *group,
|
|
const BIGNUM *bn, EC_POINT *point, BN_CTX *ctx)
|
|
{
|
|
size_t buf_len = 0;
|
|
unsigned char *buf;
|
|
EC_POINT *ret;
|
|
|
|
if ((buf_len = BN_num_bytes(bn)) == 0)
|
|
buf_len = 1;
|
|
if ((buf = OPENSSL_malloc(buf_len)) == NULL)
|
|
return NULL;
|
|
|
|
if (BN_bn2binpad(bn, buf, buf_len) < 0) {
|
|
OPENSSL_free(buf);
|
|
return NULL;
|
|
}
|
|
|
|
if (point == NULL) {
|
|
if ((ret = EC_POINT_new(group)) == NULL) {
|
|
OPENSSL_free(buf);
|
|
return NULL;
|
|
}
|
|
} else
|
|
ret = point;
|
|
|
|
if (!EC_POINT_oct2point(group, ret, buf, buf_len, ctx)) {
|
|
if (ret != point)
|
|
EC_POINT_clear_free(ret);
|
|
OPENSSL_free(buf);
|
|
return NULL;
|
|
}
|
|
|
|
OPENSSL_free(buf);
|
|
return ret;
|
|
}
|
|
#endif /* OPENSSL_NO_DEPRECATED_3_0 */
|