mirror of
https://github.com/openssl/openssl.git
synced 2024-12-27 06:21:43 +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)
65 lines
1.6 KiB
C
65 lines
1.6 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 "internal/cryptlib.h"
|
|
#include <openssl/objects.h>
|
|
#include <openssl/buffer.h>
|
|
#include "crypto/asn1.h"
|
|
|
|
ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
|
|
{
|
|
ASN1_OBJECT *r;
|
|
|
|
if (o == NULL)
|
|
return NULL;
|
|
/* If object isn't dynamic it's an internal OID which is never freed */
|
|
if (!(o->flags & ASN1_OBJECT_FLAG_DYNAMIC))
|
|
return (ASN1_OBJECT *)o;
|
|
|
|
r = ASN1_OBJECT_new();
|
|
if (r == NULL) {
|
|
ERR_raise(ERR_LIB_OBJ, ERR_R_ASN1_LIB);
|
|
return NULL;
|
|
}
|
|
|
|
/* Set dynamic flags so everything gets freed up on error */
|
|
|
|
r->flags = o->flags | (ASN1_OBJECT_FLAG_DYNAMIC |
|
|
ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
|
|
ASN1_OBJECT_FLAG_DYNAMIC_DATA);
|
|
|
|
if (o->length > 0 && (r->data = OPENSSL_memdup(o->data, o->length)) == NULL)
|
|
goto err;
|
|
|
|
r->length = o->length;
|
|
r->nid = o->nid;
|
|
|
|
if (o->ln != NULL && (r->ln = OPENSSL_strdup(o->ln)) == NULL)
|
|
goto err;
|
|
|
|
if (o->sn != NULL && (r->sn = OPENSSL_strdup(o->sn)) == NULL)
|
|
goto err;
|
|
|
|
return r;
|
|
err:
|
|
ASN1_OBJECT_free(r);
|
|
return NULL;
|
|
}
|
|
|
|
int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b)
|
|
{
|
|
int ret;
|
|
|
|
ret = (a->length - b->length);
|
|
if (ret)
|
|
return ret;
|
|
return memcmp(a->data, b->data, a->length);
|
|
}
|