mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
25f2138b0a
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/9333)
58 lines
2.0 KiB
C
58 lines
2.0 KiB
C
/*
|
|
* Copyright 2019 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 <openssl/err.h>
|
|
#include <openssl/asn1t.h>
|
|
#include <openssl/ess.h>
|
|
#include <openssl/x509v3.h>
|
|
#include "crypto/ess.h"
|
|
|
|
/* ASN1 stuff for ESS Structure */
|
|
|
|
ASN1_SEQUENCE(ESS_ISSUER_SERIAL) = {
|
|
ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME),
|
|
ASN1_SIMPLE(ESS_ISSUER_SERIAL, serial, ASN1_INTEGER)
|
|
} static_ASN1_SEQUENCE_END(ESS_ISSUER_SERIAL)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(ESS_ISSUER_SERIAL)
|
|
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_ISSUER_SERIAL)
|
|
|
|
ASN1_SEQUENCE(ESS_CERT_ID) = {
|
|
ASN1_SIMPLE(ESS_CERT_ID, hash, ASN1_OCTET_STRING),
|
|
ASN1_OPT(ESS_CERT_ID, issuer_serial, ESS_ISSUER_SERIAL)
|
|
} static_ASN1_SEQUENCE_END(ESS_CERT_ID)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(ESS_CERT_ID)
|
|
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_CERT_ID)
|
|
|
|
ASN1_SEQUENCE(ESS_SIGNING_CERT) = {
|
|
ASN1_SEQUENCE_OF(ESS_SIGNING_CERT, cert_ids, ESS_CERT_ID),
|
|
ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT, policy_info, POLICYINFO)
|
|
} static_ASN1_SEQUENCE_END(ESS_SIGNING_CERT)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(ESS_SIGNING_CERT)
|
|
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT)
|
|
|
|
ASN1_SEQUENCE(ESS_CERT_ID_V2) = {
|
|
ASN1_OPT(ESS_CERT_ID_V2, hash_alg, X509_ALGOR),
|
|
ASN1_SIMPLE(ESS_CERT_ID_V2, hash, ASN1_OCTET_STRING),
|
|
ASN1_OPT(ESS_CERT_ID_V2, issuer_serial, ESS_ISSUER_SERIAL)
|
|
} static_ASN1_SEQUENCE_END(ESS_CERT_ID_V2)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(ESS_CERT_ID_V2)
|
|
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_CERT_ID_V2)
|
|
|
|
ASN1_SEQUENCE(ESS_SIGNING_CERT_V2) = {
|
|
ASN1_SEQUENCE_OF(ESS_SIGNING_CERT_V2, cert_ids, ESS_CERT_ID_V2),
|
|
ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT_V2, policy_info, POLICYINFO)
|
|
} static_ASN1_SEQUENCE_END(ESS_SIGNING_CERT_V2)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(ESS_SIGNING_CERT_V2)
|
|
IMPLEMENT_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT_V2)
|