mirror of
https://github.com/openssl/openssl.git
synced 2024-12-15 06:01:37 +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)
135 lines
3.3 KiB
C
135 lines
3.3 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 "crypto/ctype.h"
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/buffer.h>
|
|
#include <openssl/asn1.h>
|
|
|
|
int i2a_ASN1_STRING(BIO *bp, const ASN1_STRING *a, int type)
|
|
{
|
|
int i, n = 0;
|
|
static const char *h = "0123456789ABCDEF";
|
|
char buf[2];
|
|
|
|
if (a == NULL)
|
|
return 0;
|
|
|
|
if (a->length == 0) {
|
|
if (BIO_write(bp, "0", 1) != 1)
|
|
goto err;
|
|
n = 1;
|
|
} else {
|
|
for (i = 0; i < a->length; i++) {
|
|
if ((i != 0) && (i % 35 == 0)) {
|
|
if (BIO_write(bp, "\\\n", 2) != 2)
|
|
goto err;
|
|
n += 2;
|
|
}
|
|
buf[0] = h[((unsigned char)a->data[i] >> 4) & 0x0f];
|
|
buf[1] = h[((unsigned char)a->data[i]) & 0x0f];
|
|
if (BIO_write(bp, buf, 2) != 2)
|
|
goto err;
|
|
n += 2;
|
|
}
|
|
}
|
|
return n;
|
|
err:
|
|
return -1;
|
|
}
|
|
|
|
int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
|
|
{
|
|
int i, j, k, m, n, again, bufsize;
|
|
unsigned char *s = NULL, *sp;
|
|
unsigned char *bufp;
|
|
int num = 0, slen = 0, first = 1;
|
|
|
|
bufsize = BIO_gets(bp, buf, size);
|
|
for (;;) {
|
|
if (bufsize < 1) {
|
|
if (first)
|
|
break;
|
|
else
|
|
goto err;
|
|
}
|
|
first = 0;
|
|
|
|
i = bufsize;
|
|
if (buf[i - 1] == '\n')
|
|
buf[--i] = '\0';
|
|
if (i == 0)
|
|
goto err;
|
|
if (buf[i - 1] == '\r')
|
|
buf[--i] = '\0';
|
|
if (i == 0)
|
|
goto err;
|
|
again = (buf[i - 1] == '\\');
|
|
|
|
for (j = i - 1; j > 0; j--) {
|
|
if (!ossl_isxdigit(buf[j])) {
|
|
i = j;
|
|
break;
|
|
}
|
|
}
|
|
buf[i] = '\0';
|
|
/*
|
|
* We have now cleared all the crap off the end of the line
|
|
*/
|
|
if (i < 2)
|
|
goto err;
|
|
|
|
bufp = (unsigned char *)buf;
|
|
|
|
k = 0;
|
|
i -= again;
|
|
if (i % 2 != 0) {
|
|
ERR_raise(ERR_LIB_ASN1, ASN1_R_ODD_NUMBER_OF_CHARS);
|
|
OPENSSL_free(s);
|
|
return 0;
|
|
}
|
|
i /= 2;
|
|
if (num + i > slen) {
|
|
sp = OPENSSL_realloc(s, (unsigned int)num + i * 2);
|
|
if (sp == NULL) {
|
|
OPENSSL_free(s);
|
|
return 0;
|
|
}
|
|
s = sp;
|
|
slen = num + i * 2;
|
|
}
|
|
for (j = 0; j < i; j++, k += 2) {
|
|
for (n = 0; n < 2; n++) {
|
|
m = OPENSSL_hexchar2int(bufp[k + n]);
|
|
if (m < 0) {
|
|
ERR_raise(ERR_LIB_ASN1, ASN1_R_NON_HEX_CHARACTERS);
|
|
OPENSSL_free(s);
|
|
return 0;
|
|
}
|
|
s[num + j] <<= 4;
|
|
s[num + j] |= m;
|
|
}
|
|
}
|
|
num += i;
|
|
if (again)
|
|
bufsize = BIO_gets(bp, buf, size);
|
|
else
|
|
break;
|
|
}
|
|
bs->length = num;
|
|
bs->data = s;
|
|
return 1;
|
|
|
|
err:
|
|
ERR_raise(ERR_LIB_ASN1, ASN1_R_SHORT_LINE);
|
|
OPENSSL_free(s);
|
|
return 0;
|
|
}
|