mirror of
https://github.com/openssl/openssl.git
synced 2024-12-15 06:01:37 +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)
88 lines
2.5 KiB
C
88 lines
2.5 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
|
|
*/
|
|
|
|
/* internal ESS related stuff */
|
|
|
|
ESS_SIGNING_CERT *ESS_SIGNING_CERT_get(PKCS7_SIGNER_INFO *si);
|
|
int ESS_SIGNING_CERT_add(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT *sc);
|
|
|
|
ESS_SIGNING_CERT *ESS_SIGNING_CERT_new_init(X509 *signcert,
|
|
STACK_OF(X509) *certs,
|
|
int issuer_needed);
|
|
|
|
ESS_SIGNING_CERT_V2 *ESS_SIGNING_CERT_V2_get(PKCS7_SIGNER_INFO *si);
|
|
int ESS_SIGNING_CERT_V2_add(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT_V2 *sc);
|
|
|
|
ESS_SIGNING_CERT_V2 *ESS_SIGNING_CERT_V2_new_init(const EVP_MD *hash_alg,
|
|
X509 *signcert,
|
|
STACK_OF(X509) *certs,
|
|
int issuer_needed);
|
|
|
|
/*-
|
|
* IssuerSerial ::= SEQUENCE {
|
|
* issuer GeneralNames,
|
|
* serialNumber CertificateSerialNumber
|
|
* }
|
|
*/
|
|
|
|
struct ESS_issuer_serial {
|
|
STACK_OF(GENERAL_NAME) *issuer;
|
|
ASN1_INTEGER *serial;
|
|
};
|
|
|
|
/*-
|
|
* ESSCertID ::= SEQUENCE {
|
|
* certHash Hash,
|
|
* issuerSerial IssuerSerial OPTIONAL
|
|
* }
|
|
*/
|
|
|
|
struct ESS_cert_id {
|
|
ASN1_OCTET_STRING *hash; /* Always SHA-1 digest. */
|
|
ESS_ISSUER_SERIAL *issuer_serial;
|
|
};
|
|
|
|
/*-
|
|
* SigningCertificate ::= SEQUENCE {
|
|
* certs SEQUENCE OF ESSCertID,
|
|
* policies SEQUENCE OF PolicyInformation OPTIONAL
|
|
* }
|
|
*/
|
|
|
|
struct ESS_signing_cert {
|
|
STACK_OF(ESS_CERT_ID) *cert_ids;
|
|
STACK_OF(POLICYINFO) *policy_info;
|
|
};
|
|
|
|
/*-
|
|
* ESSCertIDv2 ::= SEQUENCE {
|
|
* hashAlgorithm AlgorithmIdentifier DEFAULT id-sha256,
|
|
* certHash Hash,
|
|
* issuerSerial IssuerSerial OPTIONAL
|
|
* }
|
|
*/
|
|
|
|
struct ESS_cert_id_v2_st {
|
|
X509_ALGOR *hash_alg; /* Default: SHA-256 */
|
|
ASN1_OCTET_STRING *hash;
|
|
ESS_ISSUER_SERIAL *issuer_serial;
|
|
};
|
|
|
|
/*-
|
|
* SigningCertificateV2 ::= SEQUENCE {
|
|
* certs SEQUENCE OF ESSCertIDv2,
|
|
* policies SEQUENCE OF PolicyInformation OPTIONAL
|
|
* }
|
|
*/
|
|
|
|
struct ESS_signing_cert_v2_st {
|
|
STACK_OF(ESS_CERT_ID_V2) *cert_ids;
|
|
STACK_OF(POLICYINFO) *policy_info;
|
|
};
|