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)
62 lines
1.8 KiB
C
62 lines
1.8 KiB
C
/*
|
|
* Copyright 1999-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/asn1.h>
|
|
#include <openssl/conf.h>
|
|
#include <openssl/x509v3.h>
|
|
#include "ext_dat.h"
|
|
|
|
const X509V3_EXT_METHOD ossl_v3_ns_ia5_list[8] = {
|
|
EXT_IA5STRING(NID_netscape_base_url),
|
|
EXT_IA5STRING(NID_netscape_revocation_url),
|
|
EXT_IA5STRING(NID_netscape_ca_revocation_url),
|
|
EXT_IA5STRING(NID_netscape_renewal_url),
|
|
EXT_IA5STRING(NID_netscape_ca_policy_url),
|
|
EXT_IA5STRING(NID_netscape_ssl_server_name),
|
|
EXT_IA5STRING(NID_netscape_comment),
|
|
EXT_END
|
|
};
|
|
|
|
char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5)
|
|
{
|
|
char *tmp;
|
|
|
|
if (ia5 == NULL || ia5->length <= 0)
|
|
return NULL;
|
|
if ((tmp = OPENSSL_malloc(ia5->length + 1)) == NULL)
|
|
return NULL;
|
|
memcpy(tmp, ia5->data, ia5->length);
|
|
tmp[ia5->length] = 0;
|
|
return tmp;
|
|
}
|
|
|
|
ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
|
|
X509V3_CTX *ctx, const char *str)
|
|
{
|
|
ASN1_IA5STRING *ia5;
|
|
if (str == NULL) {
|
|
ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_NULL_ARGUMENT);
|
|
return NULL;
|
|
}
|
|
if ((ia5 = ASN1_IA5STRING_new()) == NULL) {
|
|
ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
|
|
return NULL;
|
|
}
|
|
if (!ASN1_STRING_set((ASN1_STRING *)ia5, str, strlen(str))) {
|
|
ASN1_IA5STRING_free(ia5);
|
|
return NULL;
|
|
}
|
|
#ifdef CHARSET_EBCDIC
|
|
ebcdic2ascii(ia5->data, ia5->data, ia5->length);
|
|
#endif /* CHARSET_EBCDIC */
|
|
return ia5;
|
|
}
|