diff options
| author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 00:45:33 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 20:26:34 +0200 |
| commit | 25f2138b0ab54a65ba713c093ca3734d88f7cb51 (patch) | |
| tree | 0438d0f46a6a591d5833d74e0ccd9cb5da24fa2b /crypto/ts | |
| parent | Add legacy include guard manually to opensslconf.h.in (diff) | |
| download | openssl-25f2138b0ab54a65ba713c093ca3734d88f7cb51.tar.xz openssl-25f2138b0ab54a65ba713c093ca3734d88f7cb51.zip | |
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 <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9333)
Diffstat (limited to 'crypto/ts')
| -rw-r--r-- | crypto/ts/ts_rsp_sign.c | 2 | ||||
| -rw-r--r-- | crypto/ts/ts_rsp_verify.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c index 7791fc73c8..74fa93d05e 100644 --- a/crypto/ts/ts_rsp_sign.c +++ b/crypto/ts/ts_rsp_sign.c @@ -15,7 +15,7 @@ #include <openssl/pkcs7.h> #include <openssl/crypto.h> #include "ts_lcl.h" -#include "internal/ess_int.h" +#include "crypto/ess.h" static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *); static int def_time_cb(struct TS_resp_ctx *, void *, long *sec, long *usec); diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c index e658354eb3..0b6ea1ed62 100644 --- a/crypto/ts/ts_rsp_verify.c +++ b/crypto/ts/ts_rsp_verify.c @@ -13,7 +13,7 @@ #include <openssl/ts.h> #include <openssl/pkcs7.h> #include "ts_lcl.h" -#include "internal/ess_int.h" +#include "crypto/ess.h" static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted, X509 *signer, STACK_OF(X509) **chain); |