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/bn | |
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/bn')
-rw-r--r-- | crypto/bn/bn_dh.c | 2 | ||||
-rw-r--r-- | crypto/bn/bn_lcl.h | 4 | ||||
-rw-r--r-- | crypto/bn/bn_print.c | 2 | ||||
-rw-r--r-- | crypto/bn/bn_srp.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c index 38acdee234..3f0af5e49d 100644 --- a/crypto/bn/bn_dh.c +++ b/crypto/bn/bn_dh.c @@ -12,7 +12,7 @@ #ifndef OPENSSL_NO_DH #include <openssl/dh.h> -#include "internal/bn_dh.h" +#include "crypto/bn_dh.h" /* DH parameters from RFC5114 */ # if BN_BITS2 == 64 diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index 7f823a6178..5e895b0cd1 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -18,10 +18,10 @@ # include <openssl/opensslconf.h> # if !defined(OPENSSL_SYS_UEFI) -# include "internal/bn_conf.h" +# include "crypto/bn_conf.h" # endif -# include "internal/bn_int.h" +# include "crypto/bn.h" /* * These preprocessor symbols control various aspects of the bignum headers diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c index 1853269d90..89a4ac31e6 100644 --- a/crypto/bn/bn_print.c +++ b/crypto/bn/bn_print.c @@ -8,7 +8,7 @@ */ #include <stdio.h> -#include "internal/ctype.h" +#include "crypto/ctype.h" #include <limits.h> #include "internal/cryptlib.h" #include <openssl/buffer.h> diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c index 27b6ebe518..de07b045d6 100644 --- a/crypto/bn/bn_srp.c +++ b/crypto/bn/bn_srp.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_SRP #include <openssl/srp.h> -#include "internal/bn_srp.h" +#include "crypto/bn_srp.h" # if (BN_BYTES == 8) # if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__) |