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)

15 files changed, 17 insertions, 17 deletions

diff --git a/test/asn1_dsa_internal_test.c b/test/asn1_dsa_internal_test.c
index a62f5e4cd4..21e574d3fb 100644
--- a/test/asn1_dsa_internal_test.c
+++ b/test/asn1_dsa_internal_test.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 #include <openssl/bn.h>
-#include "internal/asn1_dsa.h"
+#include "crypto/asn1_dsa.h"
 #include "testutil.h"
 
 static unsigned char t_dsa_sig[] = {
diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 753449cabb..e77299a7c8 100644
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -59,7 +59,7 @@ static int test_tbl_standard(void)
  *
  ***/
 
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 #include "../crypto/asn1/standard_methods.h"
 
 static int test_standard_methods(void)
diff --git a/test/bn_internal_test.c b/test/bn_internal_test.c
index cf47e8b734..f3e874960d 100644
--- a/test/bn_internal_test.c
+++ b/test/bn_internal_test.c
@@ -20,7 +20,7 @@
 #include "internal/numbers.h"
 #include "testutil.h"
 #include "bn_prime.h"
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 
 static BN_CTX *ctx;
 
diff --git a/test/build.info b/test/build.info
index caa70da821..7328641243 100644
--- a/test/build.info
+++ b/test/build.info
@@ -546,7 +546,7 @@ IF[{- !$disabled{tests} -}]
     DEPEND[property_test]=../libcrypto.a libtestutil.a
 
     SOURCE[ctype_internal_test]=ctype_internal_test.c
-    INCLUDE[ctype_internal_test]=.. ../crypto/include ../include ../apps/include
+    INCLUDE[ctype_internal_test]=.. ../include ../apps/include
     DEPEND[ctype_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[sparse_array_test]=sparse_array_test.c
@@ -578,11 +578,11 @@ IF[{- !$disabled{tests} -}]
     DEPEND[rdrand_sanitytest]=../libcrypto.a libtestutil.a
 
     SOURCE[rsa_sp800_56b_test]=rsa_sp800_56b_test.c
-    INCLUDE[rsa_sp800_56b_test]=.. ../include ../crypto/include ../crypto/rsa ../apps/include
+    INCLUDE[rsa_sp800_56b_test]=.. ../include ../crypto/rsa ../apps/include
     DEPEND[rsa_sp800_56b_test]=../libcrypto.a libtestutil.a
 
     SOURCE[bn_internal_test]=bn_internal_test.c
-    INCLUDE[bn_internal_test]=.. ../include ../crypto/include ../crypto/bn ../apps/include
+    INCLUDE[bn_internal_test]=.. ../include ../crypto/bn ../apps/include
     DEPEND[bn_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[asn1_dsa_internal_test]=asn1_dsa_internal_test.c
diff --git a/test/chacha_internal_test.c b/test/chacha_internal_test.c
index 40f1f12fcd..878bd752e0 100644
--- a/test/chacha_internal_test.c
+++ b/test/chacha_internal_test.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <openssl/opensslconf.h>
 #include "testutil.h"
-#include "internal/chacha.h"
+#include "crypto/chacha.h"
 
 static const unsigned int key[] = {
     0x03020100, 0x07060504, 0x0b0a0908, 0x0f0e0d0c,
diff --git a/test/ctype_internal_test.c b/test/ctype_internal_test.c
index b0aac6a4d2..e2e7dc0bac 100644
--- a/test/ctype_internal_test.c
+++ b/test/ctype_internal_test.c
@@ -8,7 +8,7 @@
  */
 
 #include "testutil.h"
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/nelem.h"
 #include <ctype.h>
 #include <stdio.h>
diff --git a/test/drbgtest.c b/test/drbgtest.c
index 4559ffd635..f5b19344b6 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -16,7 +16,7 @@
 #include <openssl/evp.h>
 #include <openssl/aes.h>
 #include "../crypto/rand/rand_lcl.h"
-#include "../crypto/include/internal/rand_int.h"
+#include "../include/crypto/rand.h"
 
 #if defined(_WIN32)
 # include <windows.h>
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 1898e31de8..12c21e195c 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -24,7 +24,7 @@
 #include <openssl/dsa.h>
 #include "testutil.h"
 #include "internal/nelem.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 /*
  * kExampleRSAKeyDER is an RSA private key in ASN.1, DER format. Of course, you
diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c
index 02e5c8d0a8..37ca2b14bd 100644
--- a/test/modes_internal_test.c
+++ b/test/modes_internal_test.c
@@ -15,7 +15,7 @@
 #include <openssl/aes.h>
 #include <openssl/modes.h>
 #include "testutil.h"
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 #include "internal/nelem.h"
 
 typedef struct {
diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c
index e2f9381621..504e474b7c 100644
--- a/test/poly1305_internal_test.c
+++ b/test/poly1305_internal_test.c
@@ -13,7 +13,7 @@
 #include <string.h>
 
 #include "testutil.h"
-#include "internal/poly1305.h"
+#include "crypto/poly1305.h"
 #include "../crypto/poly1305/poly1305_local.h"
 #include "internal/nelem.h"
 
diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c
index 6934b89dc0..84d90daeeb 100644
--- a/test/shlibloadtest.c
+++ b/test/shlibloadtest.c
@@ -13,7 +13,7 @@
 #include <openssl/opensslv.h>
 #include <openssl/ssl.h>
 #include <openssl/ossl_typ.h>
-#include "internal/dso_conf.h"
+#include "crypto/dso_conf.h"
 
 typedef void DSO;
 
diff --git a/test/siphash_internal_test.c b/test/siphash_internal_test.c
index 75caefd899..e77e9d265f 100644
--- a/test/siphash_internal_test.c
+++ b/test/siphash_internal_test.c
@@ -14,7 +14,7 @@
 
 #include <openssl/bio.h>
 #include "testutil.h"
-#include "internal/siphash.h"
+#include "crypto/siphash.h"
 #include "../crypto/siphash/siphash_local.h"
 #include "internal/nelem.h"
 
diff --git a/test/sm2_internal_test.c b/test/sm2_internal_test.c
index 8e76daa913..0c626526b1 100644
--- a/test/sm2_internal_test.c
+++ b/test/sm2_internal_test.c
@@ -21,7 +21,7 @@
 
 #ifndef OPENSSL_NO_SM2
 
-# include "internal/sm2.h"
+# include "crypto/sm2.h"
 
 static RAND_METHOD fake_rand;
 static const RAND_METHOD *saved_rand;
diff --git a/test/sm4_internal_test.c b/test/sm4_internal_test.c
index 7ccd6e46db..0a5ea738e5 100644
--- a/test/sm4_internal_test.c
+++ b/test/sm4_internal_test.c
@@ -17,7 +17,7 @@
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_SM4
-# include "internal/sm4.h"
+# include "crypto/sm4.h"
 
 static int test_sm4_ecb(void)
 {
diff --git a/test/sparse_array_test.c b/test/sparse_array_test.c
index 5cc8038f7f..2c7f5a878c 100644
--- a/test/sparse_array_test.c
+++ b/test/sparse_array_test.c
@@ -15,7 +15,7 @@
 #include <openssl/crypto.h>
 #include <internal/nelem.h>
 
-#include "internal/sparse_array.h"
+#include "crypto/sparse_array.h"
 #include "testutil.h"
 
 /* The macros below generate unused functions which error out one of the clang