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)
99 lines
2.4 KiB
C
99 lines
2.4 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
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "crypto/ctype.h"
|
|
#include <openssl/crypto.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/conf.h>
|
|
#include <openssl/x509.h>
|
|
#include "crypto/asn1.h"
|
|
#include "crypto/objects.h"
|
|
|
|
/* Simple ASN1 OID module: add all objects in a given section */
|
|
|
|
static int do_create(const char *value, const char *name);
|
|
|
|
static int oid_module_init(CONF_IMODULE *md, const CONF *cnf)
|
|
{
|
|
int i;
|
|
const char *oid_section;
|
|
STACK_OF(CONF_VALUE) *sktmp;
|
|
CONF_VALUE *oval;
|
|
|
|
oid_section = CONF_imodule_get_value(md);
|
|
if ((sktmp = NCONF_get_section(cnf, oid_section)) == NULL) {
|
|
ERR_raise(ERR_LIB_ASN1, ASN1_R_ERROR_LOADING_SECTION);
|
|
return 0;
|
|
}
|
|
for (i = 0; i < sk_CONF_VALUE_num(sktmp); i++) {
|
|
oval = sk_CONF_VALUE_value(sktmp, i);
|
|
if (!do_create(oval->value, oval->name)) {
|
|
ERR_raise(ERR_LIB_ASN1, ASN1_R_ADDING_OBJECT);
|
|
return 0;
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static void oid_module_finish(CONF_IMODULE *md)
|
|
{
|
|
}
|
|
|
|
void ASN1_add_oid_module(void)
|
|
{
|
|
CONF_module_add("oid_section", oid_module_init, oid_module_finish);
|
|
}
|
|
|
|
/*-
|
|
* Create an OID based on a name value pair. Accept two formats.
|
|
* shortname = 1.2.3.4
|
|
* shortname = some long name, 1.2.3.4
|
|
*/
|
|
|
|
static int do_create(const char *value, const char *name)
|
|
{
|
|
int nid;
|
|
const char *ln, *ostr, *p;
|
|
char *lntmp = NULL;
|
|
|
|
p = strrchr(value, ',');
|
|
if (p == NULL) {
|
|
ln = name;
|
|
ostr = value;
|
|
} else {
|
|
ln = value;
|
|
ostr = p + 1;
|
|
if (*ostr == '\0')
|
|
return 0;
|
|
while (ossl_isspace(*ostr))
|
|
ostr++;
|
|
while (ossl_isspace(*ln))
|
|
ln++;
|
|
p--;
|
|
while (ossl_isspace(*p)) {
|
|
if (p == ln)
|
|
return 0;
|
|
p--;
|
|
}
|
|
p++;
|
|
if ((lntmp = OPENSSL_malloc((p - ln) + 1)) == NULL)
|
|
return 0;
|
|
memcpy(lntmp, ln, p - ln);
|
|
lntmp[p - ln] = '\0';
|
|
ln = lntmp;
|
|
}
|
|
|
|
nid = OBJ_create(ostr, name, ln);
|
|
|
|
OPENSSL_free(lntmp);
|
|
|
|
return nid != NID_undef;
|
|
}
|