diff options
| author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-27 23:57:58 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-27 23:57:58 +0200 |
| commit | 0c994d54afbb734ed744330d4b03a653a8477fe3 (patch) | |
| tree | f88964f69776b04bdbf8b9091459caa21f379d58 /crypto/err/err.c | |
| parent | 61df2198e20ca47a4e8418c5bc47a362fd491ea3 (diff) | |
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/9681)
Diffstat (limited to 'crypto/err/err.c')
| -rw-r--r-- | crypto/err/err.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index 3a58ccb958..ec8a7851af 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -10,16 +10,16 @@ #include <stdio.h> #include <stdarg.h> #include <string.h> -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include "internal/err.h" -#include "internal/err_int.h" +#include "crypto/err.h" #include <openssl/err.h> #include <openssl/crypto.h> #include <openssl/buffer.h> #include <openssl/bio.h> #include <openssl/opensslconf.h> #include "internal/thread_once.h" -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/constant_time_locl.h" #include "e_os.h" |