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)

8 files changed, 9 insertions, 9 deletions

diff --git a/crypto/rand/drbg_lib.c b/crypto/rand/drbg_lib.c
index bce2f74e9a..5652526568 100644
--- a/crypto/rand/drbg_lib.c
+++ b/crypto/rand/drbg_lib.c
@@ -13,8 +13,8 @@
 #include <openssl/rand.h>
 #include "rand_lcl.h"
 #include "internal/thread_once.h"
-#include "internal/rand_int.h"
-#include "internal/cryptlib_int.h"
+#include "crypto/rand.h"
+#include "crypto/cryptlib.h"
 
 /*
  * Support framework for NIST SP 800-90A DRBG
diff --git a/crypto/rand/rand_crng_test.c b/crypto/rand/rand_crng_test.c
index 0ba0986b96..29af636f53 100644
--- a/crypto/rand/rand_crng_test.c
+++ b/crypto/rand/rand_crng_test.c
@@ -14,7 +14,7 @@
 
 #include <string.h>
 #include <openssl/evp.h>
-#include "internal/rand_int.h"
+#include "crypto/rand.h"
 #include "internal/thread_once.h"
 #include "internal/cryptlib.h"
 #include "rand_lcl.h"
diff --git a/crypto/rand/rand_lcl.h b/crypto/rand/rand_lcl.h
index 0c92d75666..0f8a81f311 100644
--- a/crypto/rand/rand_lcl.h
+++ b/crypto/rand/rand_lcl.h
@@ -17,7 +17,7 @@
 # include <openssl/ec.h>
 # include <openssl/rand_drbg.h>
 # include "internal/tsan_assist.h"
-# include "internal/rand_int.h"
+# include "crypto/rand.h"
 
 # include "internal/numbers.h"
 
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index b70b60a650..7f4f1b7f90 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -11,7 +11,7 @@
 #include <time.h>
 #include "internal/cryptlib.h"
 #include <openssl/opensslconf.h>
-#include "internal/rand_int.h"
+#include "crypto/rand.h"
 #include <openssl/engine.h>
 #include "internal/thread_once.h"
 #include "rand_lcl.h"
diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index 8641badbff..c0f995a166 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -16,7 +16,7 @@
 #include <openssl/rand.h>
 #include <openssl/crypto.h>
 #include "rand_lcl.h"
-#include "internal/rand_int.h"
+#include "crypto/rand.h"
 #include <stdio.h>
 #include "internal/dso.h"
 #ifdef __linux
diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c
index 3f13529d0f..5fb2259158 100644
--- a/crypto/rand/rand_vms.c
+++ b/crypto/rand/rand_vms.c
@@ -14,7 +14,7 @@
 # include <unistd.h>
 # include "internal/cryptlib.h"
 # include <openssl/rand.h>
-# include "internal/rand_int.h"
+# include "crypto/rand.h"
 # include "rand_lcl.h"
 # include <descrip.h>
 # include <dvidef.h>
diff --git a/crypto/rand/rand_vxworks.c b/crypto/rand/rand_vxworks.c
index 81774e097d..a32cf45bb9 100644
--- a/crypto/rand/rand_vxworks.c
+++ b/crypto/rand/rand_vxworks.c
@@ -14,7 +14,7 @@ NON_EMPTY_TRANSLATION_UNIT
 #else
 # include <openssl/rand.h>
 # include "rand_lcl.h"
-# include "internal/rand_int.h"
+# include "crypto/rand.h"
 # include "internal/cryptlib.h"
 # include <version.h>
 # include <taskLib.h>
diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index 38852dc7a0..ea0d53b8ad 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -10,7 +10,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/rand.h>
 #include "rand_lcl.h"
-#include "internal/rand_int.h"
+#include "crypto/rand.h"
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
 
 # ifndef OPENSSL_RAND_SEED_OS