Reorganize private crypto header files

Currently, there are two different directories which contain internal
header files of libcrypto which are meant to be shared internally:

While header files in 'include/internal' are intended to be shared
between libcrypto and libssl, the files in 'crypto/include/internal'
are intended to be shared inside libcrypto only.

To make things complicated, the include search path is set up in such
a way that the directive #include "internal/file.h" could refer to
a file in either of these two directoroes. This makes it necessary
in some cases to add a '_int.h' suffix to some files to resolve this
ambiguity:

  #include "internal/file.h"      # located in 'include/internal'
  #include "internal/file_int.h"  # located in 'crypto/include/internal'

This commit moves the private crypto headers from

  'crypto/include/internal'  to  'include/crypto'

As a result, the include directives become unambiguous

  #include "internal/file.h"       # located in 'include/internal'
  #include "crypto/file.h"         # located in 'include/crypto'

hence the superfluous '_int.h' suffixes can be stripped.

The files 'store_int.h' and 'store.h' need to be treated specially;
they are joined into a single file.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9681)

diff --git a/.gitignore b/.gitignore
index 1b0f25cc81b25b1e3067022deb70465105ae7c30..c7e660b6a74720528d993e92278cc7ec90a452fb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ Makefile
 # Auto generated headers
 /crypto/buildinf.h
 /apps/progs.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 3dda4e89bf5cc5c23b665b3712c9cbfab98ab3a6..05c9bdd19c566d21f461ae9c5bbf3fe83b866fe2 100644 (file)
--- a/build.info
+++ b/build.info
@@ -9,20 +9,20 @@
      "";
 -}
 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
+DEPEND[]=include/openssl/opensslconf.h include/crypto/bn_conf.h \
+         include/crypto/dso_conf.h
 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
 
 IF[{- defined $target{shared_defflag} -}]
   IF[{- $config{target} =~ /^mingw/ -}]

diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index 293bcc72bd03bcb4d634fa2888e37bc938540aaa..ce55d52664295d42c55a1e3175d21ed0965f450a 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 a1a17901b8f8c12905073827b612c1906168c1ba..a452b3deba088e0edadeb162a77d17d5692273f1 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 949fe6c1611ac37a64a36ae03995da7fac1fd383..bdb697ab30c15f46bd0ac198568ef446bf12f0aa 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 5e1424a806fbd98089b66e151f009169892c21bc..064835b7ecdeac36fe376100e8eb1a2daa4e64b1 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 8a373d9da9f61aefaa63d4f96d662dd8f932a80d..85a631a27aa703358b630b70e744eddf95a45ea4 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 146fdb9626281024cbeefcc78dface7da1a4a7c3..72381b665551ba94739bf01e193d2c6917177a32 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 ea4dd1c5b189e53bc6a6f6e1d1e229da3a91a686..4879b33785e97e9a09e96eaa3f3e8b9a7f088ae3 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 c36dd9500169f5d5ae25efce7b66001ba79540d9..bbb07fd6d81cadf1bc1cf1e53aefeaef7a96b440 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 cdaf17c3cbc1b4880156eb7f7201d00e9fbfc6ed..4b5f54234fa5589300a062b7047a448ffbca37de 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 d7d270dbb5819c984e4912d65bd4695b73019713..5e8c3ed1d5b0e0e5a047e564a0ff1fa693858ffb 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 dfd5be6347543b8d50c56301f9743290add1d6ef..c7f05f24e29dcd44a9cc0dee4b89367262e87182 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 68a01f31179efede5db474f792bc04cb90f4b10f..732ce972aa2955cb8a8c1821da478132d70dfe4b 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_pr.c b/crypto/asn1/d2i_pr.c
index aa0d6ad6aed076f1f3a609ae21c552a6f4359069..6ec0107380493dcca4abb31285254e700805797c 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 7bc16c7bceb408b8e9deb03dc916ca1958f64a60..8327ac16ca9c77f0b95f882693d9b67effd7dd23 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 6d6bddc651cc738166a51332d8232551f7733422..3a18381173d42b5e2c4b427f2c2e57192d9a1354 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 f893489a67198c3ee475322f76e5448f7a4dad23..53dfec71b5d407478f11a5c2136f50cae7dfaf9c 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_pr.c b/crypto/asn1/i2d_pr.c
index 445b0c84251fe64ac39159c815e6f0cc183e23a6..0374c0bfbdc00f9ec31ee7ecf6f4c0b6ef580e92 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(EVP_PKEY *a, unsigned char **pp)
 {

diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c
index dbee827e0d3788f1ee3f78ab4738d7c896a25f0f..ab509b1ac976d30412261b75aeaac8ab077da092 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 3b2c9df8917f465f5a8ea9ce345d647946f12124..651622aedc8ff4bd67dff0a4645c2b341aa07251 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 30be314ff982a6d68e81d2e554715c96f9d4e8d9..0d32f4d97968569d191d952950e9d6b0593ccebe 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(ASN1_VALUE **pval, unsigned char **out,

diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 1fb66f1062ba648695e1cb16ad8f0640c17dec69..dc0876508bf634552f70b88bb0b3268b86d4eb58 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 853d45b8bc8aac00ce66202f55e3a2a48b6763e7..4c4a718850eed5b58e77996b007b0ed613266a5e 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 e465cf2d4d103931d936322f32341631b429a1b9..fb24e240cba8e9e8ad0b961c162f9de1338d8af0 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/async/async.c b/crypto/async/async.c
index 1d83e4576f81455ca6b9c3c8456bfce8389d2b49..fba15e83e8e7b66a8c5d2e3febda73da307ae085 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 d7790293f74f52d3d0b9af3b472fc2130f5297a3..dd1a85e02684a14c1cbd00497af9ac171d526765 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 9e907fcaa778c65b35f08bed0e9e27b3b00ab16c..8ef90ac1d4f8bda2c764adc00af1e48694f9bafe 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 c493648c3cd08675ba7387a653aa7645e9e7008a..93ed70ce7fca0c4a9dcf66bf3932725937b492cd 100644 (file)
--- a/crypto/blake2/m_blake2b.c
+++ b/crypto/blake2/m_blake2b.c
@@ -21,7 +21,7 @@
 # include <openssl/evp.h>
 # include <openssl/objects.h>
 # include "blake2_locl.h"
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/blake2/m_blake2s.c b/crypto/blake2/m_blake2s.c
index 83b2811e443283651e48e9e9edadffe52c6c4d1c..271068692c0596125e5283e9a63468df49c885ad 100644 (file)
--- a/crypto/blake2/m_blake2s.c
+++ b/crypto/blake2/m_blake2s.c
@@ -21,7 +21,7 @@
 # include <openssl/evp.h>
 # include <openssl/objects.h>
 # include "blake2_locl.h"
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c
index 38acdee234d08f5dcdf621518f03f719d41333b1..3f0af5e49d1d3fb4c88188427eb24369f009cc9f 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 7f823a6178a5bbcf19c767051aabd3a042206718..5e895b0cd12e34fdbc84df9f95a4f19d3a34d964 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_print.c b/crypto/bn/bn_print.c
index 1853269d903df17db2196b436a7c916cef38b30c..89a4ac31e6ac7e914d1896be8200b4577bbc5d8f 100644 (file)
--- a/crypto/bn/bn_print.c
+++ b/crypto/bn/bn_print.c
@@ -8,7 +8,7 @@
  */
 
 #include <stdio.h>
-#include "internal/ctype.h"
+#include "crypto/ctype.h"
 #include <limits.h>
 #include "internal/cryptlib.h"
 #include <openssl/buffer.h>

diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c
index 27b6ebe518ea88aaf16afbdf41e0e8499751908f..de07b045d65e4d483a5c4a0df44d0d5b83086435 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 239f68ab825e3f613169075947dfe50a1319bbf8..afe5b5136a596051dfa6dca523cba7879d03ace3 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 a58454a089c6de6a1d143226ca294c6c3be6f8b9..82adf18c8019b4cd805b1c282dbee39068feb69c 100644 (file)
--- a/crypto/cmac/cm_ameth.c
+++ b/crypto/cmac/cm_ameth.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/cmac.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/cmac/cm_pmeth.c b/crypto/cmac/cm_pmeth.c
index 10748f148859f10408a0c5112a0707a484713660..5574f25be86897993b7f819363ccf1e2a2f532d0 100644 (file)
--- a/crypto/cmac/cm_pmeth.c
+++ b/crypto/cmac/cm_pmeth.c
@@ -13,7 +13,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/evp.h>
 #include <openssl/cmac.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 /* The context structure and "key" is simply a CMAC_CTX */
 

diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 26fb81f79ab1f2b372311a5078059f0c21a3c086..5d8615c03eac5a8c1d37c62d3e6fb626af0d0d25 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_kari.c b/crypto/cms/cms_kari.c
index 5e83814d0fcf6ef5ca85eaca4ba7a22c100ee6fe..7398918317e7f4c95f5590f2fa2c213c67829189 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 26e3bdcf9e41273e432cad1373fd46c6c0e5ded0..159d7880406978312e3400bb7c32fb53b9d3d18d 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 3841513f8bd2374cfcbbb393f311cae6c7d0268c..face7e2aa8fac353f35a73c585668bb063bc55b4 100644 (file)
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -15,8 +15,8 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include "cms_lcl.h"
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 
 /* CMS SignedData Utilities */
 

diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index 10815639f811540b407ef6399393e85ad9319b5d..e0f5dc872a524f98d33d12af5246c069ceb051a4 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 7c1be358fd7364ed0d88e5e6a336a6f8026c64c8..a23d0d0bc2547b78c72027ff48723c3b4f9f24ab 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 2d40ac97ec2756ab4622cdf265a2638334e44d1e..0b7dd26d63b0a0de3f9dbc826409fa96641ea612 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/cryptlib.c b/crypto/cryptlib.c
index 7b761a3adced99ed029fa5d0670df13df59eaf7f..1f36b20c86ed63bd8cce675932363952aeefda79 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 e05f84cd40860a9c00904bf78893a8c10b2ca352..b7f1183f9ccf1df757ca3dc68384c0298d4e6591 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 05a1d4227ee310c3d47cbc42f15fb31f4a8ac6e9..57705e497b484b8be5e576ddc903703faca823f6 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>
 
 /*

diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index 718aa422d9354afd96e8bec89c32d2204a662e05..6aef7f2420292778deacc7c2ff042d1e54f4c543 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 568831f1c2a75e661a2c8727f66bd6feb1e6640d..fc317e274e94b79379da7dcae148a23f17286083 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 c4a219590e9e1e07ef83005b0d3522baea896f5d..94175584356140ce9ed8be10971774f547ed9be0 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 a54b468e552ce11c3304ad322a7a2e888d6d4e0a..09c9ce7b9dbe069f9864fa1d283cda2b56928c10 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 0838c55e4897495a9f6b9ee08072b1ef0fab7d72..e8217893b9edb07d4e8a1fb246dc72028d07c4be 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 49aa1ae23bab0803dd684f77405a36a856a98492..343d0fd5bbef9cb57294d5b6289f2f70cd691c60 100644 (file)
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -14,8 +14,8 @@
 #include "dsa_locl.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"
 
 static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 {

diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index 16161dcadf22bb96493350e054db998e54db5d9f..1d28684e3c4ad3ae14381b96bd03cb921478fad9 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 1dd2fef9beb9046b4b5fbe08f6be67c37a93f55a..a085b902a882545739d69a2694f081554240031e 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 14a0ccb7c0128d488ea36c814afe63feb8fc5881..43b7df9d783294622b23712b94d4f19336c3026d 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 898e741fcb97ed1c6fd00768773670c4b38d02a8..99ba7c13c57a859edad81bff62eb8be56d6b533d 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 c086f47ab3cccb439fdd014f4fc1edacc9e5cdbc..3bd66c400c5e878106e228d3e3fc9e02504eda17 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_lcl.h b/crypto/ec/ec_lcl.h
index fbdb04ea3a0423be3a169ef400c74475eae856bd..e656fbd5e7755d7353c5f1310f70e4fcc0589b01 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 57bdf116f1b68237c20713cd3439bcb6b5be8c08..13fd5b1a33bf7000521fe1fc766235a52270b30b 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 454be16c543911ced87edaa9ecaa8434c44ff644..b7d5cdf3103365c5788146bc13f94d3578f67556 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 c35ed2dcd0e7db109bed53d99be76292c68b592b..f21a6899023998404d8080e55823f2bec0be6064 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(int type, const unsigned char *dgst, int dlen,

diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index 7ad5eb627de12969f83fedd2b55f448f5accbfed..43becb2fecb43fdc04c39884f5c3ba2de828a9f9 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 55429642fd085f99bb363c067e075afe3e5b1671..0504831b111f02570ad1273754601f94a66d8ace 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_devcrypto.c b/crypto/engine/eng_devcrypto.c
index a727c6f646069256c11b34a8b5293cb4f3294199..49e9ce1af33b095418af7db019f297cdc0c8f885 100644 (file)
--- a/crypto/engine/eng_devcrypto.c
+++ b/crypto/engine/eng_devcrypto.c
@@ -22,7 +22,7 @@
 #include <openssl/objects.h>
 #include <crypto/cryptodev.h>
 
-#include "internal/engine.h"
+#include "crypto/engine.h"
 
 /* #define ENGINE_DEVCRYPTO_DEBUG */
 

diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h
index b95483341e2003f35809c98f22a7b77a60ceec37..b5f3b502c16bd1bec6a64b821f9316ecb617815e 100644 (file)
--- a/crypto/engine/eng_int.h
+++ b/crypto/engine/eng_int.h
@@ -12,7 +12,7 @@
 # define HEADER_ENGINE_INT_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 d9b3067a1322273c82229b8542af566bbd7b4b01..baedc732848b67c34ed825490c86ca740acb7b4a 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 261e5debbfd73bd13ccdfe4545de9b08a647dd87..9dceb1671099a1a6b06255786b68110c650b8e49 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 <openssl/rand.h>
 #include <openssl/err.h>
 #include <openssl/crypto.h>

diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index 4bcc76136a1098cc55aab39ec0505a996d206292..9c7e73d65ffc2e936a5bc5df814d80efce056cce 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 3a58ccb9588296ccea3814824d64f62ccd727fa0..ec8a7851afdf7a7226ddc5d589cabafe32d7fe52 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -10,16 +10,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"
 

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index d9ec04b60676c36450b3be48f236317e125d194f..7c0a5f0b9c5fb21cc02ab00e0441737260d26745 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 3e092eae0a2b879627579734666c845cd50a9434..f9f8c404c35910f2963defab1ee724d78c664706 100644 (file)
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -32,7 +32,7 @@ L CMS           include/openssl/cms.h           crypto/cms/cms_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
 
 # additional header files to be scanned for function names

diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index 288dee01b2203ced5b328a729c4e467d32b0df3f..6a78c359a1bddeba6c42d89015fc64da8e5543f8 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 300db6cd320d1abf219e35c94f9b883798581f24..a77cfb1552dea45e7d14040d2b5d34a489cf4676 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 086b3c4d51b4002b7e48c46ae6c0cb1ce8e789f6..22fdcc409c165c2d695f4be6663b7435be34e366 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 1267531a7d23b865cfc30b9b4d08259817a297e2..16ac1b67f465b30468b3bd579190332b41b41dce 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 e2295c4dc589b4a8f7396ff74c4b003e9dab80e2..d635dfca4e383a3cbf19c41afbc6ea5de51c9b7a 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 "evp_locl.h"
 
 EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len)

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 6693f270b69436539b1705eea7c72e4f9f8e6674..d1b127a19d7d24aa6b8be0326b0f9ac0d91fede3 100644 (file)
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -12,7 +12,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/engine.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "evp_locl.h"
 
 /* This call frees resources associated with the context */

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 1db346fc864bb4b424d656ff9ef0a172192e2185..046bc2745a7a9637d4ac61df1ffe81a638e5b914 100644 (file)
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <assert.h>
 #include <openssl/aes.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "modes_lcl.h"
 #include <openssl/rand.h>
 #include "evp_locl.h"

diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index 09d24dc3d02a02435ff5e61bd8d786c16cda5cfa..853c5f9c6f259a5535aa2268e1529d8e9489a32f 100644 (file)
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -18,7 +18,7 @@
 #include <openssl/sha.h>
 #include <openssl/rand.h>
 #include "modes_lcl.h"
-#include "internal/evp_int.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 caac0c9d3da23635e7936969f8719a188d6e73b8..570ec00bc635836dacb7411085f46f6ceea4b269 100644 (file)
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
@@ -20,7 +20,7 @@
 #include <openssl/rand.h>
 #include "modes_lcl.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 fcaceb3bcadf8ee5b4ca586f36f35d6751911221..a6998bad542b6307d61b106115915fae80e5bed3 100644 (file)
--- a/crypto/evp/e_aria.c
+++ b/crypto/evp/e_aria.c
@@ -14,8 +14,8 @@
 # include <openssl/modes.h>
 # include <openssl/rand.h>
 # include <openssl/rand_drbg.h>
-# include "internal/aria.h"
-# include "internal/evp_int.h"
+# include "crypto/aria.h"
+# include "crypto/evp.h"
 # include "modes_lcl.h"
 # include "evp_locl.h"
 

diff --git a/crypto/evp/e_bf.c b/crypto/evp/e_bf.c
index dc386905c5cb27f5ef128dd2e6e94cffc744a18a..9a065582c6c81f5909d568a9c83cb4aec65c7989 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 2df4a6e3e011cf65ec525124825c95a2e852867a..d70d3964cf401884948478b81bfc03ce9933c01e 100644 (file)
--- a/crypto/evp/e_camellia.c
+++ b/crypto/evp/e_camellia.c
@@ -17,7 +17,7 @@ NON_EMPTY_TRANSLATION_UNIT
 # include <string.h>
 # include <assert.h>
 # include <openssl/camellia.h>
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include "modes_lcl.h"
 
 static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

diff --git a/crypto/evp/e_cast.c b/crypto/evp/e_cast.c
index 259d44059b20157b9120d282b12294de4e02d04c..df9f445bd0a2f83faf1476cb48cfbe90c96a8eec 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 435a38d3658d34901814ab06122a3037d7088f05..5d7dca3ba6d31dd29cd396578908d62093460c0a 100644 (file)
--- a/crypto/evp/e_chacha20_poly1305.c
+++ b/crypto/evp/e_chacha20_poly1305.c
@@ -15,8 +15,8 @@
 # include <openssl/evp.h>
 # include <openssl/objects.h>
 # include "evp_locl.h"
-# include "internal/evp_int.h"
-# include "internal/chacha.h"
+# include "crypto/evp.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 c13fb3e25a9b24c7a13e184860e54497a20fe72b..6d6e919af69626ba561513165ad86bf92b8b69bf 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 6b492ce47023904c08f98440c291d9c9dd8cb871..bb426bd9b4c315faa8c0b4a177723e5be3eb2f4a 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 93f6a4131fa88992e59cf148b9b01238d1d665d5..1068378ddc751040e63428760c9975b321a5edbd 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 18a8468216a01eb6280ae9156fb14fa2147f15b0..0725454a3a4ab59b0c4232d605f21dfe86ead4f8 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 aa0d1401868782fb9aee1a194ce5ac067014a4ce..4d8a0ee4b0151276e960bc7e8abdc209b27e9378 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 d16abdd0d2d75d8a751daadad0711085f2055415..c24bc8fe5982bac62d8b7ce54c6bada59621fcc2 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 b1e8ccd6ddca8f4c72452a0c380668c8fcbb03c7..201ce443435c7c647d0d5920a033a95109e2210a 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 dc5589b68813819291622d428ef9319ab5cf4c43..a10533919098f986201d5a325042d220dca83a8d 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 40aec5fc6ac09b1db940d6ca23afc21edbc1d8d3..aeb2363beadea1a38e25fa67687ed8b6139c0489 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 79deb6563646c3e888b5853a947269b3c87256bb..fce32794fc51405c1b3e69d272aefff5ec11e5cc 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 57ce813da824fdd30c9fa1086ebdcd0377bfd3ea..b730775422645dbb7304794a8dc6fb08d376b5f1 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 da32d4fd19734efb3934c532637508183452d426..e70f80f5c95addd1310821007deaa6cb330e7882 100644 (file)
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -12,7 +12,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #include "evp_locl.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 static unsigned char conv_ascii2bin(unsigned char a,
                                     const unsigned char *table);

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 05dd791b6cb07767a6b2d52056efa43e428ca441..ddf3045f56bc8127a9feecbadf8d433097e1f362 100644 (file)
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -15,7 +15,7 @@
 #include <openssl/rand.h>
 #include <openssl/rand_drbg.h>
 #include <openssl/engine.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 #include "evp_locl.h"
 
 int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c)

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 4935c2a94a1a674875353d39de9550b316e55ca1..1931e5a3a97dc02febc356b891acf061644bf796 100644 (file)
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.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"
 #include "evp_locl.h"
 
 int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)

diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index e61a8761a92d291e18616a8dd3de519c33e0308e..586b74605cbd9014e335fb13d679c3348f0e0e2c 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/m_md2.c b/crypto/evp/m_md2.c
index c4e28ae17af2316313364d7db3788ef7012b50ad..1aec5185239dc509d537be5fcd513f7b84ba80ea 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 0efc586dbaff0b8a9724e09d111c0919aabb1d64..45d2cafee101bee468f629196d870b21dc319488 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 3d96ae93b6c4a5b4b804567aa4e4a8394e17703d..d26b5a4d31dce9b3a8498a5afdc0ad65fca3e884 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 2d98886ba0e7cda7624c2cbd3b8e6384f98efe77..eeec2b13e9ed05df4b8067e7f0969a488d829d3a 100644 (file)
--- a/crypto/evp/m_md5_sha1.c
+++ b/crypto/evp/m_md5_sha1.c
@@ -15,7 +15,7 @@
 # include <openssl/md5.h>
 # include <openssl/sha.h>
 # include "internal/cryptlib.h"
-# include "internal/evp_int.h"
+# include "crypto/evp.h"
 # include <openssl/rsa.h>
 
 struct md5_sha1_ctx {

diff --git a/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c
index 1051a9070f973d8958ca53963942d4a5732a7930..fffa751efd1851cfdb8a2a0388b61ed68a9ddc03 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 5dce1d510e28c904c07fe1ba22e1785f4d260243..0847139df17b449193640d4828ff51b2db2db89a 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 7ab320843cee97b11a90f2c286197e8e2e95191c..d93ad24fe58a7a09bc0662c9f99ca369c80f7f89 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 ac52417855b3a7942e632e70c9aeeda07769c58e..22b9bbc7d861cae11e1cbcc3c1b1065808b4fa15 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 01cf57d313d08c1100e823c71218b2776f7234a6..e0f8e9e416a3e8f7e46985821cf2289fbffe9951 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 "evp_locl.h"
 
 size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 94e37f02b22eb4f3bd9e40b8499ec3e8834a360d..e16546f7e098fcf8116433f1aa94d27795883c4d 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 27e2b3c5cab8a3a5a2c023a9cec49f8b827d6fd1..5ce15d2d5e57deeda4343e9ec9049d13e746149f 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/names.c b/crypto/evp/names.c
index 077c2a6c4b9a385ba5a4a07bed6c7d295610c98d..90c7b73b7a496c9b22d1d5ef21ed5b4d5264ee99 100644 (file)
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -10,9 +10,9 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/evp.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/p_lib.c b/crypto/evp/p_lib.c
index 3cd7ca8d54ca918992f5a603ddb40428ebf9b84a..e57fa9e289c90276380fa0c52e67ff29f8a46af5 100644 (file)
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -21,8 +21,8 @@
 #include <openssl/cmac.h>
 #include <openssl/engine.h>
 
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.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 6cb442e4f91df02ece50fb948c7d65ef50a3930f..0383294a87c883c759c53996dcd3a92a302fa0db 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 6e8c565dfd6b98a6feaea1bdee777d3c2870d082..e27196f7c2e6a3c3e6287c007e3dbad9f397ef38 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/pmeth_fn.c b/crypto/evp/pmeth_fn.c
index de1c07e171144b1ee5b7e812dabad96fa24b7d90..02f4093461d892e482948b3f3840e66001f9b2eb 100644 (file)
--- a/crypto/evp/pmeth_fn.c
+++ b/crypto/evp/pmeth_fn.c
@@ -12,7 +12,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 #define M_check_autoarg(ctx, arg, arglen, err) \
     if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) {           \

diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c
index e14965f33384537ac2c2819c3d0cadf17628e66a..3ad6d5c7c7a0287f32f83288b1e07fe571a05c6b 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 7fbf895e0732162318c368d3944f316146fc17b7..d44063de53c7fa7973b9653edfdd297ce9faf3f2 100644 (file)
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -13,8 +13,8 @@
 #include <openssl/engine.h>
 #include <openssl/evp.h>
 #include <openssl/x509v3.h>
-#include "internal/asn1_int.h"
-#include "internal/evp_int.h"
+#include "crypto/asn1.h"
+#include "crypto/evp.h"
 #include "internal/numbers.h"
 
 typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);

diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 08dc7c40734decef18b7de84b996fd6e6123c5fc..22f3b70edf14e3666a8108170de7c3f9dcc8373d 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"
 
 /*

diff --git a/crypto/hmac/hm_ameth.c b/crypto/hmac/hm_ameth.c
index fa204e9068e402742fc06d8a9473e835dbbf769e..638f61b5863aef658fc5bb6757d93d578f525bfb 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/hmac/hm_pmeth.c b/crypto/hmac/hm_pmeth.c
index 55dd27d63b5ce568d005b4c215158e2bf7d1ad32..56f98707f5399943b02da89feef371b1991a101c 100644 (file)
--- a/crypto/hmac/hm_pmeth.c
+++ b/crypto/hmac/hm_pmeth.c
@@ -14,7 +14,7 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 /* HMAC pkey context structure */
 

diff --git a/crypto/include/internal/store.h b/crypto/include/internal/store.h
deleted file mode 100644 (file)
index f5013dc..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 OpenSSL license (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/init.c b/crypto/init.c
index 9fc0e8ef68aadbbcac562541e4f51b7dee98bb4a..1b0d523beae0f384607092c41d91f8b7e7801402 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"
 
 static int stopped = 0;
 

diff --git a/crypto/kdf/hkdf.c b/crypto/kdf/hkdf.c
index ae46fad609ac994cc732a64bc11b5075cb8ddeb4..25bf4b729f64ce5f63a3213752363257f5904644 100644 (file)
--- a/crypto/kdf/hkdf.c
+++ b/crypto/kdf/hkdf.c
@@ -13,7 +13,7 @@
 #include <openssl/kdf.h>
 #include <openssl/evp.h>
 #include "internal/cryptlib.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 #define HKDF_MAXBUF 1024
 

diff --git a/crypto/kdf/scrypt.c b/crypto/kdf/scrypt.c
index 61fd390e95f076802d302c644b61018389034413..68606ac00aed098233c8958111cb651c7e47b44d 100644 (file)
--- a/crypto/kdf/scrypt.c
+++ b/crypto/kdf/scrypt.c
@@ -13,7 +13,7 @@
 #include <openssl/kdf.h>
 #include <openssl/evp.h>
 #include "internal/cryptlib.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 #ifndef OPENSSL_NO_SCRYPT
 

diff --git a/crypto/kdf/tls1_prf.c b/crypto/kdf/tls1_prf.c
index 49f7ecced90615be1928273661089e63622301f2..e9ca8e12780bc72b519fb76f7fd4b266f57128e2 100644 (file)
--- a/crypto/kdf/tls1_prf.c
+++ b/crypto/kdf/tls1_prf.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/kdf.h>
 #include <openssl/evp.h>
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 static int tls1_prf_alg(const EVP_MD *md,
                         const unsigned char *sec, size_t slen,

diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index 485d4c3ffff4542b42a366344572eaf442ce634a..65e73226ae75d72ddd68c2d8f70f37fbf3d225f5 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 a6c4003fdbc295b3c34d41e51717724a26b1db22..391fee8869e8fe03fd1d9f1cd040057494c5f5d9 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 4eb7e50ef4d0f03d034b32487e1be93cd7194590..9e537ed15b1fa57d4e555c857067341cf558f49b 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 780053ffeff1e2723eec5e44dbbff69d2d1b0e9a..2b39ca3a10498e23d6788a8825ad84a1c792f33e 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/objects/o_names.c b/crypto/objects/o_names.c
index c4355370cb154b0c0e77369590acc25e48c133d4..e04a075977f32e62af367c9aa9dea81887de2f34 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 ef2d1e0ddaf2c14bac67714a001158bd1705e015..6e6b9c373bbc30989d5fedb1ac4238838ecabc6a 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 acbdeec2c9806b4a5a9b729057c275e3d62565de..456a1598cec5ddb7b8d1d59f50b817fdee416c4a 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 42c3686431353401723fdcd2e7771eadc6e2039d..ba408bc86f988d330e873129aa5faee456e768f3 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 4bb86463fae5f2d7ba670cd854f41945aa7e136a..64baf7108ea4f90aa9211f62a0da58316b505739 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 aa032d2b1cac2822738b2f54e60e4ea79d0407f9..e58cdf4a3e0bff47e41d50d6a513c09fd2847bc4 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 86a07e1335e4ddce29cfc2cf8aa56f6053058bec..05fc388a99694af964342efd253dec654bfb1ca6 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 16b76431d1bd3c5881cd613277c5ee872ea290f7..ec4d9abd587f28506dde5777a0fe74b6c9c564dc 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 1d182364aee4359f5122776177063de68392a823..b01d0cfbd3db6cac7b26f0a0f5c595c00062305d 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 033ee8cd9699738705c1c06d3908e79fa67e37ba..0c8a91dc79dcc56682d76890415c6728520324db 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/poly1305/poly1305_pmeth.c b/crypto/poly1305/poly1305_pmeth.c
index 3bc24c98cd614705fadb005a57f8f050bd68f6e1..49a799a12f518dcbaa68088707afa582bffe4ab6 100644 (file)
--- a/crypto/poly1305/poly1305_pmeth.c
+++ b/crypto/poly1305/poly1305_pmeth.c
@@ -13,9 +13,9 @@
 #include <openssl/x509v3.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
-#include "internal/poly1305.h"
+#include "crypto/poly1305.h"
 #include "poly1305_local.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 /* POLY1305 pkey context structure */
 

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index a59485207b167d23fa9dc31aa9f9c9c20e0f44c0..e4a1441978a0c209414016b8ad79872638105928 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/rand/drbg_lib.c b/crypto/rand/drbg_lib.c
index 12bb627a04efab8e85f5de2c8f14104af4f5c7c1..24fd6b2cbb5f0f75c2259c752aa8de61dbf08ea1 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_lib.c b/crypto/rand/rand_lib.c
index 91b26523110f344b92718116a3fc1bde0b55acd7..74b31bedcb02213e8ea29a226d57aac9664eb0d7 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 69efcdeed752d726d64a730f04e0f74f345c871e..1da09107c64b1bfd10505287af8120d638381632 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 e1e1c0b9db8de93ce28b5156f67ea63729317310..63ccc55d8f8c1760e3112246e2f7a9082a35e427 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_win.c b/crypto/rand/rand_win.c
index a9c5751f1a2bc4a5295c95c1d65e8cd6d5e8cd30..5a1f8a7b2527de04ba646b382685b477686a662d 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 f1ae4323ca9bf4ddf289521790c65b37bea02d9b..a4fb54d89aae61d1c699d8c483e385a4a96f265a 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 9dcb85d837573e9523eb222f93dceb818e7608c5..fe49a61ab638501c1210c827301a5af7b32c7fde 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 f4ef8b4381f71e873963970fd8258ad70c5743bd..52abfaed71b90d53a0a72f5a719a7d6de1d0290c 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 e737a28898cc851c68afc542de0459351dd25e7f..709a3856d452de526a26a2075fde8b3679c67dde 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 c8c3b7886aa9a5aaa0a66b610af965fb5de2fe5b..01c712bab71a051ae8210b45242f7849058da9df 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 082ab8fd8a1f256e67be96b69afc31a22749e733..aabd245f11f1ce346363c576b3b5e7a65189f831 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 952d24fb8ae4142426256d474b94f9167623588b..e3cc2d4829272996f76ef8d00980d1ebd196cb48 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/sha/sha256.c b/crypto/sha/sha256.c
index bf78f075eefbc83e52509f77c5349f38322d737a..11050ba5471466fc294f0b25899e32026555bd3d 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 50b65ee811d66122d08f667319c21a7e51f12520..ca1f387a64f8a75fd45095b93ef38ffafb0ac733 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 4e5a0903826789868829f10b7a439367a51bb3f4..6edb9ef1d27e53d79ac90ccbb5e49a461178cd2e 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 be74a38d934df78aadd235bd15c91129d0b4b568..07d94c1e6e59d5ef97d7a23223b21efc4a23a2b1 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 c0ab7efae4b6d36bb17148c7ce69fa05991ab818..2da6dfec8025d33d7cdb9e9b12bf70e04aafc65f 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/siphash/siphash_pmeth.c b/crypto/siphash/siphash_pmeth.c
index 66e552fec5e511142df9a8fcf1b2b8d1d1bbe84d..0c7d2c61902cae36aae6c42d4517343c0ee97838 100644 (file)
--- a/crypto/siphash/siphash_pmeth.c
+++ b/crypto/siphash/siphash_pmeth.c
@@ -13,9 +13,9 @@
 #include <openssl/x509v3.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
-#include "internal/siphash.h"
+#include "crypto/siphash.h"
 #include "siphash_local.h"
-#include "internal/evp_int.h"
+#include "crypto/evp.h"
 
 /* SIPHASH pkey context structure */
 

diff --git a/crypto/sm2/sm2_crypt.c b/crypto/sm2/sm2_crypt.c
index 4389fc731edd8917ec1ef61194fe7cdde394860a..ef505f64412bdcd8d5cd95f423f3ee23d030a3e0 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 653c6797f86f23eab9a030381b16124c456c9654..e5973e9c7140c546a0d85200ebee9ab0f0d14e5c 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 d187699cc411705042b4ee1029050b7745438a16..62a5b5534df6978cb654ea4e185ecaf34e1b2910 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 50ecb4d68cc65bb073358dc009b6062ee76a2400..683f03f93580ad7822b237bcfd6445e5d8407283 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 85538dc8af06a30b9d82945bff15fbcac2c185bd..7e54f4298431c8e2c8f9222b28ed4e0809bbe2fa 100644 (file)
--- a/crypto/sm3/m_sm3.c
+++ b/crypto/sm3/m_sm3.c
@@ -12,8 +12,8 @@
 
 #ifndef OPENSSL_NO_SM3
 # include <openssl/evp.h>
-# include "internal/evp_int.h"
-# include "internal/sm3.h"
+# include "crypto/evp.h"
+# include "crypto/sm3.h"
 
 static int init(EVP_MD_CTX *ctx)
 {

diff --git a/crypto/sm3/sm3_locl.h b/crypto/sm3/sm3_locl.h
index efa6db57c6cdd84999e3ab84e4f4ba60c57bd68b..7171de510de3b7f9f15d83877d9b238c287b085e 100644 (file)
--- a/crypto/sm3/sm3_locl.h
+++ b/crypto/sm3/sm3_locl.h
@@ -10,7 +10,7 @@
  */
 
 #include <string.h>
-#include "internal/sm3.h"
+#include "crypto/sm3.h"
 
 #define DATA_ORDER_IS_BIG_ENDIAN
 
@@ -36,7 +36,7 @@
 
 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 0c819a4b68eb3645af27b692fe0c86dfc025f2d2..5750e763319a0a18483bef74114fa4112df206e6 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/srp/srp_lib.c b/crypto/srp/srp_lib.c
index ca20f6d09798157baaf5c5b6816c03d4803a62a0..4f417de0c98970ac6f0a750e1472c12a2c7b8ae7 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 eb279dd4187a22dc0dc0376adcd22f160ba0169f..3dd2ab05075718313217a330ef1284c5c49def63 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 6f569ee62d71df51205810e8a4b2de86eca48315..bb3410dfd45dd52f8b27f3562bab029bf4e2a77e 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 b398bf598ff6d971783f1ec25c0599cd67656099..5f81ef19b1e98b2466cc70e22b543e2914a8532d 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 7de2e31f556f7584257b323af0495b1fa43baad9..ddbc1e0091dc2ac22377b80223c45211a9a1217f 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 e68cb3c568537651e85d1736b82ce78d98530b22..79c4fcce9cb97b2318647c883204eb3790b52553 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/x509/by_dir.c b/crypto/x509/by_dir.c
index b691a83a0dfbd907cfe94efa5a2aa671eacfee74..aaaecdfcd41f473b754651196ae8b2a30613e3f9 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/t_x509.c b/crypto/x509/t_x509.c
index ccacbe7cbf8f4ec4626855246ec11fdcbab244e6..12d807f705ede509bacc0bdedd8f610410a2bc0e 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/x509_cmp.c b/crypto/x509/x509_cmp.c
index 833bfce1bf23a8437e4a477253bfc9ad562892f6..e06489c3347b946262755f5955de34634ad2f216 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 2db843760c6895d6b2cd4ba72a27ec30294fb5a5..4cdab724eadf05cca7e2bf39e9bd14980243666e 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 b7d2e66574c4543dbaf022f48408269b134ace43..658fad34dfa2cdb4f4cd521a29e7fac1fd74a3ac 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 85c39415c11e9f9384bb0f9e526d5389ccef0478..f54d483cc4ddc3c43dceb471f888f8cc54b57a4b 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 3d72787d3164dd1e371c5ceed1fbff9a9b752eee..6b1623feacb719b05fd3d924fefacacd46f7051f 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 0bdbb81db894d0983ce840aea4887bd106fdbbb5..7ba0f26495f97669b3392285b6f1fc61c45b63ae 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 3ab6bf35115ffaa684b1e212c013622748688076..01ebec9721998e499fff6b2f7612b76da5d0a854 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 d749af4d590a6c020b9e94c6ce6b81ef5932f21e..9e199d63e46a31e18d9944a76e038655a35422f5 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 6be2c71e8692bffc7d0241545b637d7840410852..db0d9ae2d45a99c7c5c257e4351183a9e82ce6e7 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 aea186295c2a026d857f99a1faf0f34b92f4cf9e..12a78e784c5089de61b3fc1793ff73fae438e037 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 7645ce37597061700b334d978c64d93733b03165..6c08509138d5fc4a56cfb6835d1176c3350c8b68 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 64a73e793fdf5cb275ab7d41538a59e71b3ffd66..c86d8e7914f114cfcfc8e2a04ce9d20558c0f726 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 e8921b82a8386534b93b4840ca94db5289595681..9da3f2ee27dfd814f1bfb56f1eea247eee7a4670 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 24e4114601caec89d2b09fa17ffba0f8734ab20d..6cccfa99d1a62e24b96964dff1979439cc6e2742 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>

diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c
index 12ab3cca42c0522385837f7b376e0a6cbf435e5d..ad41d140998f534eb39c65299776d8779053c536 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 a1e9bbdb669d0cbdda5f61a35cf95077eac5b2b8..ef2a275876f60dfae1582b5be701c6419a0bb4aa 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 1c87b8268eb57c3d8e1688e941517d864f478dd2..4f694b93fb0038043ee4793a3fff014ff337daeb 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 c2da95a73ecf7d62e1c1342fb42c02738e740438..d2b02f6dae86d8e2cb151d8c616b3cafe114e47c 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 afe59c46c51884b60f680091c0640a1100e3b000..7aa8b77ae73a2e8cad85d1dcfe6dcc68c15e2719 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 8c9ad71d1b2924e396ce8b302d69d0e3b615505d..c5175faef7afa01ada27ebd8bd0855ddd8ae639e 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/crypto/x509v3/pcy_cache.c b/crypto/x509v3/pcy_cache.c
index 623870b1f6f5c00109233d7e394aaf5eccb50d7b..6a4db420511aee458016cfa9dfb13dee3806efb4 100644 (file)
--- a/crypto/x509v3/pcy_cache.c
+++ b/crypto/x509v3/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/x509v3/pcy_map.c b/crypto/x509v3/pcy_map.c
index ab9dd21b7d939014eaeb6c739784d077219435af..4fc3eb6d42665947d097c46f9dfa8b211b9db3d9 100644 (file)
--- a/crypto/x509v3/pcy_map.c
+++ b/crypto/x509v3/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/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c
index bb58e0484611a4f0f40868a01671c78a265267ad..4258dbc40c0f2f0cfa2dd5207dff228225e89cae 100644 (file)
--- a/crypto/x509v3/v3_addr.c
+++ b/crypto/x509v3/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/x509v3/v3_asid.c b/crypto/x509v3/v3_asid.c
index ef2d64826fb6b742f5c46a3d391b5da20b6881e0..ac6857267291fbe2f61e972fdd5a6c5c89c6ff3b 100644 (file)
--- a/crypto/x509v3/v3_asid.c
+++ b/crypto/x509v3/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/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c
index 7acaebfa2250ea7ea0943a05f682e89283bac8ed..e93de3454604ff36f376c4f346760ba919bdff67 100644 (file)
--- a/crypto/x509v3/v3_conf.c
+++ b/crypto/x509v3/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/x509v3/v3_crld.c b/crypto/x509v3/v3_crld.c
index 6cba4240abf1e046eeb7d86b315fde85e95ac899..4854748ffb51a224f732468d6d72cae26e9bb6f0 100644 (file)
--- a/crypto/x509v3/v3_crld.c
+++ b/crypto/x509v3/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/x509v3/v3_ncons.c b/crypto/x509v3/v3_ncons.c
index 9a2cd5af00c7bd54ec05f936e9451a38d4d1b881..2a7b4f0992a81382e41c6e3d89833caf34b8d0d8 100644 (file)
--- a/crypto/x509v3/v3_ncons.c
+++ b/crypto/x509v3/v3_ncons.c
@@ -10,12 +10,12 @@
 #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 "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/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c
index 2f06289d1949c01b7ddad610527ef0c8370da234..3f60c2ea1da336fb74e8853c154f6362c6a83404 100644 (file)
--- a/crypto/x509v3/v3_purp.c
+++ b/crypto/x509v3/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/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c
index 749f51b2f00eea9222b6afac1fe94e80e77a5997..c2e82045682a16c9ebaf2cc9ca1cbdcd6288d893 100644 (file)
--- a/crypto/x509v3/v3_skey.c
+++ b/crypto/x509v3/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/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index c9b40d2c76eb6b2864fdd0ab0c7b258c098d62bd..7281a7b917a8cc127ef019cd8339ffb5eb6e1e51 100644 (file)
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/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/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/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/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/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/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/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/sm3.h b/include/crypto/sm3.h
similarity index 100%
rename from crypto/include/internal/sm3.h
rename to include/crypto/sm3.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/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 6f31e019ea219d044005943a6569df6a73763eae..81c075b92b844a522b73b1d30a69c1831c63e746 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 OpenSSL license (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/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 63278040b60650ac89b4866e6c7241da0c5b6005..865e0584219e94ed59c574827c7c11ce02bbcd1f 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/build.info b/test/build.info
index 1727f28626937ba941a606f2fd18d190f90113e0..a1822ab706a0263e1df11da001e106a8186e2099 100644 (file)
--- a/test/build.info
+++ b/test/build.info
@@ -491,7 +491,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
     DEPEND[wpackettest]=../libcrypto ../libssl.a libtestutil.a
 
     SOURCE[ctype_internal_test]=ctype_internal_test.c
-    INCLUDE[ctype_internal_test]=.. ../crypto/include ../include
+    INCLUDE[ctype_internal_test]=.. ../include
     DEPEND[ctype_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[siphash_internal_test]=siphash_internal_test.c

diff --git a/test/chacha_internal_test.c b/test/chacha_internal_test.c
index be4401218771d6790599331a2d18c64d62042ced..dcb3c23728dfead170090a575a8b53ad9ebaf949 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 a4613031fe5980ebe4979f272dca19ae7de33329..1bb61ab1fc9b443473f5193f006d093482df18ce 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 7325e2ffa38fee87c851f200089f0fde5bf53926..9f04a68f0e6556ca5a4fad5c23f1c4d68fcf3267 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 3ae6408f0967b58bd850a1524ddcf6b1a0d2008f..88aba1a4ac37c36055ace2f82208746e07e18b33 100644 (file)
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -20,7 +20,7 @@
 #include <openssl/kdf.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/poly1305_internal_test.c b/test/poly1305_internal_test.c
index 7f7a9e39c5bf4a755e575ff1a04633bf50a073aa..2b6a529baaab4f1e5b82dfcc9b94db38ce1f0bd6 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 86bbfcd849f4e41971e109f8bd2b8eb513be6302..9649a941ad9707c3a1fecbde425e714761cd598a 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 ae9082bc7e6274ab72568a876dcbf5071699c080..be86ee119c3e6c243ccd443e93309933700c9df0 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 015fa85e68377c35ea54f7e8f7c47773681079f5..952f688e8b144848283d7af830017d590075b7be 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 2f3eaecbced1710fd98a0b758860338e4f2209cc..ce61b564284cc2e83500336f5f6208c20c1c7b03 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)
 {