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/bn | |
parent | ea8e1fe55b51d9da69977d8dc3f2ffd648d438df (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/9333)
Diffstat (limited to 'crypto/bn')
-rw-r--r-- | crypto/bn/bn_conv.c | 2 | ||||
-rw-r--r-- | crypto/bn/bn_dh.c | 2 | ||||
-rw-r--r-- | crypto/bn/bn_lcl.h | 4 | ||||
-rw-r--r-- | crypto/bn/bn_rand.c | 2 | ||||
-rw-r--r-- | crypto/bn/bn_rsa_fips186_4.c | 2 | ||||
-rw-r--r-- | crypto/bn/bn_srp.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/crypto/bn/bn_conv.c b/crypto/bn/bn_conv.c index 9219fa4cb8..3c5ae75ef7 100644 --- a/crypto/bn/bn_conv.c +++ b/crypto/bn/bn_conv.c @@ -8,7 +8,7 @@ */ #include <openssl/err.h> -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "bn_lcl.h" static const char Hex[] = "0123456789ABCDEF"; diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c index 668be57a18..4e97a98779 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 38e66ab123..2640f3416f 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_rand.c b/crypto/bn/bn_rand.c index 2b3e6f2076..836ff54af6 100644 --- a/crypto/bn/bn_rand.c +++ b/crypto/bn/bn_rand.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <time.h> #include "internal/cryptlib.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #include "bn_lcl.h" #include <openssl/rand.h> #include <openssl/sha.h> diff --git a/crypto/bn/bn_rsa_fips186_4.c b/crypto/bn/bn_rsa_fips186_4.c index 9a3041e2e1..2a0f35f7a5 100644 --- a/crypto/bn/bn_rsa_fips186_4.c +++ b/crypto/bn/bn_rsa_fips186_4.c @@ -30,7 +30,7 @@ #include <stdio.h> #include <openssl/bn.h> #include "bn_lcl.h" -#include "internal/bn_int.h" +#include "crypto/bn.h" /* * FIPS 186-4 Table B.1. "Min length of auxiliary primes p1, p2, q1, q2". diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c index d722f59eb7..412bc5e9f6 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__) |