From 25f2138b0ab54a65ba713c093ca3734d88f7cb51 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Sat, 28 Sep 2019 00:45:33 +0200 Subject: Reorganize private crypto header files 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 (Merged from https://github.com/openssl/openssl/pull/9333) --- crypto/ess/ess_asn1.c | 2 +- crypto/ess/ess_lib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'crypto/ess') diff --git a/crypto/ess/ess_asn1.c b/crypto/ess/ess_asn1.c index 0ea08e8653..19589d97f3 100644 --- a/crypto/ess/ess_asn1.c +++ b/crypto/ess/ess_asn1.c @@ -11,7 +11,7 @@ #include #include #include -#include "internal/ess_int.h" +#include "crypto/ess.h" /* ASN1 stuff for ESS Structure */ diff --git a/crypto/ess/ess_lib.c b/crypto/ess/ess_lib.c index fa9cff18be..17c0ea56c6 100644 --- a/crypto/ess/ess_lib.c +++ b/crypto/ess/ess_lib.c @@ -11,7 +11,7 @@ #include #include #include -#include "internal/ess_int.h" +#include "crypto/ess.h" static ESS_CERT_ID *ESS_CERT_ID_new_init(X509 *cert, int issuer_needed); static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg, -- cgit v1.2.3