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)
128 lines
2.6 KiB
C
128 lines
2.6 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
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/buffer.h>
|
|
#include <openssl/asn1.h>
|
|
|
|
#ifndef NO_OLD_ASN1
|
|
|
|
# ifndef OPENSSL_NO_STDIO
|
|
int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, const void *x)
|
|
{
|
|
BIO *b;
|
|
int ret;
|
|
|
|
if ((b = BIO_new(BIO_s_file())) == NULL) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_BUF_LIB);
|
|
return 0;
|
|
}
|
|
BIO_set_fp(b, out, BIO_NOCLOSE);
|
|
ret = ASN1_i2d_bio(i2d, b, x);
|
|
BIO_free(b);
|
|
return ret;
|
|
}
|
|
# endif
|
|
|
|
int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, const void *x)
|
|
{
|
|
char *b;
|
|
unsigned char *p;
|
|
int i, j = 0, n, ret = 1;
|
|
|
|
n = i2d(x, NULL);
|
|
if (n <= 0)
|
|
return 0;
|
|
|
|
b = OPENSSL_malloc(n);
|
|
if (b == NULL)
|
|
return 0;
|
|
|
|
p = (unsigned char *)b;
|
|
i2d(x, &p);
|
|
|
|
for (;;) {
|
|
i = BIO_write(out, &(b[j]), n);
|
|
if (i == n)
|
|
break;
|
|
if (i <= 0) {
|
|
ret = 0;
|
|
break;
|
|
}
|
|
j += i;
|
|
n -= i;
|
|
}
|
|
OPENSSL_free(b);
|
|
return ret;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_STDIO
|
|
int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, const void *x)
|
|
{
|
|
BIO *b;
|
|
int ret;
|
|
|
|
if ((b = BIO_new(BIO_s_file())) == NULL) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_BUF_LIB);
|
|
return 0;
|
|
}
|
|
BIO_set_fp(b, out, BIO_NOCLOSE);
|
|
ret = ASN1_item_i2d_bio(it, b, x);
|
|
BIO_free(b);
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, const void *x)
|
|
{
|
|
unsigned char *b = NULL;
|
|
int i, j = 0, n, ret = 1;
|
|
|
|
n = ASN1_item_i2d(x, &b, it);
|
|
if (b == NULL) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
|
|
return 0;
|
|
}
|
|
|
|
for (;;) {
|
|
i = BIO_write(out, &(b[j]), n);
|
|
if (i == n)
|
|
break;
|
|
if (i <= 0) {
|
|
ret = 0;
|
|
break;
|
|
}
|
|
j += i;
|
|
n -= i;
|
|
}
|
|
OPENSSL_free(b);
|
|
return ret;
|
|
}
|
|
|
|
BIO *ASN1_item_i2d_mem_bio(const ASN1_ITEM *it, const ASN1_VALUE *val)
|
|
{
|
|
BIO *res;
|
|
|
|
if (it == NULL || val == NULL) {
|
|
ERR_raise(ERR_LIB_ASN1, ERR_R_PASSED_NULL_PARAMETER);
|
|
return NULL;
|
|
}
|
|
|
|
if ((res = BIO_new(BIO_s_mem())) == NULL)
|
|
return NULL;
|
|
if (ASN1_item_i2d_bio(it, res, val) <= 0) {
|
|
BIO_free(res);
|
|
res = NULL;
|
|
}
|
|
return res;
|
|
}
|