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)
94 lines
2.5 KiB
C
94 lines
2.5 KiB
C
/*
|
|
* Copyright 1998-2016 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 <stddef.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/asn1t.h>
|
|
#include "crypto/evp.h"
|
|
|
|
ASN1_SEQUENCE(X509_ALGOR) = {
|
|
ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT),
|
|
ASN1_OPT(X509_ALGOR, parameter, ASN1_ANY)
|
|
} ASN1_SEQUENCE_END(X509_ALGOR)
|
|
|
|
ASN1_ITEM_TEMPLATE(X509_ALGORS) =
|
|
ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, algorithms, X509_ALGOR)
|
|
ASN1_ITEM_TEMPLATE_END(X509_ALGORS)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(X509_ALGOR)
|
|
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS)
|
|
IMPLEMENT_ASN1_DUP_FUNCTION(X509_ALGOR)
|
|
|
|
int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval)
|
|
{
|
|
if (alg == NULL)
|
|
return 0;
|
|
|
|
if (ptype != V_ASN1_UNDEF) {
|
|
if (alg->parameter == NULL)
|
|
alg->parameter = ASN1_TYPE_new();
|
|
if (alg->parameter == NULL)
|
|
return 0;
|
|
}
|
|
|
|
ASN1_OBJECT_free(alg->algorithm);
|
|
alg->algorithm = aobj;
|
|
|
|
if (ptype == 0)
|
|
return 1;
|
|
if (ptype == V_ASN1_UNDEF) {
|
|
ASN1_TYPE_free(alg->parameter);
|
|
alg->parameter = NULL;
|
|
} else
|
|
ASN1_TYPE_set(alg->parameter, ptype, pval);
|
|
return 1;
|
|
}
|
|
|
|
void X509_ALGOR_get0(const ASN1_OBJECT **paobj, int *pptype,
|
|
const void **ppval, const X509_ALGOR *algor)
|
|
{
|
|
if (paobj)
|
|
*paobj = algor->algorithm;
|
|
if (pptype) {
|
|
if (algor->parameter == NULL) {
|
|
*pptype = V_ASN1_UNDEF;
|
|
return;
|
|
} else
|
|
*pptype = algor->parameter->type;
|
|
if (ppval)
|
|
*ppval = algor->parameter->value.ptr;
|
|
}
|
|
}
|
|
|
|
/* Set up an X509_ALGOR DigestAlgorithmIdentifier from an EVP_MD */
|
|
|
|
void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md)
|
|
{
|
|
int param_type;
|
|
|
|
if (md->flags & EVP_MD_FLAG_DIGALGID_ABSENT)
|
|
param_type = V_ASN1_UNDEF;
|
|
else
|
|
param_type = V_ASN1_NULL;
|
|
|
|
X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), param_type, NULL);
|
|
|
|
}
|
|
|
|
int X509_ALGOR_cmp(const X509_ALGOR *a, const X509_ALGOR *b)
|
|
{
|
|
int rv;
|
|
rv = OBJ_cmp(a->algorithm, b->algorithm);
|
|
if (rv)
|
|
return rv;
|
|
if (!a->parameter && !b->parameter)
|
|
return 0;
|
|
return ASN1_TYPE_cmp(a->parameter, b->parameter);
|
|
}
|