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)

diff --git a/.gitignore b/.gitignore
index 9fdd588e4f9374d3c381084b8611f1ccb33aa764..50f461533e3b69a2f1a64e7a5f4df04995880298 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@ Makefile
 
 # Auto generated headers
 /crypto/buildinf.h
-/crypto/include/internal/*_conf.h
+/include/crypto/*_conf.h
 /openssl/include/opensslconf.h
 /util/domd
 

diff --git a/build.info b/build.info
index a0ecb21881637a2c998a8cfbae4e244a36cbe379..83dc6ed164e3ca11300b68da73a9d13509f70854 100644 (file)
--- a/build.info
+++ b/build.info
@@ -3,20 +3,20 @@
 SUBDIRS=crypto ssl apps test util tools fuzz engines providers
 
 LIBS=libcrypto libssl
-INCLUDE[libcrypto]=. crypto/include include
+INCLUDE[libcrypto]=. include
 INCLUDE[libssl]=. include
 DEPEND[libssl]=libcrypto
 
 # Empty DEPEND "indices" means the dependencies are expected to be built
 # unconditionally before anything else.
-DEPEND[]=include/openssl/opensslconf.h crypto/include/internal/bn_conf.h \
-         crypto/include/internal/dso_conf.h doc/man7/openssl_user_macros.pod
+DEPEND[]=include/openssl/opensslconf.h include/crypto/bn_conf.h \
+         include/crypto/dso_conf.h doc/man7/openssl_user_macros.pod
 DEPEND[include/openssl/opensslconf.h]=configdata.pm
 GENERATE[include/openssl/opensslconf.h]=include/openssl/opensslconf.h.in
-DEPEND[crypto/include/internal/bn_conf.h]=configdata.pm
-GENERATE[crypto/include/internal/bn_conf.h]=crypto/include/internal/bn_conf.h.in
-DEPEND[crypto/include/internal/dso_conf.h]=configdata.pm
-GENERATE[crypto/include/internal/dso_conf.h]=crypto/include/internal/dso_conf.h.in
+DEPEND[include/crypto/bn_conf.h]=configdata.pm
+GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in
+DEPEND[include/crypto/dso_conf.h]=configdata.pm
+GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in
 DEPEND[doc/man7/openssl_user_macros.pod]=configdata.pm
 GENERATE[doc/man7/openssl_user_macros.pod]=doc/man7/openssl_user_macros.pod.in
 

diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index 67bd8d95d86153b7284e1ef3808f7ad19eff0d28..c1b2254af7fadc8d1154e9059d58aa3c00d2eff4 100644 (file)
--- a/crypto/aria/aria.c
+++ b/crypto/aria/aria.c
@@ -19,7 +19,7 @@
  */
 
 #include <openssl/e_os2.h>
-#include "internal/aria.h"
+#include "crypto/aria.h"
 
 #include <assert.h>
 #include <string.h>

diff --git a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c
index a8d80090cf37a83fd593cd7c9b80167d91b8d4bd..186e7ec4136e42735fb4f8e199da2a3e7cbeb8d8 100644 (file)
--- a/crypto/asn1/a_d2i_fp.c
+++ b/crypto/asn1/a_d2i_fp.c
@@ -13,7 +13,7 @@
 #include "internal/numbers.h"
 #include <openssl/buffer.h>
 #include <openssl/asn1.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 
 #ifndef NO_OLD_ASN1
 # ifndef OPENSSL_NO_STDIO

diff --git a/crypto/asn1/a_mbstr.c b/crypto/asn1/a_mbstr.c
index ea08edc219354402302f6262f18f61ea358433d6..122cafd02c5213e1381918d2c3578c4108a3151c 100644 (file)
--- a/crypto/asn1/a_mbstr.c
+++ b/crypto/asn1/a_mbstr.c
@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/asn1.h>
 

diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index 913fa9a14d1bb02614a1f3e2bb6024e6468e49f7..cc5541081e1509b9ed20c79967d35b65c650f8b9 100644 (file)
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c
@@ -9,13 +9,13 @@
 
 #include <stdio.h>
 #include <limits.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/buffer.h>
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 #include <openssl/bn.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 #include "asn1_locl.h"
 
 int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp)

diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c
index 516f091916ad3a66163701eda971d88af9551167..328e0abcc510680ecac3875404548ad3d86d5020 100644 (file)
--- a/crypto/asn1/a_print.c
+++ b/crypto/asn1/a_print.c
@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/asn1.h>
 

diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c
index e2ef60f773846a764302233d60bef903a77a936c..fdf25b204b72ba422394547b206707607da43cb7 100644 (file)
--- a/crypto/asn1/a_sign.c
+++ b/crypto/asn1/a_sign.c
@@ -18,8 +18,8 @@
 #include <openssl/x509.h>
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 #ifndef NO_ASN1_OLD
 

diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c
index 4f431480c203e6d7fe9cdb508e394cd8abd36338..91d78c66341c0e9c612cca3d3c92292a204a8217 100644 (file)
--- a/crypto/asn1/a_strex.c
+++ b/crypto/asn1/a_strex.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "internal/cryptlib.h"
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>

diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index 16f0cc3fe34e435193992f11fbc1fde196227d79..af060c4fc39aeafdc24de93ffdab4e233841bf74 100644 (file)
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -16,7 +16,7 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include "asn1_locl.h"

diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
index d26c52360072b67acd5ba6885fa567da72068dd6..9484bccf4cc758a21071f2a399e27eb00854d951 100644 (file)
--- a/crypto/asn1/a_verify.c
+++ b/crypto/asn1/a_verify.c
@@ -18,8 +18,8 @@
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 #ifndef NO_ASN1_OLD
 

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index b2bcd5acac479596816fa618fa12e04e902385be..4295d889cb6ec9e2dcc2a0f2c85af4b3d9784776 100644 (file)
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -13,8 +13,8 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/engine.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 #include "standard_methods.h"
 

diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 5c3493832bc4c000f9c5a906d1841ec92b0ad053..571523e12741fa3a00947fa7a92492dcadeceffb 100644 (file)
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -8,13 +8,13 @@
  */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/rand.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/bio.h"
 #include "asn1_locl.h"
 

diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c
index 251a7efcc629627895d7fc05184d6a325e6b5f55..90f807604819a47c239ccdd8e2f44129a12c5c2c 100644 (file)
--- a/crypto/asn1/asn_moid.c
+++ b/crypto/asn1/asn_moid.c
@@ -8,13 +8,13 @@
  */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include <openssl/conf.h>
 #include <openssl/x509.h>
-#include "internal/asn1_int.h"
-#include "internal/objects.h"
+#include "crypto/asn1.h"
+#include "crypto/objects.h"
 
 /* Simple ASN1 OID module: add all objects in a given section */
 

diff --git a/crypto/asn1/d2i_param.c b/crypto/asn1/d2i_param.c
index e852470a663889067d5fd7977a59e61a0567569c..c82b4a8fa83e93b19babe9807b649edff5fe8427 100644 (file)
--- a/crypto/asn1/d2i_param.c
+++ b/crypto/asn1/d2i_param.c
@@ -11,8 +11,8 @@
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/asn1.h>
-#include "internal/evp_int.h"
-#include "internal/asn1_int.h"
+#include "crypto/evp.h"
+#include "crypto/asn1.h"
 
 EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp,
                         long length)

diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index c683f62c478f2338420456e3a50187484b41e80e..b24f99118e9cc1fffdb2ddfde0cbe993b227d792 100644 (file)
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -15,8 +15,8 @@
 #include <openssl/engine.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
                          long length)

diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c
index 8876878fd074e0d97437d8ce04aeb2a1b600ad1c..4b26ec0400772d6ac0448cfef3ea02bac82a75bf 100644 (file)
--- a/crypto/asn1/d2i_pu.c
+++ b/crypto/asn1/d2i_pu.c
@@ -17,7 +17,7 @@
 #include <openssl/dsa.h>
 #include <openssl/ec.h>
 
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
                         long length)

diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c
index de7d983695f1538ee5e32bd8b1e0d483c89dba5c..295ecb6fc5bc22f924cb6d71ad7f9491d764dc91 100644 (file)
--- a/crypto/asn1/f_int.c
+++ b/crypto/asn1/f_int.c
@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/buffer.h>
 #include <openssl/asn1.h>

diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c
index dbca0c06136f1a1b67882988184930fc7404148b..0b930dfd0a8a2980a3dae27dfde0b325e322095c 100644 (file)
--- a/crypto/asn1/f_string.c
+++ b/crypto/asn1/f_string.c
@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/buffer.h>
 #include <openssl/asn1.h>

diff --git a/crypto/asn1/i2d_param.c b/crypto/asn1/i2d_param.c
index 2e9000891a19d88817cc9d988cb52c34e537c6bb..1e1ebc95b2ef567c942dc799450b1602f6a4970b 100644 (file)
--- a/crypto/asn1/i2d_param.c
+++ b/crypto/asn1/i2d_param.c
@@ -12,8 +12,8 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/asn1.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 int i2d_KeyParams(const EVP_PKEY *a, unsigned char **pp)
 {

diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c
index 7133d3da9c46a287920ec6c5b9bf7cf0bc6c7aa9..4decdb1dd739bab1387ad26cbbf18e7462f41ab9 100644 (file)
--- a/crypto/asn1/i2d_pr.c
+++ b/crypto/asn1/i2d_pr.c
@@ -11,8 +11,8 @@
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/x509.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 int i2d_PrivateKey(const EVP_PKEY *a, unsigned char **pp)
 {

diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c
index 94b32646cc3e8a529869a9791bfda168898e15f8..c55353ae112c22fad9e860583f0bd90856bd2365 100644 (file)
--- a/crypto/asn1/p8_pkey.c
+++ b/crypto/asn1/p8_pkey.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 /* Minor tweak to operation: zero private key data */
 static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,

diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c
index 483dd109212616c95e20681d9eeab19ebd044f6b..03579c877cfc001d54f8ed39e5b6c225cf124d06 100644 (file)
--- a/crypto/asn1/t_pkey.c
+++ b/crypto/asn1/t_pkey.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 
 /* Number of octets per line */
 #define ASN1_BUF_PRINT_WIDTH    15

diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index 8ab9c370fdef4e4242d98459a3fd7f231fe09273..0ca8460580a463691e8590b30672de9b2ff514df 100644 (file)
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -13,7 +13,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 #include "asn1_locl.h"
 
 static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,

diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 0f56fb092da5e243a74a23fcc09e4c6a6c3a2b1d..149300e4fbcd68135991f110f8737cb8b98e2789 100644 (file)
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -15,7 +15,7 @@
 #include <openssl/buffer.h>
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 #include "asn1_locl.h"
 
 /*

diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c
index 77363fe75d1e6e16ad85410bdf95acac992cdd15..94c2aa3a2b2119c18ea63e45bac1668821798327 100644 (file)
--- a/crypto/asn1/x_algor.c
+++ b/crypto/asn1/x_algor.c
@@ -11,7 +11,7 @@
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 ASN1_SEQUENCE(X509_ALGOR) = {
         ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT),

diff --git a/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c
index f8ca810fbec95f27797521ccf5bc5045bb681d7f..759a9566531e9d1ea0b73fe7ddda0314f9e1fd1f 100644 (file)
--- a/crypto/asn1/x_sig.c
+++ b/crypto/asn1/x_sig.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 ASN1_SEQUENCE(X509_SIG) = {
         ASN1_SIMPLE(X509_SIG, algor, X509_ALGOR),

diff --git a/crypto/asn1_dsa.c b/crypto/asn1_dsa.c
index 8423ff883f4cb1f9aeb302823720e0899d0f65be..972a9eb9055ba76a9eaccb39ae137e0e8558550c 100644 (file)
--- a/crypto/asn1_dsa.c
+++ b/crypto/asn1_dsa.c
@@ -23,7 +23,7 @@
 
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
-#include "internal/asn1_dsa.h"
+#include "crypto/asn1_dsa.h"
 #include "internal/packet.h"
 
 #define ID_SEQUENCE 0x30

diff --git a/crypto/async/async.c b/crypto/async/async.c
index 43b16a7b7c0288b85b9e9e2014ef6b0568700f76..74904195869496696766282984397af3556a6923 100644 (file)
--- a/crypto/async/async.c
+++ b/crypto/async/async.c
@@ -19,7 +19,7 @@
 #include "async_locl.h"
 
 #include <openssl/err.h>
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 #include <string.h>
 
 #define ASYNC_JOB_RUNNING   0

diff --git a/crypto/async/async_locl.h b/crypto/async/async_locl.h
index 85dfcfa6327a9d9c67a897e2cc733a6c7fc795b6..549a27e61143328bc599b93df15bfc8b9cf82d1b 100644 (file)
--- a/crypto/async/async_locl.h
+++ b/crypto/async/async_locl.h
@@ -20,7 +20,7 @@
 # include <windows.h>
 #endif
 
-#include "internal/async.h"
+#include "crypto/async.h"
 #include <openssl/crypto.h>
 
 typedef struct async_ctx_st async_ctx;

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index 438cd0e6362f4f9eb5a90d1a2270c9083f21632b..0d6fafcc2d411da4158526b024173bab58f0b981 100644 (file)
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "internal/cryptlib.h"
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/numbers.h"
 #include <openssl/bio.h>
 

diff --git a/crypto/blake2/m_blake2b.c b/crypto/blake2/m_blake2b.c
index b429d2d7f2e695aaeaf274a73d27573362dfe2e9..816dd06b6c83b4198b3e5a5c80287e52a7f384aa 100644 (file)
--- a/crypto/blake2/m_blake2b.c
+++ b/crypto/blake2/m_blake2b.c
@@ -11,7 +11,7 @@
 
 # include <stddef.h>
 # include <openssl/obj_mac.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include "internal/blake2.h"
 
 static int init(EVP_MD_CTX *ctx)

diff --git a/crypto/blake2/m_blake2s.c b/crypto/blake2/m_blake2s.c
index dd4b68fa1c2d3589fc143a890c90d4fbc4c3f524..caf8a6657a128752f06fb9fb41fd634352965d0e 100644 (file)
--- a/crypto/blake2/m_blake2s.c
+++ b/crypto/blake2/m_blake2s.c
@@ -11,7 +11,7 @@
 
 # include <stddef.h>
 # include <openssl/obj_mac.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include "internal/blake2.h"
 
 static int init(EVP_MD_CTX *ctx)

diff --git a/crypto/bn/bn_conv.c b/crypto/bn/bn_conv.c
index 9219fa4cb88f2de762e9ceede9d1012851bed201..3c5ae75ef7e6877ebf7b5eecf1728464ad4ec321 100644 (file)
--- 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 668be57a18fd49344493ea1c5198eafffabc800e..4e97a9877975e927785939a9e83da224f55d98d2 100644 (file)
--- 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 38e66ab123154a5bb2bcc808c0f52f61fc9c3f4f..2640f3416fa972b649f7d592b89d5266769de740 100644 (file)
--- 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 2b3e6f2076e88a7871b8735553e770bdc8cce686..836ff54af63c6aca546ef2c957b72ce1614fa59b 100644 (file)
--- 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 9a3041e2e13dcc52791bc40a16eb2e73a1e796f9..2a0f35f7a5e7abd4a525ef2e79dede01ba7b67b0 100644 (file)
--- 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 d722f59eb7d6a0cf2da065a71d35f773e472117b..412bc5e9f6dff94579b7aa1c4cee5c4f73b668c2 100644 (file)
--- 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__)

diff --git a/crypto/chacha/chacha_enc.c b/crypto/chacha/chacha_enc.c
index e350c9b0f10f65c14bc34471473ce710c5254e15..05a716b5d42b22a895a9182c1d8550e154936873 100644 (file)
--- a/crypto/chacha/chacha_enc.c
+++ b/crypto/chacha/chacha_enc.c
@@ -11,7 +11,7 @@
 
 #include <string.h>
 
-#include "internal/chacha.h"
+#include "crypto/chacha.h"
 
 typedef unsigned int u32;
 typedef unsigned char u8;

diff --git a/crypto/cmac/cm_ameth.c b/crypto/cmac/cm_ameth.c
index b1ee0d3d2f1d5406a9b59c8dd15be31732c69591..9db2562157238c058ecf33e1931af1238d47d0bf 100644 (file)
--- a/crypto/cmac/cm_ameth.c
+++ b/crypto/cmac/cm_ameth.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 
 /*
  * CMAC "ASN1" method. This is just here to indicate the maximum CMAC output

diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 27e98ce0a7de95f23077b489e110d71a1fee5cfd..15248ddf3c3e9edb7f4cfac00c5ae49102c5fe35 100644 (file)
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -15,8 +15,8 @@
 #include <openssl/cms.h>
 #include <openssl/aes.h>
 #include "cms_lcl.h"
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 /* CMS EnvelopedData Utilities */
 

diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c
index 8f80f6ba5df7919ba512fc52235b13a2970b6280..ded7738218764b623c7a782d6cf2eff251eab6fb 100644 (file)
--- a/crypto/cms/cms_ess.c
+++ b/crypto/cms/cms_ess.c
@@ -16,8 +16,8 @@
 #include <openssl/cms.h>
 #include <openssl/ess.h>
 #include "cms_lcl.h"
-#include "internal/ess_int.h"
-#include "internal/cms_int.h"
+#include "crypto/ess.h"
+#include "crypto/cms.h"
 
 IMPLEMENT_ASN1_FUNCTIONS(CMS_ReceiptRequest)
 

diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c
index 866749a171eeea6947efd3df6beebf3febdc6c9a..364903b662a5c7713232492157c0046940d9d52c 100644 (file)
--- a/crypto/cms/cms_kari.c
+++ b/crypto/cms/cms_kari.c
@@ -15,7 +15,7 @@
 #include <openssl/cms.h>
 #include <openssl/aes.h>
 #include "cms_lcl.h"
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 
 /* Key Agreement Recipient Info (KARI) routines */
 

diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index f0502a45100cc2e944a70fb9d65c87bf32ab8db1..d1cb16f3fd30a58b584a235fdec7d4a4734a9f8b 100644 (file)
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -16,7 +16,7 @@
 #include <openssl/rand.h>
 #include <openssl/aes.h>
 #include "cms_lcl.h"
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 
 int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
                                     unsigned char *pass, ossl_ssize_t passlen)

diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index 6715e84d2fcc9628b4d19928c7363d2c095b03d1..1cea8617655da7eecd712e5f667543bba5a0f36c 100644 (file)
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -16,10 +16,10 @@
 #include <openssl/cms.h>
 #include <openssl/ess.h>
 #include "cms_lcl.h"
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
-#include "internal/cms_int.h"
-#include "internal/ess_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
+#include "crypto/cms.h"
+#include "crypto/ess.h"
 
 /* CMS SignedData Utilities */
 

diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index ae95ff2dd22a2f9addb52fc096ce1365cec5dfae..1117d7488c3038cb4efac20313823a97c7673c2b 100644 (file)
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -14,7 +14,7 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include "cms_lcl.h"
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 
 static BIO *cms_get_text_bio(BIO *out, unsigned int flags)
 {

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 1dd7d679981081ca43b20920b65e48fe23033425..17786e8cedf03e65787d0523f31c35efd59d37bd 100644 (file)
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -13,7 +13,7 @@
 #include <openssl/objects.h>
 #include "internal/comp.h"
 #include <openssl/err.h>
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 #include "internal/bio.h"
 #include "comp_lcl.h"
 

diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index 13d061b298cf870c441dd8430bb1b6c9f2143c96..833b7a6551ad7ceedc785e876629703591c7ea38 100644 (file)
--- a/crypto/conf/conf_lib.c
+++ b/crypto/conf/conf_lib.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "internal/conf.h"
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/conf.h>

diff --git a/crypto/context.c b/crypto/context.c
index a2e19bac5442cb94f41347b7139f735a22e0c718..02fecf9f35b48ed232a6a9ec20899654a231b307 100644 (file)
--- a/crypto/context.c
+++ b/crypto/context.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 #include "internal/thread_once.h"
 #include "internal/property.h"
 

diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c
index cf5f1e54c390879408a3f6b936448bfd6c3a3894..cb26b429b7519d2f775a99153610666e30e58ffe 100644 (file)
--- a/crypto/core_namemap.c
+++ b/crypto/core_namemap.c
@@ -10,7 +10,7 @@
 #include "e_os.h"                /* strcasecmp */
 #include "internal/namemap.h"
 #include <openssl/lhash.h>
-#include "internal/lhash.h"      /* openssl_lh_strcasehash */
+#include "crypto/lhash.h"      /* openssl_lh_strcasehash */
 
 /*-
  * The namenum entry

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 7e89bbd6b5709382cbabbbfb2e0fbab68b3aaaf8..bc29a3b583d63525eb12c2b4665f650e56c41a70 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -9,7 +9,7 @@
  */
 
 #include "e_os.h"
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 #include <openssl/safestack.h>
 
 #if     defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
@@ -49,7 +49,7 @@ typedef char variant_char;
 #   define ossl_getenv getenv
 #  endif
 
-#  include "internal/ctype.h"
+#  include "crypto/ctype.h"
 
 static int todigit(variant_char c)
 {

diff --git a/crypto/ctype.c b/crypto/ctype.c
index e7bc25b9766130a5180635a6060356fb0913bdca..dbd7891399ad59e0cd6f50cea921785e73189507 100644 (file)
--- a/crypto/ctype.c
+++ b/crypto/ctype.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "openssl/ebcdic.h"
 
 /*

diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 84f1f8b952c6947288fb820e4d32c69cc7435a8d..c0bcf25567883e5cd4139fbb6b36458b1a8764a7 100644 (file)
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -13,8 +13,8 @@
 #include <openssl/asn1.h>
 #include "dh_locl.h"
 #include <openssl/bn.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 #include <openssl/cms.h>
 #include <openssl/core_names.h>
 #include "internal/param_build.h"

diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index 8731cc2c7315a14246bc03f91df045e7b752a1f7..71f748f8297f41960ce6e3e31306d9ce6e921067 100644 (file)
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include "dh_locl.h"
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 
 static int generate_key(DH *dh);
 static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);

diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c
index 4676a222e2f965654199ecb807461844ddc1c1cc..1f0f3d4d3f4bb1cd120beb33c21f155c76e1b6ab 100644 (file)
--- a/crypto/dh/dh_pmeth.c
+++ b/crypto/dh/dh_pmeth.c
@@ -16,7 +16,7 @@
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
 #include <openssl/objects.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 /* DH pkey context structure */
 

diff --git a/crypto/dh/dh_rfc5114.c b/crypto/dh/dh_rfc5114.c
index 1cc323839b82bc228c14def9b867281439aec5d2..143a19f22444c63c1e008a6a47725ffe951e82da 100644 (file)
--- a/crypto/dh/dh_rfc5114.c
+++ b/crypto/dh/dh_rfc5114.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include "dh_locl.h"
 #include <openssl/bn.h>
-#include "internal/bn_dh.h"
+#include "crypto/bn_dh.h"
 
 /*
  * Macro to make a DH structure from BIGNUM data. NB: although just copying

diff --git a/crypto/dh/dh_rfc7919.c b/crypto/dh/dh_rfc7919.c
index 4e676fd3d1271f93bb40987c76004e95b9586d21..d634dbc37614bd130ba10dd765a78fe613b21057 100644 (file)
--- a/crypto/dh/dh_rfc7919.c
+++ b/crypto/dh/dh_rfc7919.c
@@ -12,7 +12,7 @@
 #include "dh_locl.h"
 #include <openssl/bn.h>
 #include <openssl/objects.h>
-#include "internal/bn_dh.h"
+#include "crypto/bn_dh.h"
 
 static DH *dh_param_init(const BIGNUM *p, int32_t nbits)
 {

diff --git a/crypto/dllmain.c b/crypto/dllmain.c
index 6f12741f9a92882eca1f4f5896fce464743a90d0..48c0cd31227a4107aab0cdd0d2b3763a1a59630f 100644 (file)
--- a/crypto/dllmain.c
+++ b/crypto/dllmain.c
@@ -8,7 +8,7 @@
  */
 
 #include "e_os.h"
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 
 #if defined(_WIN32) || defined(__CYGWIN__)
 # ifdef __CYGWIN__

diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index f3aab34856f06b02050307b89a38ca56244e1d79..386646149022bf475031fbcd9c3914f41bac1fde 100644 (file)
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -14,8 +14,8 @@
 #include <openssl/cms.h>
 #include <openssl/core_names.h>
 #include "internal/cryptlib.h"
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 #include "internal/param_build.h"
 #include "dsa_locl.h"
 

diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c
index eddcc11819a442f8aa65e1eddd5046e78580ddf3..55c4522c2fab160509ed58b8a818be7e6f51582a 100644 (file)
--- a/crypto/dsa/dsa_asn1.c
+++ b/crypto/dsa/dsa_asn1.c
@@ -13,7 +13,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/rand.h>
-#include "internal/asn1_dsa.h"
+#include "crypto/asn1_dsa.h"
 
 DSA_SIG *DSA_SIG_new(void)
 {

diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index 08f2e9f025d6d25557c1db9ef42431c57d5eb792..0b9a0afd852224f7f89470c02017666714133990 100644 (file)
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include <openssl/bn.h>
 #include <openssl/sha.h>
 #include "dsa_locl.h"

diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c
index 496063d8769aef83db050f1f885ee911b4392189..93e84b9b97fc877321b3e5bfd5360887cacadc59 100644 (file)
--- a/crypto/dsa/dsa_pmeth.c
+++ b/crypto/dsa/dsa_pmeth.c
@@ -13,7 +13,7 @@
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 #include <openssl/bn.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "dsa_locl.h"
 
 /* DSA pkey context structure */

diff --git a/crypto/dso/dso_locl.h b/crypto/dso/dso_locl.h
index 5d365aab25c410f012d55a31f113d7e9bcb08e7c..8aa29c1826fec97e2c29cb7869e674ffac2f4825 100644 (file)
--- a/crypto/dso/dso_locl.h
+++ b/crypto/dso/dso_locl.h
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include "internal/dso.h"
-#include "internal/dso_conf.h"
+#include "crypto/dso_conf.h"
 #include "internal/refcount.h"
 
 /**********************************************************************/

diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index f377b1f11e24da1f1d51b4f545cbab82a9c62e0a..a9e9a4c842b42d91613078b83c5597ad02ca842a 100644 (file)
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -10,7 +10,7 @@
 
 #include <openssl/err.h>
 
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include "ec_lcl.h"
 
 #ifndef OPENSSL_NO_EC2M

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 2beeb82707bbb5f4da8c52f33574b84095665841..74124bdc639c98ee7add9aea133f1148b65e5401 100644 (file)
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -14,8 +14,8 @@
 #include <openssl/bn.h>
 #include <openssl/cms.h>
 #include <openssl/asn1t.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 #include "ec_lcl.h"
 
 #ifndef OPENSSL_NO_CMS

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 2726f5d15109718f50d86b6a87b092735c287b5c..9a8a80021ca688f833b3846300ef59e2f2a2365a 100644 (file)
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -13,7 +13,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
 #include "internal/nelem.h"
-#include "internal/asn1_dsa.h"
+#include "crypto/asn1_dsa.h"
 
 #ifndef FIPS_MODE
 

diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c
index 9b3087ed0936e51d140c8dd827da6edef1481240..4b4096b0bf2e80b89da24fd8830c9610cf5e15c0 100644 (file)
--- a/crypto/ec/ec_cvt.c
+++ b/crypto/ec/ec_cvt.c
@@ -9,7 +9,7 @@
  */
 
 #include <openssl/err.h>
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include "ec_lcl.h"
 
 EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index b33d30982c08b83a3cb2df312f449d9be67a0646..a523ab64228d7fc61127c34fe4718dec4dd95833 100644 (file)
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -14,7 +14,7 @@
 #include <openssl/ec.h>
 #include <openssl/bn.h>
 #include "internal/refcount.h"
-#include "internal/ec_int.h"
+#include "crypto/ec.h"
 
 #if defined(__SUNPRO_C)
 # if __SUNPRO_C >= 0x520

diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index be4f23062334efbe2f942c1a059b0c4027af995c..1710decdddc9d7cdb8fbf942caff6d930108c96b 100644 (file)
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -12,7 +12,7 @@
 #include <openssl/err.h>
 
 #include "internal/cryptlib.h"
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include "ec_lcl.h"
 #include "internal/refcount.h"
 

diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index ded2858ee45d20b97c91ca13a551142964ed3650..5834b868e24d07bfc5802ba3971043aab8c3ebbd 100644 (file)
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -14,7 +14,7 @@
 #include <openssl/ec.h>
 #include "ec_lcl.h"
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 /* EC pkey context structure */
 

diff --git a/crypto/ec/ecdsa_ossl.c b/crypto/ec/ecdsa_ossl.c
index afa65233be45626f94e3210febf763e6fc8f1623..432002ca311885abd644081d2f9cb901af1611ca 100644 (file)
--- a/crypto/ec/ecdsa_ossl.c
+++ b/crypto/ec/ecdsa_ossl.c
@@ -11,7 +11,7 @@
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
 #include <openssl/rand.h>
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include "ec_lcl.h"
 
 int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,

diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index a09e9c5d99db91cefe4429295491ee278fcb233c..f0f3ae32dd003304c3f5875ed1042eefe1ec7dc0 100644 (file)
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "internal/cryptlib.h"
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include "ec_lcl.h"
 #include "internal/refcount.h"
 

diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c
index aaaca6442692fec0656ca0b0e9fe5344f2755b4f..2eedba3d84a567fbfdace4057f18a1cb1134d634 100644 (file)
--- a/crypto/ec/ecx_meth.c
+++ b/crypto/ec/ecx_meth.c
@@ -12,8 +12,8 @@
 #include <openssl/x509.h>
 #include <openssl/ec.h>
 #include <openssl/rand.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 #include "ec_lcl.h"
 #include "curve448/curve448_lcl.h"
 

diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h
index d45617567cbfdebfebf2f002b9f58a0cf6f716fd..460053184344aecd987a9584dcdc74ed17c2a08d 100644 (file)
--- a/crypto/engine/eng_int.h
+++ b/crypto/engine/eng_int.h
@@ -13,7 +13,7 @@
 
 # include <openssl/trace.h>
 # include "internal/cryptlib.h"
-# include "internal/engine.h"
+# include "crypto/engine.h"
 # include "internal/thread_once.h"
 # include "internal/refcount.h"
 

diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index debbb16a79203ae91d282ce160b585b47d8a422a..53edb41a3ea1832788b5e596b1b0848844c55f5d 100644 (file)
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
-#include "internal/engine.h"
+#include "crypto/engine.h"
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 #include <openssl/rand.h>

diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c
index 7dd3b9fdf6fa1b6d7e9eb9788fd8ccad9a87d68e..b6d1988d13b1e732ceb009af88df64ab922a0545 100644 (file)
--- a/crypto/engine/eng_rdrand.c
+++ b/crypto/engine/eng_rdrand.c
@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "internal/engine.h"
+#include "crypto/engine.h"
 #include "internal/cryptlib.h"
 #include <openssl/rand.h>
 #include <openssl/err.h>

diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index 2f167c84a80effae6833c34757541bf6271fc0fb..2e01deb90163e764926a4881394499ac40467456 100644 (file)
--- a/crypto/engine/tb_asnmth.c
+++ b/crypto/engine/tb_asnmth.c
@@ -10,7 +10,7 @@
 #include "e_os.h"
 #include "eng_int.h"
 #include <openssl/evp.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 
 /*
  * If this symbol is defined then ENGINE_get_pkey_asn1_meth_engine(), the

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 6ad995d679ac23db92f62cab967719a6105d5f21..8db5385b7c1bf2f98f4d25f65007a5493a469d4c 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -13,16 +13,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"
 #include "err_locl.h"

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 972421f4025709685016bdac91ae22ad93399461..5957730d183e6eb6e3e88e45aa44e7495c37d668 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "internal/err_int.h"
+#include "crypto/err.h"
 #include <openssl/asn1err.h>
 #include <openssl/bnerr.h>
 #include <openssl/ecerr.h>

diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 925ed65b964d26c7befa9dfa719ed7f0afa8316f..3c09eab3e216966e6ac1f3310044165a856b6625 100644 (file)
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -35,7 +35,7 @@ L CMP           include/openssl/cmp.h           crypto/cmp/cmp_err.c
 L CT            include/openssl/ct.h            crypto/ct/ct_err.c
 L ASYNC         include/openssl/async.h         crypto/async/async_err.c
 L KDF           include/openssl/kdf.h           crypto/kdf/kdf_err.c
-L SM2           crypto/include/internal/sm2.h   crypto/sm2/sm2_err.c
+L SM2           include/crypto/sm2.h            crypto/sm2/sm2_err.c
 L OSSL_STORE    include/openssl/store.h         crypto/store/store_err.c
 L ESS           include/openssl/ess.h           crypto/ess/ess_err.c
 L PROP          include/internal/property.h     crypto/property/property_err.c

diff --git a/crypto/ess/ess_asn1.c b/crypto/ess/ess_asn1.c
index 0ea08e865396607c6618319f8e9f882c9a4454cf..19589d97f3c047f31ddc213533de60c9b88b1ce6 100644 (file)
--- a/crypto/ess/ess_asn1.c
+++ b/crypto/ess/ess_asn1.c
@@ -11,7 +11,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/ess.h>
 #include <openssl/x509v3.h>
-#include "internal/ess_int.h"
+#include "crypto/ess.h"
 
 /* ASN1 stuff for ESS Structure */
 

diff --git a/crypto/ess/ess_lib.c b/crypto/ess/ess_lib.c
index fa9cff18be6c6241b6cdf10c64335c575a670f8c..17c0ea56c6a04e0276084327f9b5adf0fa3a446b 100644 (file)
--- a/crypto/ess/ess_lib.c
+++ b/crypto/ess/ess_lib.c
@@ -11,7 +11,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/err.h>
 #include <openssl/ess.h>
-#include "internal/ess_int.h"
+#include "crypto/ess.h"
 
 static ESS_CERT_ID *ESS_CERT_ID_new_init(X509 *cert, int issuer_needed);
 static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg,

diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index 9dd3ac421b02968a387e1c09abe0e7ec4e06bab6..e1b6c8cc3e6be9df6c92fbf543ac5c26367bc7ef 100644 (file)
--- a/crypto/evp/bio_md.c
+++ b/crypto/evp/bio_md.c
@@ -12,7 +12,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "evp_locl.h"
 #include "internal/bio.h"
 

diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index 7f99f325482ce5031df741b78a58f3ffd5fb7f9d..f94882829b0fa6fa791879f7f8462e94b15bad62 100644 (file)
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -76,7 +76,7 @@
 #include "internal/bio.h"
 #include <openssl/evp.h>
 #include <openssl/rand.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 static int ok_write(BIO *h, const char *buf, int num);
 static int ok_read(BIO *h, char *buf, int size);

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index a97eaa168514e41974b96917f637ac9f81e5f969..df8e5a5bcbbe13c980ca8293f34d5b1bf0f724df 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include <openssl/pkcs12.h>
 #include <openssl/objects.h>
 

diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
index a0b2500d11434c3a92ecb7b0c8179b2f33f0502a..f7d62bd2ecff8bd5538292ddadcf0ecafcc86e48 100644 (file)
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include <openssl/pkcs12.h>
 #include <openssl/objects.h>
 

diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c
index ba61c525643f1c6cc87d11419dfe7f97160b1f9a..7c7550e9ce618be568832480dc373d7dd00273e2 100644 (file)
--- a/crypto/evp/cmeth_lib.c
+++ b/crypto/evp/cmeth_lib.c
@@ -10,7 +10,7 @@
 #include <string.h>
 
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider.h"
 #include "evp_locl.h"
 

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 9c6aa42887d778fae747a448a1366f2ad251eb32..ca5f7a935e9a225bc6556cabfedcb2c6573dff79 100644 (file)
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -14,7 +14,7 @@
 #include <openssl/params.h>
 #include <openssl/core_names.h>
 #include "internal/cryptlib.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider.h"
 #include "evp_locl.h"
 

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 39ed5280602cc683716295bc97503f199202b454..17e445d8f2dfe6edc3fbe106eb5928268eddd6ac 100644 (file)
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -16,11 +16,11 @@
 #include <openssl/aes.h>
 #include <openssl/rand.h>
 #include <openssl/cmac.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/cryptlib.h"
-#include "internal/modes_int.h"
-#include "internal/siv_int.h"
-#include "internal/ciphermode_platform.h"
+#include "crypto/modes.h"
+#include "crypto/siv.h"
+#include "crypto/ciphermode_platform.h"
 #include "evp_locl.h"
 
 typedef struct {

diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index 9e393f0b88a774b1aa300467c900a18925e9ee84..eddb9686e26356fca48e6ca970bd59aa93416f01 100644 (file)
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -16,8 +16,8 @@
 #include <openssl/sha.h>
 #include <openssl/rand.h>
 #include "internal/cryptlib.h"
-#include "internal/modes_int.h"
-#include "internal/evp_int.h"
+#include "crypto/modes.h"
+#include "crypto/evp.h"
 #include "internal/constant_time_locl.h"
 
 typedef struct {

diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
index e434ec009f4015c088dcb833ee2fac83a28f4017..7659d8f8d365012a82dde3bbfbf826fcd99d3097 100644 (file)
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
@@ -16,9 +16,9 @@
 #include <openssl/sha.h>
 #include <openssl/rand.h>
 #include "internal/cryptlib.h"
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 #include "internal/constant_time_locl.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 typedef struct {
     AES_KEY ks;

diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c
index 84b14826cbaac43ba600229ac6bc75d0b3fbd779..9412d51b04f0cf12e5a6980064636d94eabb6ba1 100644 (file)
--- a/crypto/evp/e_aria.c
+++ b/crypto/evp/e_aria.c
@@ -14,9 +14,9 @@
 # include <openssl/modes.h>
 # include <openssl/rand.h>
 # include <openssl/rand_drbg.h>
-# include "internal/aria.h"
-# include "internal/evp_int.h"
-# include "internal/modes_int.h"
+# include "crypto/aria.h"
+# include "crypto/evp.h"
+# include "crypto/modes.h"
 # include "evp_locl.h"
 
 /* ARIA subkey Structure */

diff --git a/crypto/evp/e_bf.c b/crypto/evp/e_bf.c
index 71cc990b25a03aa6c710f71abd2a807cada73727..0ac49fe1fe1341d5c002acbaac02e8d0c2c2b46d 100644 (file)
--- a/crypto/evp/e_bf.c
+++ b/crypto/evp/e_bf.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #ifndef OPENSSL_NO_BF
 # include <openssl/evp.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include <openssl/objects.h>
 # include <openssl/blowfish.h>
 

diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c
index 5e66101422f5d44945af5907fc100b3ca167e0df..50febca9bcf61b447a47888a22a66e107c133173 100644 (file)
--- a/crypto/evp/e_camellia.c
+++ b/crypto/evp/e_camellia.c
@@ -17,9 +17,9 @@ NON_EMPTY_TRANSLATION_UNIT
 # include <string.h>
 # include <assert.h>
 # include <openssl/camellia.h>
-# include "internal/evp_int.h"
-# include "internal/modes_int.h"
-# include "internal/ciphermode_platform.h"
+# include "crypto/evp.h"
+# include "crypto/modes.h"
+# include "crypto/ciphermode_platform.h"
 
 static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                              const unsigned char *iv, int enc);

diff --git a/crypto/evp/e_cast.c b/crypto/evp/e_cast.c
index 8906bd470327180fb2a8b2fc25cdbbe7a127c0c6..4b06717b72e73225c03c613dd02346d8d1a1395b 100644 (file)
--- a/crypto/evp/e_cast.c
+++ b/crypto/evp/e_cast.c
@@ -13,7 +13,7 @@
 #ifndef OPENSSL_NO_CAST
 # include <openssl/evp.h>
 # include <openssl/objects.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include <openssl/cast.h>
 
 static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c
index 570378b1af56c36f4203bf6c268b3b99a7c51ddf..17cce58ff176450d06bf712d3055b46cbeb85090 100644 (file)
--- a/crypto/evp/e_chacha20_poly1305.c
+++ b/crypto/evp/e_chacha20_poly1305.c
@@ -14,9 +14,9 @@
 
 # include <openssl/evp.h>
 # include <openssl/objects.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include "evp_locl.h"
-# include "internal/chacha.h"
+# include "crypto/chacha.h"
 
 typedef struct {
     union {
@@ -146,7 +146,7 @@ const EVP_CIPHER *EVP_chacha20(void)
 }
 
 # ifndef OPENSSL_NO_POLY1305
-#  include "internal/poly1305.h"
+#  include "crypto/poly1305.h"
 
 typedef struct {
     EVP_CHACHA_KEY key;

diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c
index 0d8e90cfa7c4762ed58d55127b0be22cf214f65e..e5791f34475c4eb29c92d3c18836c1c41ce9f13d 100644 (file)
--- a/crypto/evp/e_des.c
+++ b/crypto/evp/e_des.c
@@ -12,7 +12,7 @@
 #ifndef OPENSSL_NO_DES
 # include <openssl/evp.h>
 # include <openssl/objects.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include <openssl/des.h>
 # include <openssl/rand.h>
 

diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
index 52fde95fb0c6ca91bc477be4bade82c871985876..1ceb3fc73c3b555654b4817acc78fc859dc9a2b9 100644 (file)
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -12,7 +12,7 @@
 #ifndef OPENSSL_NO_DES
 # include <openssl/evp.h>
 # include <openssl/objects.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include <openssl/des.h>
 # include <openssl/rand.h>
 # include "evp_locl.h"

diff --git a/crypto/evp/e_idea.c b/crypto/evp/e_idea.c
index 0f7f4dd525966815109d0d4141fe54380a02c54d..8c3a55410898c735b5c8aad120a8ba7631819c9d 100644 (file)
--- a/crypto/evp/e_idea.c
+++ b/crypto/evp/e_idea.c
@@ -13,7 +13,7 @@
 #ifndef OPENSSL_NO_IDEA
 # include <openssl/evp.h>
 # include <openssl/objects.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include <openssl/idea.h>
 
 /* Can't use IMPLEMENT_BLOCK_CIPHER because IDEA_ecb_encrypt is different */

diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index 2f3fcc88f2a4c147252b69ec50709c0c66d8f143..2c8d27e3be32fd79b7d91abc3eb8f3fa6e38ca8d 100644 (file)
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/objects.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                          const unsigned char *iv, int enc);

diff --git a/crypto/evp/e_rc2.c b/crypto/evp/e_rc2.c
index 375714a6f47cf87ff27c3a3cce4e2d3929407c1c..d2201b000a0e9cd8d1b1bd7a49edf84a4b95bcfd 100644 (file)
--- a/crypto/evp/e_rc2.c
+++ b/crypto/evp/e_rc2.c
@@ -14,7 +14,7 @@
 
 # include <openssl/evp.h>
 # include <openssl/objects.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include <openssl/rc2.h>
 
 static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

diff --git a/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c
index a1664b594e5b0af6e97cc0682eb59f8040afe873..092d6cf1dba38a98763393c5e316a70e0b4c5930 100644 (file)
--- a/crypto/evp/e_rc4.c
+++ b/crypto/evp/e_rc4.c
@@ -16,7 +16,7 @@
 # include <openssl/objects.h>
 # include <openssl/rc4.h>
 
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 typedef struct {
     RC4_KEY ks;                 /* working key */

diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
index 4d61faff61e807ef0da423bb0d06d157cf2e3197..fc519d90429bc3c328d0d88ffc6b9b57ea210cf2 100644 (file)
--- a/crypto/evp/e_rc4_hmac_md5.c
+++ b/crypto/evp/e_rc4_hmac_md5.c
@@ -19,7 +19,7 @@
 # include <openssl/objects.h>
 # include <openssl/rc4.h>
 # include <openssl/md5.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 typedef struct {
     RC4_KEY ks;

diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c
index 95a626bd4f4e14ac9b0d0b3421f2012d20b85ba7..d92d10f16c24c250ede495a777b734e6db8bc114 100644 (file)
--- a/crypto/evp/e_rc5.c
+++ b/crypto/evp/e_rc5.c
@@ -13,7 +13,7 @@
 #ifndef OPENSSL_NO_RC5
 
 # include <openssl/evp.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include <openssl/objects.h>
 # include "evp_locl.h"
 # include <openssl/rc5.h>

diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c
index 0861ee8b2e7af6c1577c930974c9d7d9a9b7be72..9a9938deaf4edd8d132b3ac928db54761d99a555 100644 (file)
--- a/crypto/evp/e_seed.c
+++ b/crypto/evp/e_seed.c
@@ -16,7 +16,7 @@ NON_EMPTY_TRANSLATION_UNIT
 # include <string.h>
 # include <assert.h>
 # include <openssl/seed.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                          const unsigned char *iv, int enc);

diff --git a/crypto/evp/e_sm4.c b/crypto/evp/e_sm4.c
index 02292fa605b553a13e18f180eeefd10361c765be..4653c10a14bf4e687a22d9c7e6310058c8d56774 100644 (file)
--- a/crypto/evp/e_sm4.c
+++ b/crypto/evp/e_sm4.c
@@ -13,8 +13,8 @@
 #ifndef OPENSSL_NO_SM4
 # include <openssl/evp.h>
 # include <openssl/modes.h>
-# include "internal/sm4.h"
-# include "internal/evp_int.h"
+# include "crypto/sm4.h"
+# include "crypto/evp.h"
 
 typedef struct {
     SM4_KEY ks;

diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c
index 285001c3736ec8c8f2c82e84b591a6a91c6b46b8..d402606b6d7f0ec5aa36ae0444e0f0f4db0309cc 100644 (file)
--- a/crypto/evp/e_xcbc_d.c
+++ b/crypto/evp/e_xcbc_d.c
@@ -14,7 +14,7 @@
 
 # include <openssl/evp.h>
 # include <openssl/objects.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include <openssl/des.h>
 
 static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index ab80267c1eb08803b5a1873cbdae80bdda9c2935..b8c82cfafd0d2c52ea27140052ea566e825ca6e7 100644 (file)
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -11,7 +11,7 @@
 #include <limits.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "evp_locl.h"
 
 static unsigned char conv_ascii2bin(unsigned char a,

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 2685436d36bfbb28a8f269e615f7f9bf5d5b0682..35bf42994d5aa9a82277e5ef23648d2cf300dbbd 100644 (file)
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -17,7 +17,7 @@
 #include <openssl/engine.h>
 #include <openssl/params.h>
 #include <openssl/core_names.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider.h"
 #include "evp_locl.h"
 

diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c
index cd2bacea5dc9dba1d780fd88d2abd5f5c7222769..67ba201da3e2e48039e8ea58e1a7038cb335a59d 100644 (file)
--- a/crypto/evp/evp_fetch.c
+++ b/crypto/evp/evp_fetch.c
@@ -17,7 +17,7 @@
 #include "internal/core.h"
 #include "internal/provider.h"
 #include "internal/namemap.h"
-#include "internal/evp_int.h"    /* evp_locl.h needs it */
+#include "crypto/evp.h"    /* evp_locl.h needs it */
 #include "evp_locl.h"
 
 static void default_method_store_free(void *vstore)

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 4ec880fd1382ea5488712e605a4e0e4bca1de9f1..0789aa8970447d59bacfce81ef7b6472059bc04e 100644 (file)
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -14,7 +14,7 @@
 #include <openssl/params.h>
 #include <openssl/core_names.h>
 #include <openssl/dh.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider.h"
 #include "evp_locl.h"
 

diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index 8162a5e436639d96015a58e1f369cff1b863cbf6..2d87905bf5605b7df01627a0c2d89cf262d87498 100644 (file)
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -12,7 +12,7 @@
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
 #include <openssl/x509.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "evp_locl.h"
 
 /* Password based encryption (PBE) functions */

diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index bffe2b3830fa679b091f623c69efa1a46ddd21b5..a11b856c03f542cd95a1c204ec17ba9da635b4c7 100644 (file)
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -12,9 +12,9 @@
 #include "internal/cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/rand.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
-#include "internal/x509_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
+#include "crypto/x509.h"
 
 /* Extract a private key from a PKCS8 structure */
 

diff --git a/crypto/evp/evp_utils.c b/crypto/evp/evp_utils.c
index 3da208a69f1d4614fea4f39d87811b9072ae92a7..b3571bea9fa5a424e3171e9e94ef9f4adbf9b872 100644 (file)
--- a/crypto/evp/evp_utils.c
+++ b/crypto/evp/evp_utils.c
@@ -14,7 +14,7 @@
 #include <openssl/err.h>
 #include <openssl/asn1.h>        /* evp_locl.h needs it */
 #include <openssl/safestack.h>   /* evp_locl.h needs it */
-#include "internal/evp_int.h"    /* evp_locl.h needs it */
+#include "crypto/evp.h"    /* evp_locl.h needs it */
 #include "evp_locl.h"
 
 /*

diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c
index 53a25a424e2fcf1ccc45547a82127a5070d7134e..3caf03a0ced32fa452ed5186822a2103a0803fbf 100644 (file)
--- a/crypto/evp/exchange.c
+++ b/crypto/evp/exchange.c
@@ -11,7 +11,7 @@
 #include <openssl/evp.h>
 #include <openssl/err.h>
 #include "internal/refcount.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider.h"
 #include "internal/numbers.h"   /* includes SIZE_MAX */
 #include "evp_locl.h"

diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c
index 5c57cc360e908777ca3957d4de515263897c08b1..b2b28dece2618aad8008d7c132b53968387050de 100644 (file)
--- a/crypto/evp/kdf_lib.c
+++ b/crypto/evp/kdf_lib.c
@@ -17,8 +17,8 @@
 #include <openssl/kdf.h>
 #include <openssl/core.h>
 #include <openssl/core_names.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 #include "internal/numbers.h"
 #include "internal/provider.h"
 #include "evp_locl.h"

diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c
index 7bcdcc7df389d4bc852ada0b98b83ada30f5083f..c2b6cea6736c81f0154806d364510ba7d72b2345 100644 (file)
--- a/crypto/evp/kdf_meth.c
+++ b/crypto/evp/kdf_meth.c
@@ -12,7 +12,7 @@
 #include <openssl/core.h>
 #include <openssl/core_numbers.h>
 #include <openssl/kdf.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider.h"
 #include "evp_locl.h"
 

diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c
index 8ee28fbe60aae21b7d8134a95531ab96aa1df3b7..1a4e9a297c04ec0649d2017141f3988a6056ec25 100644 (file)
--- a/crypto/evp/keymgmt_lib.c
+++ b/crypto/evp/keymgmt_lib.c
@@ -9,8 +9,8 @@
 
 #include "internal/cryptlib.h"
 #include "internal/nelem.h"
-#include "internal/evp_int.h"
-#include "internal/asn1_int.h"
+#include "crypto/evp.h"
+#include "crypto/asn1.h"
 #include "internal/provider.h"
 #include "evp_locl.h"
 

diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c
index c170bd676b834cff973c13986630861f0a56fb89..1dbc9df550a68035331886b3d98371794a439bb1 100644 (file)
--- a/crypto/evp/keymgmt_meth.c
+++ b/crypto/evp/keymgmt_meth.c
@@ -13,7 +13,7 @@
 #include <openssl/err.h>
 #include "internal/provider.h"
 #include "internal/refcount.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "evp_locl.h"
 
 

diff --git a/crypto/evp/m_md2.c b/crypto/evp/m_md2.c
index d7738472c89c971d6c21fd7ad71bca0c8fda6e80..a8a0af96aabedc9052f49d999582400176b00f2d 100644 (file)
--- a/crypto/evp/m_md2.c
+++ b/crypto/evp/m_md2.c
@@ -18,7 +18,7 @@
 # include <openssl/md2.h>
 # include <openssl/rsa.h>
 
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/evp/m_md4.c b/crypto/evp/m_md4.c
index 1dc3cdee64503015727f17294a2a4e950f25631f..9638213de754fb5d2784ac6ec4241c3d2f536f1b 100644 (file)
--- a/crypto/evp/m_md4.c
+++ b/crypto/evp/m_md4.c
@@ -17,7 +17,7 @@
 # include <openssl/x509.h>
 # include <openssl/md4.h>
 # include <openssl/rsa.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/evp/m_md5.c b/crypto/evp/m_md5.c
index 539ab76448c298ede90baf34e319e1b26359090b..d817982488b368a17cd3b0793d3130d671c6045f 100644 (file)
--- a/crypto/evp/m_md5.c
+++ b/crypto/evp/m_md5.c
@@ -17,7 +17,7 @@
 # include <openssl/x509.h>
 # include <openssl/md5.h>
 # include <openssl/rsa.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/evp/m_md5_sha1.c b/crypto/evp/m_md5_sha1.c
index af8ae31ec15515f415137404be6dbe0cce2f31df..e9ed800145bec2abfa3fb2b09b07f64938b20134 100644 (file)
--- a/crypto/evp/m_md5_sha1.c
+++ b/crypto/evp/m_md5_sha1.c
@@ -12,7 +12,7 @@
 # include <string.h>
 # include <openssl/evp.h>
 # include <openssl/obj_mac.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include "internal/md5_sha1.h"
 
 static int init(EVP_MD_CTX *ctx)

diff --git a/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c
index 145d9550f2de2a73f39688dd3959b34cbbc7b1b1..fdc689e1155aa2bd61e6f5a54dfb80d723e06e67 100644 (file)
--- a/crypto/evp/m_mdc2.c
+++ b/crypto/evp/m_mdc2.c
@@ -17,7 +17,7 @@
 # include <openssl/x509.h>
 # include <openssl/mdc2.h>
 # include <openssl/rsa.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/evp/m_null.c b/crypto/evp/m_null.c
index 5dcb250fe884f06696391a013dae7c0e5009576e..51c93c0dc40d8f08657d5b77b604a37d7cefdefb 100644 (file)
--- a/crypto/evp/m_null.c
+++ b/crypto/evp/m_null.c
@@ -12,7 +12,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/evp/m_ripemd.c b/crypto/evp/m_ripemd.c
index d821a58493a8d711a5bcbb9a6d06b75d0b970d74..4e05d18ba63cee01086b812b93df6f2c0854abca 100644 (file)
--- a/crypto/evp/m_ripemd.c
+++ b/crypto/evp/m_ripemd.c
@@ -17,7 +17,7 @@
 # include <openssl/objects.h>
 # include <openssl/x509.h>
 # include <openssl/rsa.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/evp/m_sha1.c b/crypto/evp/m_sha1.c
index 1258ea03bcaf532453bd79b8e86706297f8e5e03..421d302582c5cbfe4fc359d35808bf07c9189173 100644 (file)
--- a/crypto/evp/m_sha1.c
+++ b/crypto/evp/m_sha1.c
@@ -14,8 +14,8 @@
 #include <openssl/objects.h>
 #include <openssl/sha.h>
 #include <openssl/rsa.h>
-#include "internal/evp_int.h"
-#include "internal/sha.h"
+#include "crypto/evp.h"
+#include "crypto/sha.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/evp/m_sha3.c b/crypto/evp/m_sha3.c
index 1e71eed9487b63e51ad6a5333c9f1cec77949389..727bb2731ae27522b59280b0a4140628388501ee 100644 (file)
--- a/crypto/evp/m_sha3.c
+++ b/crypto/evp/m_sha3.c
@@ -12,7 +12,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/objects.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/sha3.h"
 #include "evp_locl.h"
 

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 987b35b7fe912fb8aa5783e134770286c5623d8b..53074334bf608c392a2abeb5f5aca026f45ebec5 100644 (file)
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -12,7 +12,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "evp_locl.h"
 
 static int update(EVP_MD_CTX *ctx, const void *data, size_t datalen)

diff --git a/crypto/evp/m_wp.c b/crypto/evp/m_wp.c
index 10c07ff55111d22ee6dd4c157cfbd22374decac4..ee69df56582f26a667fc1cacfc7ca6696d178174 100644 (file)
--- a/crypto/evp/m_wp.c
+++ b/crypto/evp/m_wp.c
@@ -16,7 +16,7 @@
 # include <openssl/objects.h>
 # include <openssl/x509.h>
 # include <openssl/whrlpool.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/evp/mac_lib.c b/crypto/evp/mac_lib.c
index cf704ba4fcc5b453543109ee48400fd26e2f10dc..c38c453c733eacfd8956d6ffc47e7f6421a73e74 100644 (file)
--- a/crypto/evp/mac_lib.c
+++ b/crypto/evp/mac_lib.c
@@ -15,7 +15,7 @@
 #include <openssl/core_names.h>
 #include <openssl/ossl_typ.h>
 #include "internal/nelem.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider.h"
 #include "evp_locl.h"
 

diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c
index 8c47a6c6e8a97765f193daccb4d8aeb639e41e35..9e67d9085b771f6497610fc52ab12c5283c85f38 100644 (file)
--- a/crypto/evp/mac_meth.c
+++ b/crypto/evp/mac_meth.c
@@ -2,7 +2,7 @@
 #include <openssl/err.h>
 #include <openssl/core.h>
 #include <openssl/core_numbers.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider.h"
 #include "evp_locl.h"
 

diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index 7c2f4f061c61f7ce6c06ca7b27ebff2ec18e5040..901899ad3b4dfbee41d04f349e535a39bf4f5001 100644 (file)
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -11,9 +11,9 @@
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/kdf.h>
-#include "internal/objects.h"
+#include "crypto/objects.h"
 #include <openssl/x509.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 int EVP_add_cipher(const EVP_CIPHER *c)
 {

diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
index 96a72730f31de23792dca3110b33bc275ceddc4a..27fb9594284a6ae77b7df29d2c2799fa4d0b5659 100644 (file)
--- a/crypto/evp/p5_crpt2.c
+++ b/crypto/evp/p5_crpt2.c
@@ -16,7 +16,7 @@
 #include <openssl/hmac.h>
 #include <openssl/trace.h>
 #include <openssl/core_names.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "evp_locl.h"
 
 int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 83cf12fff38f9e9f50d4ab5ebe76baef6a6399d1..e2c6eaa17fbba453b6f050895dbc8cbdeeed7673 100644 (file)
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -23,8 +23,8 @@
 #include <openssl/params.h>
 #include <openssl/core_names.h>
 
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 #include "internal/provider.h"
 
 static void EVP_PKEY_free_it(EVP_PKEY *x);

diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
index c1b0d3acda0e3f843ad7e30988bca0d345fb34f3..44a69083b21920b4aab73990a0f5c09a43bcddc6 100644 (file)
--- a/crypto/evp/p_sign.c
+++ b/crypto/evp/p_sign.c
@@ -12,7 +12,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
                   unsigned int *siglen, EVP_PKEY *pkey)

diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c
index 956b089572db3595ef61b212ccd58b23ee517520..fe4b7b568d36c292cc808bc6be04600372a28652 100644 (file)
--- a/crypto/evp/p_verify.c
+++ b/crypto/evp/p_verify.c
@@ -12,7 +12,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
                     unsigned int siglen, EVP_PKEY *pkey)

diff --git a/crypto/evp/pkey_kdf.c b/crypto/evp/pkey_kdf.c
index 98bf5c6660101d622774a48ba39c8eb61bf19288..d57ff6fd472bc46575c1ad92a9ef4a54114ab295 100644 (file)
--- a/crypto/evp/pkey_kdf.c
+++ b/crypto/evp/pkey_kdf.c
@@ -17,7 +17,7 @@
 #include <openssl/core_names.h>
 #include <openssl/params.h>
 #include "internal/numbers.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 #define MAX_PARAM   20
 

diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c
index 9853e09cf1c388bac1824b4ee8ec186f89ccd83c..2c60afe55fc26c3feab3334ba725bb4a2dcb3770 100644 (file)
--- a/crypto/evp/pkey_mac.c
+++ b/crypto/evp/pkey_mac.c
@@ -13,7 +13,7 @@
 #include <openssl/engine.h>
 #include <openssl/params.h>
 #include <openssl/core_names.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "evp_locl.h"
 
 /* MAC PKEY context structure */

diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c
index 34db48639aed482e8d8c958d975ef78f0dad0dd6..240738d3ee481dbf80eceedba1c970718572d7c6 100644 (file)
--- a/crypto/evp/pmeth_fn.c
+++ b/crypto/evp/pmeth_fn.c
@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include "internal/cryptlib.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider.h"
 #include "evp_locl.h"
 

diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c
index c81f5a1a3f9e060e94456597d6eed6db839abfc8..2564bbd03e56ada2fdddf0403ae715d1a98f6b33 100644 (file)
--- a/crypto/evp/pmeth_gn.c
+++ b/crypto/evp/pmeth_gn.c
@@ -12,9 +12,9 @@
 #include "internal/cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/evp.h>
-#include "internal/bn_int.h"
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/bn.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
 {

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 8b386cf19fe1c218219d4f3898079fb7617c6666..5f0a93ed9a4700f1eab3593a9ed59515d939342a 100644 (file)
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -16,8 +16,8 @@
 #include <openssl/core_names.h>
 #include <openssl/dh.h>
 #include "internal/cryptlib.h"
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 #include "internal/numbers.h"
 #include "internal/provider.h"
 #include "evp_locl.h"

diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index cd8e695855f5bc7d41a67963a52449398de6f1ce..9f08606d2ff9de4641e1c612cc170cecb7f9a7d2 100644 (file)
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 #include "internal/thread_once.h"
 
 int do_ex_data_init(OPENSSL_CTX *ctx)

diff --git a/crypto/hmac/hm_ameth.c b/crypto/hmac/hm_ameth.c
index f0a5bc9a01d2a2d9b142b21ddd6e082f6ff364de..9ecb78610606a49dac50ffa41881425920f5727f 100644 (file)
--- a/crypto/hmac/hm_ameth.c
+++ b/crypto/hmac/hm_ameth.c
@@ -10,8 +10,8 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 /*
  * HMAC "ASN1" method. This is just here to indicate the maximum HMAC output

diff --git a/crypto/include/internal/store.h b/crypto/include/internal/store.h
deleted file mode 100644 (file)
index b2e9dbf..0000000
--- a/crypto/include/internal/store.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-void ossl_store_cleanup_int(void);

diff --git a/crypto/info.c b/crypto/info.c
index 355827c4518ae437de9251ec725ff36674f58199..613ddc7d8c3bee544aab6ddb33a878f19c316e51 100644 (file)
--- a/crypto/info.c
+++ b/crypto/info.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/crypto.h>
-#include "internal/dso_conf.h"
+#include "crypto/dso_conf.h"
 #include "internal/thread_once.h"
 #include "internal/cryptlib.h"
 #include "e_os.h"

diff --git a/crypto/init.c b/crypto/init.c
index 32162c38745923fd5085519dc0b498ce061d6b9a..4aa3fc83da91495abd4d80082c5afbfd80adcdbe 100644 (file)
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -8,25 +8,25 @@
  */
 
 #include "e_os.h"
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 #include <openssl/err.h>
-#include "internal/rand_int.h"
+#include "crypto/rand.h"
 #include "internal/bio.h"
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/conf.h"
-#include "internal/async.h"
-#include "internal/engine.h"
+#include "crypto/async.h"
+#include "crypto/engine.h"
 #include "internal/comp.h"
 #include "internal/err.h"
-#include "internal/err_int.h"
-#include "internal/objects.h"
+#include "crypto/err.h"
+#include "crypto/objects.h"
 #include <stdlib.h>
 #include <assert.h>
 #include "internal/thread_once.h"
-#include "internal/dso_conf.h"
+#include "crypto/dso_conf.h"
 #include "internal/dso.h"
-#include "internal/store.h"
+#include "crypto/store.h"
 #include <openssl/cmp_util.h> /* for OSSL_CMP_log_close() */
 #include <openssl/trace.h>
 

diff --git a/crypto/initthread.c b/crypto/initthread.c
index 7de8a3694519a03338a11ff537d08b76adb0db70..930b94a817d877d860e692dcf463067fccb6cfc2 100644 (file)
--- a/crypto/initthread.c
+++ b/crypto/initthread.c
@@ -9,7 +9,7 @@
 
 #include <openssl/crypto.h>
 #include <openssl/core_numbers.h>
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 #include "internal/providercommon.h"
 #include "internal/thread_once.h"
 

diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index f91a56a70a6b032a3c0c0de13a9a9d1a95744b9e..65445895f5eed159d31c7ba1c05b8ae4a7df040c 100644 (file)
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -13,8 +13,8 @@
 #include <openssl/crypto.h>
 #include <openssl/lhash.h>
 #include <openssl/err.h>
-#include "internal/ctype.h"
-#include "internal/lhash.h"
+#include "crypto/ctype.h"
+#include "crypto/lhash.h"
 #include "lhash_lcl.h"
 
 /*

diff --git a/crypto/md4/md4_locl.h b/crypto/md4/md4_locl.h
index 74e53507a644d25ce1827f8848b7845aee71600f..58c23e1ad6cbb850025c11a0d6d597ac49c9b44d 100644 (file)
--- a/crypto/md4/md4_locl.h
+++ b/crypto/md4/md4_locl.h
@@ -31,7 +31,7 @@ void md4_block_data_order(MD4_CTX *c, const void *p, size_t num);
         } while (0)
 #define HASH_BLOCK_DATA_ORDER   md4_block_data_order
 
-#include "internal/md32_common.h"
+#include "crypto/md32_common.h"
 
 /*-
 #define F(x,y,z)        (((x) & (y))  |  ((~(x)) & (z)))

diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_locl.h
index 73ba4d6ccd923a26e089ccffdeb032ab579dda05..8571e4848e91054643877df9c863005693e3010f 100644 (file)
--- a/crypto/md5/md5_locl.h
+++ b/crypto/md5/md5_locl.h
@@ -42,7 +42,7 @@ void md5_block_data_order(MD5_CTX *c, const void *p, size_t num);
         } while (0)
 #define HASH_BLOCK_DATA_ORDER   md5_block_data_order
 
-#include "internal/md32_common.h"
+#include "crypto/md32_common.h"
 
 /*-
 #define F(x,y,z)        (((x) & (y))  |  ((~(x)) & (z)))

diff --git a/crypto/mem.c b/crypto/mem.c
index 562d6b51e2b34511111517036da876ca2545c5b9..d3cac29b21f3ea4e81b7e7ab23f5ada93f0dddb5 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -9,7 +9,7 @@
 
 #include "e_os.h"
 #include "internal/cryptlib.h"
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>

diff --git a/crypto/modes/cbc128.c b/crypto/modes/cbc128.c
index eb8e06c11de1c74be1746160a4c990d590a613f2..eec44bd91a5b1018becd151664a1538a0f4c88d6 100644 (file)
--- a/crypto/modes/cbc128.c
+++ b/crypto/modes/cbc128.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include <openssl/crypto.h>
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 
 #if !defined(STRICT_ALIGNMENT) && !defined(PEDANTIC)
 # define STRICT_ALIGNMENT 0

diff --git a/crypto/modes/ccm128.c b/crypto/modes/ccm128.c
index e97158a11962f5a192fb79323cd2020076cf60d1..1ffd6df46f742f82bec8425187c24050836f653b 100644 (file)
--- a/crypto/modes/ccm128.c
+++ b/crypto/modes/ccm128.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include <openssl/crypto.h>
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 
 /*
  * First you setup M and L parameters and pass the key schedule. This is

diff --git a/crypto/modes/cfb128.c b/crypto/modes/cfb128.c
index 39644a237ee034da7c426368b8a10709adfe055e..e9ce4df3a50486c70134dd8b8b81e5eba132dd73 100644 (file)
--- a/crypto/modes/cfb128.c
+++ b/crypto/modes/cfb128.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include <openssl/crypto.h>
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 
 /*
  * The input and output encrypted as though 128bit cfb mode is being used.

diff --git a/crypto/modes/ctr128.c b/crypto/modes/ctr128.c
index 1755b8500efb53e98947b46af6c96021739ded09..ff7499b34a653ef5a84d80c6fea092b372b327e8 100644 (file)
--- a/crypto/modes/ctr128.c
+++ b/crypto/modes/ctr128.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include <openssl/crypto.h>
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 
 /*
  * NOTE: the IV/counter CTR mode is big-endian.  The code itself is

diff --git a/crypto/modes/cts128.c b/crypto/modes/cts128.c
index b4f2f37775cb49150df409aa5d02e5e16e804201..5600d9c54b1b31f565bba080ff54a118d996cddd 100644 (file)
--- a/crypto/modes/cts128.c
+++ b/crypto/modes/cts128.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include <openssl/crypto.h>
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 
 /*
  * Trouble with Ciphertext Stealing, CTS, mode is that there is no

diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index f37653be6727bf34eaffe4544d96c4875edf810c..d2f2da61b3b4b2b3e69dbfe5ab42f03dcd19b057 100644 (file)
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 
 #if defined(BSWAP4) && defined(STRICT_ALIGNMENT)
 /* redefine, because alignment is ensured */

diff --git a/crypto/modes/ocb128.c b/crypto/modes/ocb128.c
index 9e7af6074ff6497e10ef7d21fae9d3299833e350..7886700533102a54a1424d744e1f58b88c78fc27 100644 (file)
--- a/crypto/modes/ocb128.c
+++ b/crypto/modes/ocb128.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <openssl/crypto.h>
 #include <openssl/err.h>
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 
 #ifndef OPENSSL_NO_OCB
 

diff --git a/crypto/modes/ofb128.c b/crypto/modes/ofb128.c
index b894cbb5c18e431f56103c4c08615977d133d527..2eca09bc1b03f928813729e44c7ede4a1d623bc9 100644 (file)
--- a/crypto/modes/ofb128.c
+++ b/crypto/modes/ofb128.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include <openssl/crypto.h>
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 
 /*
  * The input and output encrypted as though 128bit ofb mode is being used.

diff --git a/crypto/modes/siv128.c b/crypto/modes/siv128.c
index 1d91ee78ee08b0098277bf0a45b960fb017fd02a..712141032db578461b321674ccd92449f760a899 100644 (file)
--- a/crypto/modes/siv128.c
+++ b/crypto/modes/siv128.c
@@ -13,8 +13,8 @@
 #include <openssl/evp.h>
 #include <openssl/core_names.h>
 #include <openssl/params.h>
-#include "internal/modes_int.h"
-#include "internal/siv_int.h"
+#include "crypto/modes.h"
+#include "crypto/siv.h"
 
 #ifndef OPENSSL_NO_SIV
 

diff --git a/crypto/modes/xts128.c b/crypto/modes/xts128.c
index 03b83aa0ed9508bcd5a298778c3a7cca448e7e0f..9d9b65caa544b2b539afa5fba9da8ff373423aeb 100644 (file)
--- a/crypto/modes/xts128.c
+++ b/crypto/modes/xts128.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include <openssl/crypto.h>
-#include "internal/modes_int.h"
+#include "crypto/modes.h"
 
 int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
                           const unsigned char iv[16],

diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index 3ad905c939fd1a675ef9fb62f470b64fbee9e661..531f5247581689ad67b20bd4b7cacccb72c5c18a 100644 (file)
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -17,7 +17,7 @@
 #include <openssl/safestack.h>
 #include <openssl/e_os2.h>
 #include "internal/thread_once.h"
-#include "internal/lhash.h"
+#include "crypto/lhash.h"
 #include "obj_lcl.h"
 #include "e_os.h"
 

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index c4155a3dfc79b3e6abc13b4cce38381de6d091c8..1c3fe9eb5d4a52dbeb64a8a6e8ee800c74ad0f84 100644 (file)
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -8,14 +8,14 @@
  */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include <limits.h>
 #include "internal/cryptlib.h"
 #include <openssl/lhash.h>
 #include <openssl/asn1.h>
-#include "internal/objects.h"
+#include "crypto/objects.h"
 #include <openssl/bn.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 #include "obj_lcl.h"
 
 /* obj_dat.h is generated from objects.h by obj_dat.pl */

diff --git a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
index 5dfe7c5b95185765745b27f00f756ed8e7e4c8c5..08266141e23b06bc5c6dad3e6a77b4361418bee3 100644 (file)
--- a/crypto/objects/obj_lib.c
+++ b/crypto/objects/obj_lib.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 
 ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
 {

diff --git a/crypto/ocsp/ocsp_ht.c b/crypto/ocsp/ocsp_ht.c
index 17f792c2b11483ea295ec5f98ba4866a07583b21..c75bfdb403672ec54e0ce41660fda9f293865aee 100644 (file)
--- a/crypto/ocsp/ocsp_ht.c
+++ b/crypto/ocsp/ocsp_ht.c
@@ -10,7 +10,7 @@
 #include "e_os.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include <string.h>
 #include <openssl/asn1.h>
 #include <openssl/ocsp.h>

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index b33ab16266f75ad6f617f4e4cc062392ab2bf424..eb07c884e72aadd62271ada1ba3413cc5f163151 100644 (file)
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include <string.h>
 #include "internal/cryptlib.h"
 #include <openssl/buffer.h>
@@ -18,7 +18,7 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/pkcs12.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 #include <openssl/des.h>
 #include <openssl/engine.h>
 

diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index ffcec127711a722d41f7c8358243d8195f0ba179..54596e4093436b2cba2d176c19c15204b29b4e9e 100644 (file)
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -17,8 +17,8 @@
 #include <openssl/pem.h>
 #include <openssl/engine.h>
 #include <openssl/dh.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 int pem_check_suffix(const char *pem_str, const char *suffix);
 

diff --git a/crypto/pkcs12/p12_p8e.c b/crypto/pkcs12/p12_p8e.c
index 3b7a8436ed3cd8169b703ecc067aa0916f8ffb16..b9b34c249581226cf20ee5d1fc5909c1a983dafc 100644 (file)
--- a/crypto/pkcs12/p12_p8e.c
+++ b/crypto/pkcs12/p12_p8e.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/pkcs12.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
                         const char *pass, int passlen,

diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 181fb5a5a19a0edd6096a123026cfc60fc90b5e1..815ac8683af9108e16f4521d066a54dcdcff5bef 100644 (file)
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -11,8 +11,8 @@
 #include "internal/cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
 {

diff --git a/crypto/poly1305/poly1305.c b/crypto/poly1305/poly1305.c
index b83a4fc1cacec7788318214e427c13dce386ccb4..31bca781caf1ae503923992e97c3cf5e010b24dd 100644 (file)
--- a/crypto/poly1305/poly1305.c
+++ b/crypto/poly1305/poly1305.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <openssl/crypto.h>
 
-#include "internal/poly1305.h"
+#include "crypto/poly1305.h"
 #include "poly1305_local.h"
 
 size_t Poly1305_ctx_size(void)

diff --git a/crypto/poly1305/poly1305_ameth.c b/crypto/poly1305/poly1305_ameth.c
index 73903635eacb5bbb8d419d520bf9de9dd144d403..d69607c7bb6c1ed9a9cd8b2c7604ec94a41ee5e7 100644 (file)
--- a/crypto/poly1305/poly1305_ameth.c
+++ b/crypto/poly1305/poly1305_ameth.c
@@ -10,10 +10,10 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
-#include "internal/asn1_int.h"
-#include "internal/poly1305.h"
+#include "crypto/asn1.h"
+#include "crypto/poly1305.h"
 #include "poly1305_local.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 /*
  * POLY1305 "ASN1" method. This is just here to indicate the maximum

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index e540db14417134f24fe70dfeb14329868dd3fa8b..5b3ee754b293841ec6542f2d4a34dc3c29ee8113 100644 (file)
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -29,7 +29,7 @@
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
 #include <internal/cryptlib.h>
-#include <internal/chacha.h>
+#include <crypto/chacha.h>
 #include "bn/bn_lcl.h"
 
 #include "ppc_arch.h"

diff --git a/crypto/property/property.c b/crypto/property/property.c
index e94c5de87dc53e608d0e0e2c9e2b27b50500d408..4f67207a791bdbf47666c223319ed2f88724613a 100644 (file)
--- a/crypto/property/property.c
+++ b/crypto/property/property.c
@@ -13,12 +13,12 @@
 #include <stdarg.h>
 #include <openssl/crypto.h>
 #include "internal/property.h"
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include <openssl/lhash.h>
 #include <openssl/rand.h>
 #include "internal/thread_once.h"
-#include "internal/lhash.h"
-#include "internal/sparse_array.h"
+#include "crypto/lhash.h"
+#include "crypto/sparse_array.h"
 #include "property_lcl.h"
 
 /* The number of elements in the query cache before we initiate a flush */

diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c
index c17b0ddefc33639daaa39aad46c87180ba06ec45..c9fb7602fd498155ed7bf6689d986fcc40a2f66d 100644 (file)
--- a/crypto/property/property_parse.c
+++ b/crypto/property/property_parse.c
@@ -14,7 +14,7 @@
 #include <openssl/err.h>
 #include "internal/propertyerr.h"
 #include "internal/property.h"
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/nelem.h"
 #include "property_lcl.h"
 #include "e_os.h"

diff --git a/crypto/property/property_string.c b/crypto/property/property_string.c
index dcf5dcc2a44d952821364ba4fa809d20b7fc206b..d037f6a311d82c66088abc50073b9336a5d26d0c 100644 (file)
--- a/crypto/property/property_string.c
+++ b/crypto/property/property_string.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <openssl/crypto.h>
 #include <openssl/lhash.h>
-#include "internal/lhash.h"
+#include "crypto/lhash.h"
 #include "property_lcl.h"
 
 /*

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index f8a002aa16fc1fb9bf6ff80da8d667647b066a34..4f3123d672ccaed218c8fa2c69d0de37de6f202e 100644 (file)
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -12,7 +12,7 @@
 #include <openssl/core_names.h>
 #include <openssl/params.h>
 #include <openssl/opensslv.h>
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 #include "internal/nelem.h"
 #include "internal/thread_once.h"
 #include "internal/provider.h"

diff --git a/crypto/rand/drbg_lib.c b/crypto/rand/drbg_lib.c
index bce2f74e9a3971821beb2d7a1b818401db271b3d..56525265684d5625a4c73d18b96a933d28368064 100644 (file)
--- 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 0ba0986b96ccc95e08fdae912454257e13accfe7..29af636f5375f7dbabbb4af2c65cea89628155b7 100644 (file)
--- 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 0c92d75666fc20a6bc195b1a4b27c99a2f36f804..0f8a81f311045c39868915fd243642059230d1e6 100644 (file)
--- 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 b70b60a6508ddcc4c4c893b3420077267af4390e..7f4f1b7f9086eb97884a3909fa2d88ac7d20af10 100644 (file)
--- 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 8641badbff81ee6592afed516f03fdee9a098d1a..c0f995a166054d09d1a68230abaa0fbcbd299e7b 100644 (file)
--- 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 3f13529d0f63e276a6c9f95498b4ee2f2b445564..5fb225915884491eca8902cdc09b37340a5dfdbd 100644 (file)
--- 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 81774e097d9938615245dbc0e62baa5bd2889f5d..a32cf45bb9458a7d2edfd28e213e8ef7df9f892c 100644 (file)
--- 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 38852dc7a080c4809aafc016f78ec96cdcf25a0f..ea0d53b8adf1731acba3e4ea1467abc592797a19 100644 (file)
--- 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

diff --git a/crypto/ripemd/rmd_locl.h b/crypto/ripemd/rmd_locl.h
index 361e21b940276cfdd88d858adc9caa4c2198e938..bb4feb969a3e0fe2ca9bcbf25fcb8588f922487d 100644 (file)
--- a/crypto/ripemd/rmd_locl.h
+++ b/crypto/ripemd/rmd_locl.h
@@ -42,7 +42,7 @@ void ripemd160_block_data_order(RIPEMD160_CTX *c, const void *p, size_t num);
         } while (0)
 #define HASH_BLOCK_DATA_ORDER   ripemd160_block_data_order
 
-#include "internal/md32_common.h"
+#include "crypto/md32_common.h"
 
 /*
  * Transformed F2 and F4 are courtesy of Wei Dai

diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index bf56039b468d4dcfd05c282cefc00b9c5e9581c6..7b1c955870e49b0984f33ce0bcb2d03fd62f62c8 100644 (file)
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -13,8 +13,8 @@
 #include <openssl/x509.h>
 #include <openssl/bn.h>
 #include <openssl/cms.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 #include "rsa_locl.h"
 
 #ifndef OPENSSL_NO_CMS

diff --git a/crypto/rsa/rsa_crpt.c b/crypto/rsa/rsa_crpt.c
index c35ad9f54581b67e8e4a5cab345694642e0e6abb..4933982cddd788e5c87c475490a34286eed6f5b5 100644 (file)
--- a/crypto/rsa/rsa_crpt.c
+++ b/crypto/rsa/rsa_crpt.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include <openssl/rand.h>
 #include "rsa_locl.h"
 

diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index c6e570089fd1b722bf964f67f4d6eda241172dc6..83e6a35e42a6ed1f90f2a7494708c2a4a4072fa3 100644 (file)
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -11,10 +11,10 @@
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include "internal/refcount.h"
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include <openssl/engine.h>
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "rsa_locl.h"
 
 RSA *RSA_new(void)

diff --git a/crypto/rsa/rsa_ossl.c b/crypto/rsa/rsa_ossl.c
index 5d5efdbd69db4ca999308d4a42e402035e4f3c48..54171de2f30e954fed7ee8f0e83fd90f39c7d026 100644 (file)
--- a/crypto/rsa/rsa_ossl.c
+++ b/crypto/rsa/rsa_ossl.c
@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include "rsa_locl.h"
 #include "internal/constant_time_locl.h"
 

diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index 993c2cea4b65054250fb4d3f7e9fbe0af06e597c..dfbf00cb55fc0b3cbc602d38937bd9c21727028b 100644 (file)
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c
@@ -18,7 +18,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509v3.h>
 #include <openssl/cms.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "rsa_locl.h"
 
 /* RSA pkey context structure */

diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index 73811e7bfc3e51cebae69bb2c0c3d3306212aebe..07b18ed8bbe991f5d9486986ffcda4fd5828f433 100644 (file)
--- a/crypto/rsa/rsa_sign.c
+++ b/crypto/rsa/rsa_sign.c
@@ -13,7 +13,7 @@
 #include <openssl/rsa.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include "rsa_locl.h"
 
 /* Size of an SSL signature: MD5+SHA1 */

diff --git a/crypto/rsa/rsa_sp800_56b_check.c b/crypto/rsa/rsa_sp800_56b_check.c
index 10e264e5914b2a2cc30e5c5f4e27f8b1642e9abd..36d946de4e7116a50c50a7c3261c817124a1974d 100644 (file)
--- a/crypto/rsa/rsa_sp800_56b_check.c
+++ b/crypto/rsa/rsa_sp800_56b_check.c
@@ -10,7 +10,7 @@
 
 #include <openssl/err.h>
 #include <openssl/bn.h>
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include "rsa_locl.h"
 
 /*

diff --git a/crypto/rsa/rsa_sp800_56b_gen.c b/crypto/rsa/rsa_sp800_56b_gen.c
index 50c5bf14bea20aa65733add915e740303d565660..73c9c1d150120cd38df45668bb8f06f659a50022 100644 (file)
--- a/crypto/rsa/rsa_sp800_56b_gen.c
+++ b/crypto/rsa/rsa_sp800_56b_gen.c
@@ -10,7 +10,7 @@
 
 #include <openssl/err.h>
 #include <openssl/bn.h>
-#include "internal/bn_int.h"
+#include "crypto/bn.h"
 #include "rsa_locl.h"
 
 #define RSA_FIPS1864_MIN_KEYGEN_KEYSIZE 2048

diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c
index 64de9d0168547ea80e8af6044559e7988fe465cc..eb00a4a7bd3617976d1243653b0a9ea1bb4e6d78 100644 (file)
--- a/crypto/s390xcap.c
+++ b/crypto/s390xcap.c
@@ -13,7 +13,7 @@
 #include <setjmp.h>
 #include <signal.h>
 #include "internal/cryptlib.h"
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "s390x_arch.h"
 
 #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)

diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
index 4881bcb17a02c69425287d0b9af88356a5f1fafb..563ddbd1d02b3d0c7c696bc85cdade9fbeeac9f8 100644 (file)
--- a/crypto/sha/sha1dgst.c
+++ b/crypto/sha/sha1dgst.c
@@ -17,7 +17,7 @@
 /* The implementation is in ../md32_common.h */
 
 #include "sha_locl.h"
-#include "internal/sha.h"
+#include "crypto/sha.h"
 
 int sha1_ctrl(SHA_CTX *sha1, int cmd, int mslen, void *ms)
 {

diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c
index 328c0f17c376639c6e3914d708e3c1daae47160d..99833924b0684a5d23200616f585de14518e05ce 100644 (file)
--- a/crypto/sha/sha256.c
+++ b/crypto/sha/sha256.c
@@ -128,7 +128,7 @@ static
 #endif
 void sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num);
 
-#include "internal/md32_common.h"
+#include "crypto/md32_common.h"
 
 #ifndef SHA256_ASM
 static const SHA_LONG K256[64] = {

diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c
index 7b6d7496d08cb0578af8df3e1642acd0ff12ba96..03189a9d9c4420d36bdd7d31e7b5d01241adf0be 100644 (file)
--- a/crypto/sha/sha512.c
+++ b/crypto/sha/sha512.c
@@ -50,7 +50,7 @@
 #include <openssl/opensslv.h>
 
 #include "internal/cryptlib.h"
-#include "internal/sha.h"
+#include "crypto/sha.h"
 
 #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
     defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \

diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h
index d615e58491f06e29b63f7db4f5e29513e972fe30..f7c0ac707b2ceaee3ad79c76e29faecbeb9993a6 100644 (file)
--- a/crypto/sha/sha_locl.h
+++ b/crypto/sha/sha_locl.h
@@ -42,7 +42,7 @@ static void sha1_block_data_order(SHA_CTX *c, const void *p, size_t num);
 void sha1_block_data_order(SHA_CTX *c, const void *p, size_t num);
 #endif
 
-#include "internal/md32_common.h"
+#include "crypto/md32_common.h"
 
 #define INIT_DATA_h0 0x67452301UL
 #define INIT_DATA_h1 0xefcdab89UL

diff --git a/crypto/siphash/siphash.c b/crypto/siphash/siphash.c
index 9d91178455ef2089e636aebf445af3b4de16892f..03f9b4982d4b70ed809c6916e3fa80e3c931cec0 100644 (file)
--- a/crypto/siphash/siphash.c
+++ b/crypto/siphash/siphash.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <openssl/crypto.h>
 
-#include "internal/siphash.h"
+#include "crypto/siphash.h"
 #include "siphash_local.h"
 
 /* default: SipHash-2-4 */

diff --git a/crypto/siphash/siphash_ameth.c b/crypto/siphash/siphash_ameth.c
index ba7679db3515f5d69220e4c2f1075ae3f8164ed9..5aa4d88915db30946696cb605994703dc4ca28e8 100644 (file)
--- a/crypto/siphash/siphash_ameth.c
+++ b/crypto/siphash/siphash_ameth.c
@@ -10,10 +10,10 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
-#include "internal/asn1_int.h"
-#include "internal/siphash.h"
+#include "crypto/asn1.h"
+#include "crypto/siphash.h"
 #include "siphash_local.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 /*
  * SIPHASH "ASN1" method. This is just here to indicate the maximum

diff --git a/crypto/sm2/sm2_crypt.c b/crypto/sm2/sm2_crypt.c
index d5442107572ae81831c5bd5a90fc18c54fd42155..102f02651a5624558c8a3e1d3a3b34e2d5a21427 100644 (file)
--- a/crypto/sm2/sm2_crypt.c
+++ b/crypto/sm2/sm2_crypt.c
@@ -9,9 +9,9 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/sm2.h"
-#include "internal/sm2err.h"
-#include "internal/ec_int.h" /* ecdh_KDF_X9_63() */
+#include "crypto/sm2.h"
+#include "crypto/sm2err.h"
+#include "crypto/ec.h" /* ecdh_KDF_X9_63() */
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/bn.h>

diff --git a/crypto/sm2/sm2_err.c b/crypto/sm2/sm2_err.c
index d8e11790565c7c521cb1e5bae66aafbf3b822c1f..93ee9f7d7af1fa36dcfc0d0efd532c1e0aad1633 100644 (file)
--- a/crypto/sm2/sm2_err.c
+++ b/crypto/sm2/sm2_err.c
@@ -9,7 +9,7 @@
  */
 
 #include <openssl/err.h>
-#include "internal/sm2err.h"
+#include "crypto/sm2err.h"
 
 #ifndef OPENSSL_NO_ERR
 

diff --git a/crypto/sm2/sm2_pmeth.c b/crypto/sm2/sm2_pmeth.c
index 7613e333eccb20c6c0935adfcb9ec283b9bc9f11..27bec2cb06da118f6d815485e312532a4aa09ecc 100644 (file)
--- a/crypto/sm2/sm2_pmeth.c
+++ b/crypto/sm2/sm2_pmeth.c
@@ -11,9 +11,9 @@
 #include <openssl/asn1t.h>
 #include <openssl/ec.h>
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
-#include "internal/sm2.h"
-#include "internal/sm2err.h"
+#include "crypto/evp.h"
+#include "crypto/sm2.h"
+#include "crypto/sm2err.h"
 
 /* EC pkey context structure */
 

diff --git a/crypto/sm2/sm2_sign.c b/crypto/sm2/sm2_sign.c
index 38e556241c2a91536483d32f46161bef3eb7d6f8..318e9818020a2609671636e9ccaeafb4ca0513b1 100644 (file)
--- a/crypto/sm2/sm2_sign.c
+++ b/crypto/sm2/sm2_sign.c
@@ -9,9 +9,9 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/sm2.h"
-#include "internal/sm2err.h"
-#include "internal/ec_int.h" /* ec_group_do_inverse_ord() */
+#include "crypto/sm2.h"
+#include "crypto/sm2err.h"
+#include "crypto/ec.h" /* ec_group_do_inverse_ord() */
 #include "internal/numbers.h"
 #include <openssl/err.h>
 #include <openssl/evp.h>

diff --git a/crypto/sm3/m_sm3.c b/crypto/sm3/m_sm3.c
index 38ddbfe372e1df19c341b7efd3f9f0810a401a21..4bccaaf1dc823e83f47e6b9163b129871c804286 100644 (file)
--- a/crypto/sm3/m_sm3.c
+++ b/crypto/sm3/m_sm3.c
@@ -13,7 +13,7 @@
 #ifndef OPENSSL_NO_SM3
 # include <openssl/evp.h>
 # include "internal/sm3.h"
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/sm3/sm3_locl.h b/crypto/sm3/sm3_locl.h
index a5b79623e945cd76ee5b6bbd2c65c71be2b68977..07def19cf1cfc28e7574c4b3e26e8f552707b72a 100644 (file)
--- a/crypto/sm3/sm3_locl.h
+++ b/crypto/sm3/sm3_locl.h
@@ -37,7 +37,7 @@
 void sm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
 void sm3_transform(SM3_CTX *c, const unsigned char *data);
 
-#include "internal/md32_common.h"
+#include "crypto/md32_common.h"
 
 #define P0(X) (X ^ ROTATE(X, 9) ^ ROTATE(X, 17))
 #define P1(X) (X ^ ROTATE(X, 15) ^ ROTATE(X, 23))

diff --git a/crypto/sm4/sm4.c b/crypto/sm4/sm4.c
index c0454d137ad96b0d0cf508fbae512ece937f261a..a62993c272bfd6f6813db30cb0424a38a66f15e0 100644 (file)
--- a/crypto/sm4/sm4.c
+++ b/crypto/sm4/sm4.c
@@ -10,7 +10,7 @@
  */
 
 #include <openssl/e_os2.h>
-#include "internal/sm4.h"
+#include "crypto/sm4.h"
 
 static const uint8_t SM4_S[256] = {
     0xD6, 0x90, 0xE9, 0xFE, 0xCC, 0xE1, 0x3D, 0xB7, 0x16, 0xB6, 0x14, 0xC2,

diff --git a/crypto/sparse_array.c b/crypto/sparse_array.c
index a74db5d218e37181cf678726d07e3ddfe56852f0..9d444739f53ab8c4098a14fab58ee03c4007b37a 100644 (file)
--- a/crypto/sparse_array.c
+++ b/crypto/sparse_array.c
@@ -10,7 +10,7 @@
 
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
-#include "internal/sparse_array.h"
+#include "crypto/sparse_array.h"
 
 /*
  * How many bits are used to index each level in the tree structure?

diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c
index 8cba189ef3b88b4c5607ed572a5bc822197ab215..99511954d79f5af2a6a82ec92b39e54961d9f1d0 100644 (file)
--- a/crypto/srp/srp_lib.c
+++ b/crypto/srp/srp_lib.c
@@ -16,7 +16,7 @@
 # include <openssl/sha.h>
 # include <openssl/srp.h>
 # include <openssl/evp.h>
-# include "internal/bn_srp.h"
+# include "crypto/bn_srp.h"
 
 /* calculate = SHA1(PAD(x) || PAD(y)) */
 

diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 79e76c9aa90f08753b374612a731a3837acf67e4..c4dd5153f25456157dd4ff66b85a2db6686f5909 100644 (file)
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -13,7 +13,7 @@
 
 #ifndef OPENSSL_NO_SRP
 # include "internal/cryptlib.h"
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include <openssl/sha.h>
 # include <openssl/srp.h>
 # include <openssl/evp.h>

diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c
index 206af12af6a255c15ba0ce20a5088d5440ae4afc..88302e58f324b0b04125d4e7bd125584fe6d0e03 100644 (file)
--- a/crypto/store/loader_file.c
+++ b/crypto/store/loader_file.c
@@ -24,11 +24,11 @@
 #include <openssl/store.h>
 #include <openssl/ui.h>
 #include <openssl/x509.h>        /* For the PKCS8 stuff o.O */
-#include "internal/asn1_int.h"
-#include "internal/ctype.h"
+#include "crypto/asn1.h"
+#include "crypto/ctype.h"
 #include "internal/o_dir.h"
 #include "internal/cryptlib.h"
-#include "internal/store_int.h"
+#include "crypto/store.h"
 #include "store_locl.h"
 
 #ifdef _WIN32

diff --git a/crypto/store/store_init.c b/crypto/store/store_init.c
index db050c07ccaeb3e8700137c3fcc988c449eab593..c5d8cc456ee8e308150faaf363033a687e6e30af 100644 (file)
--- a/crypto/store/store_init.c
+++ b/crypto/store/store_init.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/err.h>
-#include "internal/store.h"
+#include "crypto/store.h"
 #include "store_locl.h"
 
 static CRYPTO_ONCE store_init = CRYPTO_ONCE_STATIC_INIT;

diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c
index 8c55c431c12374720c975c97f67829750fae9990..2d3b307e04d69aaaac42810e77a848672d351a9e 100644 (file)
--- a/crypto/store/store_lib.c
+++ b/crypto/store/store_lib.c
@@ -18,7 +18,7 @@
 #include <openssl/err.h>
 #include <openssl/store.h>
 #include "internal/thread_once.h"
-#include "internal/store_int.h"
+#include "crypto/store.h"
 #include "store_locl.h"
 
 struct ossl_store_ctx_st {

diff --git a/crypto/store/store_register.c b/crypto/store/store_register.c
index 3022e368c6953e734558665d97c0f9568ef44c57..8cd57836a9534970c51730de5cbb33895fdbdf80 100644 (file)
--- a/crypto/store/store_register.c
+++ b/crypto/store/store_register.c
@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include <assert.h>
 
 #include <openssl/err.h>

diff --git a/crypto/trace.c b/crypto/trace.c
index cc99fff37c653528ceb7458390d2b2ffdb5e6cae..7ff6af88370977213e6a6d6de089d3a6829b04c3 100755 (executable)
--- a/crypto/trace.c
+++ b/crypto/trace.c
@@ -16,7 +16,7 @@
 #include <openssl/trace.h>
 #include "internal/bio.h"
 #include "internal/nelem.h"
-#include "internal/cryptlib_int.h"
+#include "crypto/cryptlib.h"
 
 #include "e_os.h"                /* strcasecmp for Windows */
 

diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index 7791fc73c896ddac2c734bf535a79d70a1171656..74fa93d05e67a054abd23f14da4f8a55363c6d0a 100644 (file)
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c
@@ -15,7 +15,7 @@
 #include <openssl/pkcs7.h>
 #include <openssl/crypto.h>
 #include "ts_lcl.h"
-#include "internal/ess_int.h"
+#include "crypto/ess.h"
 
 static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *);
 static int def_time_cb(struct TS_resp_ctx *, void *, long *sec, long *usec);

diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c
index e658354eb37b97ce30db037ce67c2f3ede1b4cc5..0b6ea1ed623109d560602a7a6f4d2860282d345b 100644 (file)
--- a/crypto/ts/ts_rsp_verify.c
+++ b/crypto/ts/ts_rsp_verify.c
@@ -13,7 +13,7 @@
 #include <openssl/ts.h>
 #include <openssl/pkcs7.h>
 #include "ts_lcl.h"
-#include "internal/ess_int.h"
+#include "crypto/ess.h"
 
 static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
                           X509 *signer, STACK_OF(X509) **chain);

diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index e53b9b44a6b41cca0a3c8f94b4f9dd2fe9792a3a..720a4b9f551dda19a042008a527e8e056b398dd0 100644 (file)
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -19,7 +19,7 @@
 #endif
 
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include "x509_lcl.h"
 
 struct lookup_dir_hashes_st {

diff --git a/crypto/x509/pcy_cache.c b/crypto/x509/pcy_cache.c
index 21a89e62c09594d686b26ca1a4aaf5cfcd5305ec..56d3401ffbd21264b15dfc2d90aff23d8cc8761d 100644 (file)
--- a/crypto/x509/pcy_cache.c
+++ b/crypto/x509/pcy_cache.c
@@ -10,7 +10,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 #include "pcy_int.h"
 

diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c
index 243d6e2b7c4e897a9d30230f8b1b53819d8f72e8..ec72dbd33b3dc28a9b46ce0d8a05e60e47182bce 100644 (file)
--- a/crypto/x509/pcy_map.c
+++ b/crypto/x509/pcy_map.c
@@ -10,7 +10,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 #include "pcy_int.h"
 

diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c
index 3367228829d0b0647f2134736b3abb22e3c2b0bd..4969bb34bf2decaf6cc0b7f11518846f637393e5 100644 (file)
--- a/crypto/x509/t_x509.c
+++ b/crypto/x509/t_x509.c
@@ -14,7 +14,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 
 #ifndef OPENSSL_NO_STDIO
 int X509_print_fp(FILE *fp, X509 *x)

diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c
index 9e6bffed280a2171e857395be7a02d3bc768dd70..a33dd9990dae86bc2488f1655c43d4d640ae676c 100644 (file)
--- a/crypto/x509/v3_addr.c
+++ b/crypto/x509/v3_addr.c
@@ -20,7 +20,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/buffer.h>
 #include <openssl/x509v3.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include "ext_dat.h"
 
 #ifndef OPENSSL_NO_RFC3779

diff --git a/crypto/x509/v3_asid.c b/crypto/x509/v3_asid.c
index 2287675005b3e65323d30e47e4d3a3e2d3fe0656..dfd48f73319d47e7bf11da2c2b3b6a2b3a997ac0 100644 (file)
--- a/crypto/x509/v3_asid.c
+++ b/crypto/x509/v3_asid.c
@@ -20,7 +20,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509v3.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include <openssl/bn.h>
 #include "ext_dat.h"
 

diff --git a/crypto/x509/v3_conf.c b/crypto/x509/v3_conf.c
index b7b74c4f255cb8b39cebef24533b095d674309a4..47b1cfc90b44ba01ad133dc417397bb9fa610a27 100644 (file)
--- a/crypto/x509/v3_conf.c
+++ b/crypto/x509/v3_conf.c
@@ -10,11 +10,11 @@
 /* extension creation utilities */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/conf.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include <openssl/x509v3.h>
 
 static int v3_check_critical(const char **value);

diff --git a/crypto/x509/v3_crld.c b/crypto/x509/v3_crld.c
index 766bf0e5c88c79910dbf85dc7cd7177ec84177a1..c3517b817c33395ff0b5889c1c40be45431df157 100644 (file)
--- a/crypto/x509/v3_crld.c
+++ b/crypto/x509/v3_crld.c
@@ -14,7 +14,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509v3.h>
 
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include "ext_dat.h"
 
 static void *v2i_crld(const X509V3_EXT_METHOD *method,

diff --git a/crypto/x509/v3_ncons.c b/crypto/x509/v3_ncons.c
index 9a8ca16685dd51f23a52022a8732b88ac782b143..3be0c05fceb5d9ab6e0a136d606e7029a0efa7b2 100644 (file)
--- a/crypto/x509/v3_ncons.c
+++ b/crypto/x509/v3_ncons.c
@@ -10,13 +10,13 @@
 #include "internal/cryptlib.h"
 #include "internal/numbers.h"
 #include <stdio.h>
-#include "internal/asn1_int.h"
+#include "crypto/asn1.h"
 #include <openssl/asn1t.h>
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 #include <openssl/bn.h>
 
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include "ext_dat.h"
 
 static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,

diff --git a/crypto/x509/v3_purp.c b/crypto/x509/v3_purp.c
index 40f976bdda505321b6f9aa69e111836589f9eee1..3248e286aeebb70c8a064f27c5dd3c889df9ebf1 100644 (file)
--- a/crypto/x509/v3_purp.c
+++ b/crypto/x509/v3_purp.c
@@ -12,7 +12,7 @@
 #include "internal/numbers.h"
 #include <openssl/x509v3.h>
 #include <openssl/x509_vfy.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include "internal/tsan_assist.h"
 
 static void x509v3_cache_extensions(X509 *x);

diff --git a/crypto/x509/v3_skey.c b/crypto/x509/v3_skey.c
index f8a780d916f467c72801da8d1d3707d1b27f9e75..c69975f6af3fa7d11ce1c08877c9207680206168 100644 (file)
--- a/crypto/x509/v3_skey.c
+++ b/crypto/x509/v3_skey.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/x509v3.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include "ext_dat.h"
 
 static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,

diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c
index 24f50a13b7ffc4d5ac501cf1b8377f6e7dd68d6b..1516d988f090319c449356001292663203b79e5e 100644 (file)
--- a/crypto/x509/v3_utl.c
+++ b/crypto/x509/v3_utl.c
@@ -12,11 +12,11 @@
 #include "e_os.h"
 #include "internal/cryptlib.h"
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include <openssl/conf.h>
 #include <openssl/crypto.h>
 #include <openssl/x509v3.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include <openssl/bn.h>
 #include "ext_dat.h"
 

diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index d7bbbc1947afd5ffe5be6ae919708b64e99d8376..f208cd6a0427cab98b904afea1049912c52dd2a2 100644 (file)
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -13,7 +13,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
 {

diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c
index e13be607dfd9b23c9970f224ff3b95f878eae201..a7b85857bdadce603d1524f9d443affe1da8f5d4 100644 (file)
--- a/crypto/x509/x509_ext.c
+++ b/crypto/x509/x509_ext.c
@@ -13,7 +13,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include <openssl/x509v3.h>
 
 int X509_CRL_get_ext_count(const X509_CRL *x)

diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index c81a00e0a7d8daac53ce7da7d13d437fd3d1470e..f6404d59e9dda7f74527b68e024d98e9d67e780e 100644 (file)
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include "internal/refcount.h"
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include <openssl/x509v3.h>
 #include "x509_lcl.h"
 

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index cb16de1f71ccb649177fa5fbaa8032fb1f0d349a..9d8f48d2ee19850e6a74039385d97920c742f604 100644 (file)
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/buffer.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 /*
  * Limit to ensure we don't overflow: much greater than

diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c
index c45043a72ee8ce6668a075ba1f615fcebc0795ae..d7dd3754f5bdc62c363884f7013217265e81c19c 100644 (file)
--- a/crypto/x509/x509_r2x.c
+++ b/crypto/x509/x509_r2x.c
@@ -13,7 +13,7 @@
 #include <openssl/evp.h>
 #include <openssl/asn1.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index b0176bc90b4ee5f4d3b9a7b1e09dd6c8696c6e40..9382f37a8a467d0a6a01bd22346b315914288e64 100644 (file)
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -14,7 +14,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 #include <openssl/pem.h>

diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index 3dfe66440aa9b2d78061b9d8be32dc2455b653ad..66cf91fc3b0195104ba7af076c718197894885ad 100644 (file)
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -15,8 +15,8 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "internal/asn1_int.h"
-#include "internal/x509_int.h"
+#include "crypto/asn1.h"
+#include "crypto/x509.h"
 #include "x509_lcl.h"
 
 int X509_set_version(X509 *x, long version)

diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c
index 2347e559388d61544d54259c7f3192ff34d5f7da..b6a45acbcd90e491401e0dfc62bd81cc3f4b4b5d 100644 (file)
--- a/crypto/x509/x509_trs.c
+++ b/crypto/x509/x509_trs.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/x509v3.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 static int tr_cmp(const X509_TRUST *const *a, const X509_TRUST *const *b);
 static void trtable_free(X509_TRUST *p);

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index f337cd14cb534ab6206f13b6c5a3b605003bde25..0dd9772c101d1ccd75c8be5fe7b8d4110a61c4ee 100644 (file)
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <limits.h>
 
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/crypto.h>
 #include <openssl/buffer.h>
@@ -22,7 +22,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/objects.h>
 #include "internal/dane.h"
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include "x509_lcl.h"
 
 /* CRL score values */

diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 5fe0754e96f4f68dd6937b47f970d154d540ef1e..c681dbaa651d3fb8c649bb1d9f8fa18665908f95 100644 (file)
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -14,7 +14,7 @@
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 #include "x509_lcl.h"
 

diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
index ae447aa98f857954841d11ba093d0b69557fd34d..f1992ddcf042ba601b4e68d6a26441523ba7f341 100644 (file)
--- a/crypto/x509/x509cset.c
+++ b/crypto/x509/x509cset.c
@@ -14,7 +14,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 int X509_CRL_set_version(X509_CRL *x, long version)
 {

diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c
index bf01450a1ce051e9bfc882124f4d76a00d1662e8..443ab42bddaed44b4d150fbe3c16aee16cf35b0b 100644 (file)
--- a/crypto/x509/x509name.c
+++ b/crypto/x509/x509name.c
@@ -14,7 +14,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
 {

diff --git a/crypto/x509/x509rset.c b/crypto/x509/x509rset.c
index 592466316d525014c94a0fdacb28da41be9eb075..3256ec2304a48bb367f47e6e428a190d3dab8553 100644 (file)
--- a/crypto/x509/x509rset.c
+++ b/crypto/x509/x509rset.c
@@ -13,7 +13,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 int X509_REQ_set_version(X509_REQ *x, long version)
 {

diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c
index 392f47e8dc8d99190693d5770d0ebfbb7de68f9f..43b29d3bc67992fcce34f5c8b311f4bd7059e09b 100644 (file)
--- a/crypto/x509/x_all.c
+++ b/crypto/x509/x_all.c
@@ -13,7 +13,7 @@
 #include <openssl/asn1.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include <openssl/ocsp.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
@@ -21,8 +21,8 @@
 
 #ifndef OPENSSL_NO_SM2
 
-# include "internal/asn1_int.h"
-# include "internal/evp_int.h"
+# include "crypto/asn1.h"
+# include "crypto/evp.h"
 
 static int common_verify_sm2(void *data, EVP_PKEY *pkey,
                              int mdnid, int pknid, int req)

diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c
index 3984f0147f2c59c5b976c0cc6ae0b9328803971f..d06eb69a5bc7dc0aed22351d4e013477a0ec21b4 100644 (file)
--- a/crypto/x509/x_crl.c
+++ b/crypto/x509/x_crl.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 #include <openssl/x509v3.h>
 #include "x509_lcl.h"
 

diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index 8fd6566b0194fee52cef55f733765b5c7a9b8eac..93ba9555bec92792b8ec26e2c889131c5255362d 100644 (file)
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -8,12 +8,12 @@
  */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
-#include "internal/asn1_int.h"
+#include "crypto/x509.h"
+#include "crypto/asn1.h"
 #include "x509_lcl.h"
 
 /*

diff --git a/crypto/x509/x_pubkey.c b/crypto/x509/x_pubkey.c
index d81f53844f375dfd8da78e5165a9817307180da2..6e8540835f662b912ede306c18cca1b88efc9c02 100644 (file)
--- a/crypto/x509/x_pubkey.c
+++ b/crypto/x509/x_pubkey.c
@@ -11,9 +11,9 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
-#include "internal/x509_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
+#include "crypto/x509.h"
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 

diff --git a/crypto/x509/x_req.c b/crypto/x509/x_req.c
index 5bda794a8248063f99bb24ca6fc8eb620149c85e..e9cc9ba41c140ce7caecfaea84fbab64d3b281f3 100644 (file)
--- a/crypto/x509/x_req.c
+++ b/crypto/x509/x_req.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 /*-
  * X509_REQ_INFO is handled in an unusual way to get round

diff --git a/crypto/x509/x_x509.c b/crypto/x509/x_x509.c
index d91c2d24da1c59ad563fcb953e12a0e41fe57058..7b41ce0777f66b885412622dd93ae6beeb639c1b 100644 (file)
--- a/crypto/x509/x_x509.c
+++ b/crypto/x509/x_x509.c
@@ -13,7 +13,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 ASN1_SEQUENCE_enc(X509_CINF, enc, 0) = {
         ASN1_EXP_OPT(X509_CINF, version, ASN1_INTEGER, 0),

diff --git a/crypto/x509/x_x509a.c b/crypto/x509/x_x509a.c
index a29d3dfce896704c5e5169cdeb215d90ce1453b8..18d09e300e871869613ea69a798a23fe517dec67 100644 (file)
--- a/crypto/x509/x_x509a.c
+++ b/crypto/x509/x_x509a.c
@@ -12,7 +12,7 @@
 #include <openssl/evp.h>
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
-#include "internal/x509_int.h"
+#include "crypto/x509.h"
 
 /*
  * X509_CERT_AUX routines. These are used to encode additional user

diff --git a/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod b/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod
index 60695266a76d5f074e79010b134aa55fb66dddff..8617c975813e1866024089d8ea1efa2e468d849c 100644 (file)
--- a/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod
+++ b/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod
@@ -11,7 +11,7 @@ ossl_sa_TYPE_doall_arg, ossl_sa_TYPE_get, ossl_sa_TYPE_set
 
 =for comment generic
 
- #include "internal/sparse_array.h"
+ #include "crypto/sparse_array.h"
 
  typedef struct sparse_array_st OPENSSL_SA;
 

diff --git a/doc/internal/man3/evp_keymgmt_export_to_provider.pod b/doc/internal/man3/evp_keymgmt_export_to_provider.pod
index 72b766fb9333de8b77ed71b9c974022ba938e6b9..2cb40940b480970775280f028a4d610cca6207f5 100644 (file)
--- a/doc/internal/man3/evp_keymgmt_export_to_provider.pod
+++ b/doc/internal/man3/evp_keymgmt_export_to_provider.pod
@@ -8,7 +8,7 @@ evp_keymgmt_clear_pkey_cache
 
 =head1 SYNOPSIS
 
- #include "internal/evp_int.h"
+ #include "crypto/evp.h"
 
  void *evp_keymgmt_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt);
  void evp_keymgmt_clear_pkey_cache(EVP_PKEY *pk);

diff --git a/doc/internal/man3/evp_keymgmt_freekey.pod b/doc/internal/man3/evp_keymgmt_freekey.pod
index 597c34b6d4daae1b4631344dbf277db1b7f6624d..8be73aee81cdbdf103524ef515648f6d5748f360 100644 (file)
--- a/doc/internal/man3/evp_keymgmt_freekey.pod
+++ b/doc/internal/man3/evp_keymgmt_freekey.pod
@@ -14,7 +14,7 @@ evp_keymgmt_importkey_types, evp_keymgmt_exportkey_types
 
 =head1 SYNOPSIS
 
- #include "internal/evp_int.h"
+ #include "crypto/evp.h"
 
  void *evp_keymgmt_importdomparams(const EVP_KEYMGMT *keymgmt,
                                 const OSSL_PARAM params[]);

diff --git a/doc/internal/man3/ossl_init_thread_deregister.pod b/doc/internal/man3/ossl_init_thread_deregister.pod
index ccfb4197316bc0f09fdd0371adabae71f955e468..923b52547726e34813f62eda28d702c1ae48ba83 100644 (file)
--- a/doc/internal/man3/ossl_init_thread_deregister.pod
+++ b/doc/internal/man3/ossl_init_thread_deregister.pod
@@ -9,7 +9,7 @@ ossl_init_thread_deregister
 
 =head1 SYNOPSIS
 
- #include "internal/cryptlib_int.h"
+ #include "crypto/cryptlib.h"
  #include <openssl/core.h>
 
  typedef void (*OSSL_thread_stop_handler_fn)(void *arg);

diff --git a/doc/internal/man3/rand_bytes_ex.pod b/doc/internal/man3/rand_bytes_ex.pod
index cf54e02a316f54575c95ca307e5decfc2585bd2f..e1bb0f04dfefd5e6f118a767b2192d53835c47d9 100644 (file)
--- a/doc/internal/man3/rand_bytes_ex.pod
+++ b/doc/internal/man3/rand_bytes_ex.pod
@@ -7,7 +7,7 @@ rand_bytes_ex, rand_priv_bytes_ex
 
 =head1 SYNOPSIS
 
- #include "internal/rand_int.h"
+ #include "crypto/rand.h"
 
  int rand_bytes_ex(OPENSSL_CTX *ctx, unsigned char *buf, int num);
  int rand_priv_bytes_ex(OPENSSL_CTX *ctx, unsigned char *buf, int num);

diff --git a/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H b/include/crypto/__DECC_INCLUDE_EPILOGUE.H
similarity index 100%
rename from crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H
rename to include/crypto/__DECC_INCLUDE_EPILOGUE.H

diff --git a/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H b/include/crypto/__DECC_INCLUDE_PROLOGUE.H
similarity index 100%
rename from crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H
rename to include/crypto/__DECC_INCLUDE_PROLOGUE.H

diff --git a/crypto/include/internal/aria.h b/include/crypto/aria.h
similarity index 100%
rename from crypto/include/internal/aria.h
rename to include/crypto/aria.h

diff --git a/crypto/include/internal/asn1_int.h b/include/crypto/asn1.h
similarity index 100%
rename from crypto/include/internal/asn1_int.h
rename to include/crypto/asn1.h

diff --git a/crypto/include/internal/asn1_dsa.h b/include/crypto/asn1_dsa.h
similarity index 100%
rename from crypto/include/internal/asn1_dsa.h
rename to include/crypto/asn1_dsa.h

diff --git a/crypto/include/internal/async.h b/include/crypto/async.h
similarity index 100%
rename from crypto/include/internal/async.h
rename to include/crypto/async.h

diff --git a/crypto/include/internal/bn_int.h b/include/crypto/bn.h
similarity index 100%
rename from crypto/include/internal/bn_int.h
rename to include/crypto/bn.h

diff --git a/crypto/include/internal/bn_conf.h.in b/include/crypto/bn_conf.h.in
similarity index 100%
rename from crypto/include/internal/bn_conf.h.in
rename to include/crypto/bn_conf.h.in

diff --git a/crypto/include/internal/bn_dh.h b/include/crypto/bn_dh.h
similarity index 100%
rename from crypto/include/internal/bn_dh.h
rename to include/crypto/bn_dh.h

diff --git a/crypto/include/internal/bn_srp.h b/include/crypto/bn_srp.h
similarity index 100%
rename from crypto/include/internal/bn_srp.h
rename to include/crypto/bn_srp.h

diff --git a/crypto/include/internal/chacha.h b/include/crypto/chacha.h
similarity index 100%
rename from crypto/include/internal/chacha.h
rename to include/crypto/chacha.h

diff --git a/crypto/include/internal/ciphermode_platform.h b/include/crypto/ciphermode_platform.h
similarity index 100%
rename from crypto/include/internal/ciphermode_platform.h
rename to include/crypto/ciphermode_platform.h

diff --git a/crypto/include/internal/cms_int.h b/include/crypto/cms.h
similarity index 100%
rename from crypto/include/internal/cms_int.h
rename to include/crypto/cms.h

diff --git a/crypto/include/internal/cryptlib_int.h b/include/crypto/cryptlib.h
similarity index 100%
rename from crypto/include/internal/cryptlib_int.h
rename to include/crypto/cryptlib.h

diff --git a/crypto/include/internal/ctype.h b/include/crypto/ctype.h
similarity index 100%
rename from crypto/include/internal/ctype.h
rename to include/crypto/ctype.h

diff --git a/crypto/include/internal/dso_conf.h.in b/include/crypto/dso_conf.h.in
similarity index 100%
rename from crypto/include/internal/dso_conf.h.in
rename to include/crypto/dso_conf.h.in

diff --git a/crypto/include/internal/ec_int.h b/include/crypto/ec.h
similarity index 100%
rename from crypto/include/internal/ec_int.h
rename to include/crypto/ec.h

diff --git a/crypto/include/internal/engine.h b/include/crypto/engine.h
similarity index 100%
rename from crypto/include/internal/engine.h
rename to include/crypto/engine.h

diff --git a/crypto/include/internal/err_int.h b/include/crypto/err.h
similarity index 100%
rename from crypto/include/internal/err_int.h
rename to include/crypto/err.h

diff --git a/crypto/include/internal/ess_int.h b/include/crypto/ess.h
similarity index 100%
rename from crypto/include/internal/ess_int.h
rename to include/crypto/ess.h

diff --git a/crypto/include/internal/evp_int.h b/include/crypto/evp.h
similarity index 100%
rename from crypto/include/internal/evp_int.h
rename to include/crypto/evp.h

diff --git a/crypto/include/internal/lhash.h b/include/crypto/lhash.h
similarity index 100%
rename from crypto/include/internal/lhash.h
rename to include/crypto/lhash.h

diff --git a/crypto/include/internal/md32_common.h b/include/crypto/md32_common.h
similarity index 100%
rename from crypto/include/internal/md32_common.h
rename to include/crypto/md32_common.h

diff --git a/crypto/include/internal/modes_int.h b/include/crypto/modes.h
similarity index 100%
rename from crypto/include/internal/modes_int.h
rename to include/crypto/modes.h

diff --git a/crypto/include/internal/objects.h b/include/crypto/objects.h
similarity index 100%
rename from crypto/include/internal/objects.h
rename to include/crypto/objects.h

diff --git a/crypto/include/internal/poly1305.h b/include/crypto/poly1305.h
similarity index 100%
rename from crypto/include/internal/poly1305.h
rename to include/crypto/poly1305.h

diff --git a/crypto/include/internal/rand_int.h b/include/crypto/rand.h
similarity index 100%
rename from crypto/include/internal/rand_int.h
rename to include/crypto/rand.h

diff --git a/crypto/include/internal/sha.h b/include/crypto/sha.h
similarity index 100%
rename from crypto/include/internal/sha.h
rename to include/crypto/sha.h

diff --git a/crypto/include/internal/siphash.h b/include/crypto/siphash.h
similarity index 100%
rename from crypto/include/internal/siphash.h
rename to include/crypto/siphash.h

diff --git a/crypto/include/internal/siv_int.h b/include/crypto/siv.h
similarity index 100%
rename from crypto/include/internal/siv_int.h
rename to include/crypto/siv.h

diff --git a/crypto/include/internal/sm2.h b/include/crypto/sm2.h
similarity index 100%
rename from crypto/include/internal/sm2.h
rename to include/crypto/sm2.h

diff --git a/crypto/include/internal/sm2err.h b/include/crypto/sm2err.h
similarity index 100%
rename from crypto/include/internal/sm2err.h
rename to include/crypto/sm2err.h

diff --git a/crypto/include/internal/sm4.h b/include/crypto/sm4.h
similarity index 100%
rename from crypto/include/internal/sm4.h
rename to include/crypto/sm4.h

diff --git a/crypto/include/internal/sparse_array.h b/include/crypto/sparse_array.h
similarity index 100%
rename from crypto/include/internal/sparse_array.h
rename to include/crypto/sparse_array.h

diff --git a/crypto/include/internal/store_int.h b/include/crypto/store.h
similarity index 83%
rename from crypto/include/internal/store_int.h
rename to include/crypto/store.h
index 67f2526261b22a435fdd807d54c071cf3c1dc9d3..afad09c7780c08447f368dc6383b1ade0b7f078f 100644 (file)
--- a/crypto/include/internal/store_int.h
+++ b/include/crypto/store.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_STORE_INT_H
-# define HEADER_STORE_INT_H
+#ifndef HEADER_STORE_H
+# define HEADER_STORE_H
 
 # include <openssl/bio.h>
 # include <openssl/store.h>
@@ -23,4 +23,6 @@ OSSL_STORE_CTX *ossl_store_attach_pem_bio(BIO *bp, const UI_METHOD *ui_method,
                                           void *ui_data);
 int ossl_store_detach_pem_bio(OSSL_STORE_CTX *ctx);
 
+void ossl_store_cleanup_int(void);
+
 #endif

diff --git a/crypto/include/internal/x509_int.h b/include/crypto/x509.h
similarity index 100%
rename from crypto/include/internal/x509_int.h
rename to include/crypto/x509.h

diff --git a/providers/build.info b/providers/build.info
index 9642a3c1531f1fb8d5fe9811db1083e0b0480c03..80b2952494a1850952a7582e6064afb5d4aef59d 100644 (file)
--- a/providers/build.info
+++ b/providers/build.info
@@ -9,7 +9,7 @@ IF[{- !$disabled{fips} -}]
     SOURCE[fips]=fips.ld
     GENERATE[fips.ld]=../util/providers.num
   ENDIF
-  INCLUDE[fips]=.. ../include ../crypto/include common/include
+  INCLUDE[fips]=.. ../include common/include
   DEFINE[fips]=FIPS_MODE
 ENDIF
 
@@ -25,6 +25,6 @@ IF[{- !$disabled{legacy} -}]
       GENERATE[legacy.ld]=../util/providers.num
     ENDIF
     DEPEND[legacy]=../libcrypto
-    INCLUDE[legacy]=.. ../include ../crypto/include common/include
+    INCLUDE[legacy]=.. ../include common/include
   ENDIF
 ENDIF

diff --git a/providers/common/ciphers/cipher_gcm.c b/providers/common/ciphers/cipher_gcm.c
index b5c79daee747f57c41030be10347aa28b8c89e72..09cd70cc536ba254c21518873c97e9a7eae6fe5a 100644 (file)
--- a/providers/common/ciphers/cipher_gcm.c
+++ b/providers/common/ciphers/cipher_gcm.c
@@ -12,7 +12,7 @@
 #include "cipher_locl.h"
 #include "internal/ciphers/cipher_gcm.h"
 #include "internal/providercommonerr.h"
-#include "internal/rand_int.h"
+#include "crypto/rand.h"
 #include "internal/provider_ctx.h"
 
 static int gcm_tls_init(PROV_GCM_CTX *dat, unsigned char *aad, size_t aad_len);

diff --git a/providers/common/ciphers/cipher_tdes.c b/providers/common/ciphers/cipher_tdes.c
index e3e80d186ab3c01152877a552aa1eac3b71502b3..05485316788d91252be65609a970eb6e75c06d29 100644 (file)
--- a/providers/common/ciphers/cipher_tdes.c
+++ b/providers/common/ciphers/cipher_tdes.c
@@ -9,7 +9,7 @@
 
 #include "cipher_locl.h"
 #include "internal/ciphers/cipher_tdes.h"
-#include "internal/rand_int.h"
+#include "crypto/rand.h"
 #include "internal/provider_algs.h"
 #include "internal/providercommonerr.h"
 

diff --git a/providers/common/digests/sha2_prov.c b/providers/common/digests/sha2_prov.c
index b87267650601d56f9c53a3ffa292292b56bb62b0..d2c7df2ee684028baa2c34b7292907d8ac34790e 100644 (file)
--- a/providers/common/digests/sha2_prov.c
+++ b/providers/common/digests/sha2_prov.c
@@ -16,7 +16,7 @@
 #include <openssl/core_names.h>
 #include "internal/digestcommon.h"
 #include "internal/provider_algs.h"
-#include "internal/sha.h"
+#include "crypto/sha.h"
 
 static OSSL_OP_digest_set_ctx_params_fn sha1_set_ctx_params;
 static OSSL_OP_digest_settable_ctx_params_fn sha1_settable_ctx_params;

diff --git a/providers/common/include/internal/ciphers/ciphercommon.h b/providers/common/include/internal/ciphers/ciphercommon.h
index 7539d8cb8108684b0d6d81e17d7735d998333adc..9a01abf6cba0b2c387e3bfdb4803b714431ba34c 100644 (file)
--- a/providers/common/include/internal/ciphers/ciphercommon.h
+++ b/providers/common/include/internal/ciphers/ciphercommon.h
@@ -12,8 +12,8 @@
 #include <openssl/core_names.h>
 #include <openssl/evp.h>
 #include "internal/cryptlib.h"
-#include "internal/modes_int.h"
-#include "internal/ciphermode_platform.h"
+#include "crypto/modes.h"
+#include "crypto/ciphermode_platform.h"
 
 #define MAXCHUNK    ((size_t)1 << (sizeof(long) * 8 - 2))
 #define MAXBITCHUNK ((size_t)1 << (sizeof(size_t) * 8 - 4))

diff --git a/providers/common/kdfs/hkdf.c b/providers/common/kdfs/hkdf.c
index ac5cc34a215e7d1326693bb9eaec39b26c0f4829..041811f0e16122c6a551e4fa878e1c84498013fc 100644 (file)
--- a/providers/common/kdfs/hkdf.c
+++ b/providers/common/kdfs/hkdf.c
@@ -16,7 +16,7 @@
 #include <openssl/core_names.h>
 #include "internal/cryptlib.h"
 #include "internal/numbers.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider_ctx.h"
 #include "internal/providercommonerr.h"
 #include "internal/provider_algs.h"

diff --git a/providers/common/kdfs/kbkdf.c b/providers/common/kdfs/kbkdf.c
index 77cee258e8fdff6f1065a4e48894e2e7966852a2..ffffef0b17c75e6828eadaa3d1dc5dce4d6a1ded 100644 (file)
--- a/providers/common/kdfs/kbkdf.c
+++ b/providers/common/kdfs/kbkdf.c
@@ -35,7 +35,7 @@
 #include <openssl/params.h>
 
 #include "internal/cryptlib.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/numbers.h"
 #include "internal/provider_algs.h"
 #include "internal/provider_ctx.h"

diff --git a/providers/common/kdfs/pbkdf2.c b/providers/common/kdfs/pbkdf2.c
index c8480125b20e81f35c5d7f39283871a7e350169d..b98123b8729cadc26f1c637c66df3ffd6b7eb1dd 100644 (file)
--- a/providers/common/kdfs/pbkdf2.c
+++ b/providers/common/kdfs/pbkdf2.c
@@ -16,7 +16,7 @@
 #include <openssl/core_names.h>
 #include "internal/cryptlib.h"
 #include "internal/numbers.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider_ctx.h"
 #include "internal/providercommonerr.h"
 #include "internal/provider_algs.h"

diff --git a/providers/common/kdfs/sskdf.c b/providers/common/kdfs/sskdf.c
index d74da436a2712e068683ed1ea49ee29c9d5067d5..1e538a9c0afc1b80a96ad54c1c7762303f8f95a8 100644 (file)
--- a/providers/common/kdfs/sskdf.c
+++ b/providers/common/kdfs/sskdf.c
@@ -44,7 +44,7 @@
 #include <openssl/params.h>
 #include "internal/cryptlib.h"
 #include "internal/numbers.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider_ctx.h"
 #include "internal/providercommonerr.h"
 #include "internal/provider_algs.h"

diff --git a/providers/common/kdfs/tls1_prf.c b/providers/common/kdfs/tls1_prf.c
index 3053b756dc68157a19c043ee24e2b6c74fc76ded..af49b1b044a000579c0a8a17e8a09b1ce13f30a0 100644 (file)
--- a/providers/common/kdfs/tls1_prf.c
+++ b/providers/common/kdfs/tls1_prf.c
@@ -54,7 +54,7 @@
 #include <openssl/params.h>
 #include "internal/cryptlib.h"
 #include "internal/numbers.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider_ctx.h"
 #include "internal/providercommonerr.h"
 #include "internal/provider_algs.h"

diff --git a/providers/default/ciphers/cipher_aria.h b/providers/default/ciphers/cipher_aria.h
index 984be8f4aae856e06e5d23af72c3e8bc32dce122..e95e4ca93c7bfad2c99026b9d324e37113d96085 100644 (file)
--- a/providers/default/ciphers/cipher_aria.h
+++ b/providers/default/ciphers/cipher_aria.h
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/aria.h"
+#include "crypto/aria.h"
 #include "internal/ciphers/ciphercommon.h"
 
 typedef struct prov_aria_ctx_st {

diff --git a/providers/default/ciphers/cipher_aria_ccm.h b/providers/default/ciphers/cipher_aria_ccm.h
index b3e990766df635fec01831c653e4474da6dbe2a5..fe0a3908bc02686a3b64ff539bbafeb36694cff7 100644 (file)
--- a/providers/default/ciphers/cipher_aria_ccm.h
+++ b/providers/default/ciphers/cipher_aria_ccm.h
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/aria.h"
+#include "crypto/aria.h"
 #include "internal/ciphers/ciphercommon.h"
 #include "internal/ciphers/cipher_ccm.h"
 

diff --git a/providers/default/ciphers/cipher_aria_gcm.h b/providers/default/ciphers/cipher_aria_gcm.h
index 3499ceaaf7506a1c4aa38bc832f94cd90f0ac457..ac5c248201b3529c8c1f62828cac52c20e087ef3 100644 (file)
--- a/providers/default/ciphers/cipher_aria_gcm.h
+++ b/providers/default/ciphers/cipher_aria_gcm.h
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/aria.h"
+#include "crypto/aria.h"
 #include "internal/ciphers/ciphercommon.h"
 #include "internal/ciphers/cipher_gcm.h"
 

diff --git a/providers/default/ciphers/cipher_des.c b/providers/default/ciphers/cipher_des.c
index a1976fb7370e7adc2e6c8bd285a3a4a0b37cf646..9456c205b8ff32b109f4eea9bb5e5481ba4d8654 100644 (file)
--- a/providers/default/ciphers/cipher_des.c
+++ b/providers/default/ciphers/cipher_des.c
@@ -9,7 +9,7 @@
 
 #include "cipher_locl.h"
 #include "cipher_des.h"
-#include "internal/rand_int.h"
+#include "crypto/rand.h"
 #include "internal/provider_algs.h"
 #include "internal/providercommonerr.h"
 

diff --git a/providers/default/ciphers/cipher_sm4.h b/providers/default/ciphers/cipher_sm4.h
index 842c218f3079aa76c376eb003ced253d98aa2d7d..4740bb33559f9734728ae05104ec32a6f7f50415 100644 (file)
--- a/providers/default/ciphers/cipher_sm4.h
+++ b/providers/default/ciphers/cipher_sm4.h
@@ -8,7 +8,7 @@
  */
 
 #include "internal/ciphers/ciphercommon.h"
-#include "internal/sm4.h"
+#include "crypto/sm4.h"
 
 typedef struct prov_cast_ctx_st {
     PROV_CIPHER_CTX base;      /* Must be first */

diff --git a/providers/default/ciphers/cipher_tdes_wrap.c b/providers/default/ciphers/cipher_tdes_wrap.c
index 08662dbdb026529efa78444b9536adce671ddeed..b48b3c973375d4950bd04e0b1401ae1ffed2a801 100644 (file)
--- a/providers/default/ciphers/cipher_tdes_wrap.c
+++ b/providers/default/ciphers/cipher_tdes_wrap.c
@@ -9,8 +9,8 @@
 
 #include <openssl/sha.h>
 #include "cipher_tdes_default.h"
-#include "internal/evp_int.h"
-#include "internal/rand_int.h"
+#include "crypto/evp.h"
+#include "crypto/rand.h"
 #include "internal/provider_algs.h"
 #include "internal/providercommonerr.h"
 

diff --git a/providers/default/kdfs/scrypt.c b/providers/default/kdfs/scrypt.c
index abb4437d706ac2f39f4a9845b4c6465c5a6d2c83..505963eec51cc187b07d77d8f9ecd40c93a01219 100644 (file)
--- a/providers/default/kdfs/scrypt.c
+++ b/providers/default/kdfs/scrypt.c
@@ -14,7 +14,7 @@
 #include <openssl/kdf.h>
 #include <openssl/err.h>
 #include <openssl/core_names.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/numbers.h"
 #include "internal/provider_algs.h"
 #include "internal/provider_ctx.h"

diff --git a/providers/default/kdfs/sshkdf.c b/providers/default/kdfs/sshkdf.c
index 2db539729417aad4925c3409c24244d23aca9de4..7e6445dbddb41e01a357e6580e4cb6c1aef1f564 100644 (file)
--- a/providers/default/kdfs/sshkdf.c
+++ b/providers/default/kdfs/sshkdf.c
@@ -15,7 +15,7 @@
 #include <openssl/core_names.h>
 #include "internal/cryptlib.h"
 #include "internal/numbers.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider_ctx.h"
 #include "internal/providercommonerr.h"
 #include "internal/provider_algs.h"

diff --git a/providers/default/kdfs/x942kdf.c b/providers/default/kdfs/x942kdf.c
index 7c3afef91113830d20ac7dee93960538c11a2e58..65c586fb999dfb703249fa2045de347ff95cc898 100644 (file)
--- a/providers/default/kdfs/x942kdf.c
+++ b/providers/default/kdfs/x942kdf.c
@@ -24,7 +24,7 @@
 # include <openssl/core_names.h>
 # include "internal/cryptlib.h"
 # include "internal/numbers.h"
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include "internal/provider_ctx.h"
 # include "internal/providercommonerr.h"
 # include "internal/provider_algs.h"

diff --git a/providers/default/macs/poly1305_prov.c b/providers/default/macs/poly1305_prov.c
index e76f982ace207c6848a39a04fe78c95f46df9f40..88005716e6ca3adb348c2a44c8c24891a6959f9b 100644 (file)
--- a/providers/default/macs/poly1305_prov.c
+++ b/providers/default/macs/poly1305_prov.c
@@ -13,7 +13,7 @@
 #include <openssl/evp.h>
 #include <openssl/err.h>
 
-#include "internal/poly1305.h"
+#include "crypto/poly1305.h"
 /*
  * TODO(3.0) when poly1305 has moved entirely to our providers, this
  * header should be moved to the provider include directory.  For the

diff --git a/providers/default/macs/siphash_prov.c b/providers/default/macs/siphash_prov.c
index 1a36846bfe36b588861305724cea517021256a87..a9511925f0e2a675ae70b42d9962c71b41d9ee32 100644 (file)
--- a/providers/default/macs/siphash_prov.c
+++ b/providers/default/macs/siphash_prov.c
@@ -14,7 +14,7 @@
 #include <openssl/evp.h>
 #include <openssl/err.h>
 
-#include "internal/siphash.h"
+#include "crypto/siphash.h"
 /*
  * TODO(3.0) when siphash has moved entirely to our providers, this
  * header should be moved to the provider include directory.  For the

diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index ce843552d7a57a83d8fe627c90575d0a20a6e75e..166d02496e6ff4456bab50eb7c40036a4dd802dc 100644 (file)
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -25,7 +25,7 @@
 
 #include "internal/cryptlib.h"
 #include "internal/property.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "internal/provider_algs.h"
 #include "internal/provider_ctx.h"
 #include "internal/providercommon.h"

diff --git a/test/asn1_dsa_internal_test.c b/test/asn1_dsa_internal_test.c
index a62f5e4cd4a0cd9fe2e20369cdac5da01b73f1cd..21e574d3fba986d22c23c10de65bc162f7cd6b98 100644 (file)
--- 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 753449cabb44ee4b2e2c1b50ba489941791ebc97..e77299a7c8e38e1c3797d0a1da16de1cc28090e3 100644 (file)
--- 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 cf47e8b7346277b356608b5c9f206273372cc69b..f3e874960db747965f29e23e24046728151a4cd1 100644 (file)
--- 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 caa70da821fc13a49f6efd306511eeb451da4677..7328641243f41f0f220e1d3948fb17343167e7ad 100644 (file)
--- 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 40f1f12fcd00f6b4533c235928a840e8fdcf93ff..878bd752e054bb70d56c9fd4ddd590154afba3eb 100644 (file)
--- 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 b0aac6a4d2fca7e2dc389bd839090c06470aba57..e2e7dc0bac92ce8339d88051b1c566817201d139 100644 (file)
--- 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 4559ffd635aff53436e937e8236692fb7fcf38e0..f5b19344b6fd3fccabe3075e9b6bb8f2b992d763 100644 (file)
--- 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 1898e31de8dd04b147b7487b21d812bccb82a97d..12c21e195c20279e2060c6d609c25bd0a8045f9c 100644 (file)
--- 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 02e5c8d0a8c93666db0beed314b10387eecc45dd..37ca2b14bd7c5e6c99ad8e968dd1f442834f6a8d 100644 (file)
--- 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 e2f93816214114809e07ecc8cd639c6ea507efc0..504e474b7c39c531dad6f246f39f57f2c1aded60 100644 (file)
--- 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 6934b89dc036db1a33ad4624ae8071fc05ebb730..84d90daeebfa0a95020c45e4884098a2a95d5ad0 100644 (file)
--- 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 75caefd8992153a7e0edcb1c910b4392e95ea150..e77e9d265f977fde47c05c7dab0d94b3b5310e69 100644 (file)
--- 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 8e76daa913fad559fd360f425dcb53527fb0f9b0..0c626526b1985e673850aa689f0c18838f3fb50c 100644 (file)
--- 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 7ccd6e46db33d7184393474cbe5b6622ba6c25d6..0a5ea738e59dceeb6adc710940a01d65730b68bb 100644 (file)
--- 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 5cc8038f7f779c31a19515a3abd76b4f6cc26922..2c7f5a878cc2c6ad34702ed7710cb1523154bdfd 100644 (file)
--- 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