0c994d54af
Currently, there are two different directories which contain internal header files of libcrypto which are meant to be shared internally: While header files in 'include/internal' are intended to be shared between libcrypto and libssl, the files in 'crypto/include/internal' are intended to be shared inside libcrypto only. To make things complicated, the include search path is set up in such a way that the directive #include "internal/file.h" could refer to a file in either of these two directoroes. This makes it necessary in some cases to add a '_int.h' suffix to some files to resolve this ambiguity: #include "internal/file.h" # located in 'include/internal' #include "internal/file_int.h" # located in 'crypto/include/internal' This commit moves the private crypto headers from 'crypto/include/internal' to 'include/crypto' As a result, the include directives become unambiguous #include "internal/file.h" # located in 'include/internal' #include "crypto/file.h" # located in 'include/crypto' hence the superfluous '_int.h' suffixes can be stripped. The files 'store_int.h' and 'store.h' need to be treated specially; they are joined into a single file. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9681)
65 lines
1.7 KiB
C
65 lines
1.7 KiB
C
/*
|
|
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (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) {
|
|
OBJerr(OBJ_F_OBJ_DUP, 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);
|
|
OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE);
|
|
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);
|
|
}
|