diff options
| author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 00:45:33 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 20:26:34 +0200 |
| commit | 25f2138b0ab54a65ba713c093ca3734d88f7cb51 (patch) | |
| tree | 0438d0f46a6a591d5833d74e0ccd9cb5da24fa2b | |
| parent | Add legacy include guard manually to opensslconf.h.in (diff) | |
| download | openssl-25f2138b0ab54a65ba713c093ca3734d88f7cb51.tar.xz openssl-25f2138b0ab54a65ba713c093ca3734d88f7cb51.zip | |
Reorganize private crypto header files
Currently, there are two different directories which contain internal
header files of libcrypto which are meant to be shared internally:
While header files in 'include/internal' are intended to be shared
between libcrypto and libssl, the files in 'crypto/include/internal'
are intended to be shared inside libcrypto only.
To make things complicated, the include search path is set up in such
a way that the directive #include "internal/file.h" could refer to
a file in either of these two directoroes. This makes it necessary
in some cases to add a '_int.h' suffix to some files to resolve this
ambiguity:
#include "internal/file.h" # located in 'include/internal'
#include "internal/file_int.h" # located in 'crypto/include/internal'
This commit moves the private crypto headers from
'crypto/include/internal' to 'include/crypto'
As a result, the include directives become unambiguous
#include "internal/file.h" # located in 'include/internal'
#include "crypto/file.h" # located in 'include/crypto'
hence the superfluous '_int.h' suffixes can be stripped.
The files 'store_int.h' and 'store.h' need to be treated specially;
they are joined into a single file.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9333)
329 files changed, 398 insertions, 406 deletions
diff --git a/.gitignore b/.gitignore index 9fdd588e4f..50f461533e 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,7 @@ Makefile # Auto generated headers /crypto/buildinf.h -/crypto/include/internal/*_conf.h +/include/crypto/*_conf.h /openssl/include/opensslconf.h /util/domd diff --git a/build.info b/build.info index a0ecb21881..83dc6ed164 100644 --- a/build.info +++ b/build.info @@ -3,20 +3,20 @@ SUBDIRS=crypto ssl apps test util tools fuzz engines providers LIBS=libcrypto libssl -INCLUDE[libcrypto]=. crypto/include include +INCLUDE[libcrypto]=. include INCLUDE[libssl]=. include DEPEND[libssl]=libcrypto # Empty DEPEND "indices" means the dependencies are expected to be built # unconditionally before anything else. -DEPEND[]=include/openssl/opensslconf.h crypto/include/internal/bn_conf.h \ - crypto/include/internal/dso_conf.h doc/man7/openssl_user_macros.pod +DEPEND[]=include/openssl/opensslconf.h include/crypto/bn_conf.h \ + include/crypto/dso_conf.h doc/man7/openssl_user_macros.pod DEPEND[include/openssl/opensslconf.h]=configdata.pm GENERATE[include/openssl/opensslconf.h]=include/openssl/opensslconf.h.in -DEPEND[crypto/include/internal/bn_conf.h]=configdata.pm -GENERATE[crypto/include/internal/bn_conf.h]=crypto/include/internal/bn_conf.h.in -DEPEND[crypto/include/internal/dso_conf.h]=configdata.pm -GENERATE[crypto/include/internal/dso_conf.h]=crypto/include/internal/dso_conf.h.in +DEPEND[include/crypto/bn_conf.h]=configdata.pm +GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in +DEPEND[include/crypto/dso_conf.h]=configdata.pm +GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in DEPEND[doc/man7/openssl_user_macros.pod]=configdata.pm GENERATE[doc/man7/openssl_user_macros.pod]=doc/man7/openssl_user_macros.pod.in diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c index 67bd8d95d8..c1b2254af7 100644 --- 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 a8d80090cf..186e7ec413 100644 --- 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 ea08edc219..122cafd02c 100644 --- 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 913fa9a14d..cc5541081e 100644 --- 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 516f091916..328e0abcc5 100644 --- 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 e2ef60f773..fdf25b204b 100644 --- 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 4f431480c2..91d78c6634 100644 --- 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 16f0cc3fe3..af060c4fc3 100644 --- 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 d26c523600..9484bccf4c 100644 --- 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 b2bcd5acac..4295d889cb 100644 --- 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 5c3493832b..571523e127 100644 --- 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 251a7efcc6..90f8076048 100644 --- a/crypto/asn1/asn_moid.c +++ b/crypto/asn1/asn_moid.c @@ -8,13 +8,13 @@ */ #include <stdio.h> -#include "internal/ctype.h" +#include "crypto/ctype.h" #include <openssl/crypto.h> #include "internal/cryptlib.h" #include <openssl/conf.h> #include <openssl/x509.h> -#include "internal/asn1_int.h" -#include "internal/objects.h" +#include "crypto/asn1.h" +#include "crypto/objects.h" /* Simple ASN1 OID module: add all objects in a given section */ diff --git a/crypto/asn1/d2i_param.c b/crypto/asn1/d2i_param.c index e852470a66..c82b4a8fa8 100644 --- a/crypto/asn1/d2i_param.c +++ b/crypto/asn1/d2i_param.c @@ -11,8 +11,8 @@ #include "internal/cryptlib.h" #include <openssl/evp.h> #include <openssl/asn1.h> -#include "internal/evp_int.h" -#include "internal/asn1_int.h" +#include "crypto/evp.h" +#include "crypto/asn1.h" EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp, long length) diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index c683f62c47..b24f99118e 100644 --- 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 8876878fd0..4b26ec0400 100644 --- 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 de7d983695..295ecb6fc5 100644 --- 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 dbca0c0613..0b930dfd0a 100644 --- a/crypto/asn1/f_string.c +++ b/crypto/asn1/f_string.c @@ -8,7 +8,7 @@ */ #include <stdio.h> -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/cryptlib.h" #include <openssl/buffer.h> #include <openssl/asn1.h> diff --git a/crypto/asn1/i2d_param.c b/crypto/asn1/i2d_param.c index 2e9000891a..1e1ebc95b2 100644 --- a/crypto/asn1/i2d_param.c +++ b/crypto/asn1/i2d_param.c @@ -12,8 +12,8 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/asn1.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" int i2d_KeyParams(const EVP_PKEY *a, unsigned char **pp) { diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c index 7133d3da9c..4decdb1dd7 100644 --- a/crypto/asn1/i2d_pr.c +++ b/crypto/asn1/i2d_pr.c @@ -11,8 +11,8 @@ #include "internal/cryptlib.h" #include <openssl/evp.h> #include <openssl/x509.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" int i2d_PrivateKey(const EVP_PKEY *a, unsigned char **pp) { diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c index 94b32646cc..c55353ae11 100644 --- 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 483dd10921..03579c877c 100644 --- 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 8ab9c370fd..0ca8460580 100644 --- a/crypto/asn1/tasn_enc.c +++ b/crypto/asn1/tasn_enc.c @@ -13,7 +13,7 @@ #include <openssl/asn1.h> #include <openssl/asn1t.h> #include <openssl/objects.h> -#include "internal/asn1_int.h" +#include "crypto/asn1.h" #include "asn1_locl.h" static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out, diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c index 0f56fb092d..149300e4fb 100644 --- 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 77363fe75d..94c2aa3a2b 100644 --- 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 f8ca810fbe..759a956653 100644 --- a/crypto/asn1/x_sig.c +++ b/crypto/asn1/x_sig.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include <openssl/asn1t.h> #include <openssl/x509.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" ASN1_SEQUENCE(X509_SIG) = { ASN1_SIMPLE(X509_SIG, algor, X509_ALGOR), diff --git a/crypto/asn1_dsa.c b/crypto/asn1_dsa.c index 8423ff883f..972a9eb905 100644 --- a/crypto/asn1_dsa.c +++ b/crypto/asn1_dsa.c @@ -23,7 +23,7 @@ #include <openssl/crypto.h> #include <openssl/bn.h> -#include "internal/asn1_dsa.h" +#include "crypto/asn1_dsa.h" #include "internal/packet.h" #define ID_SEQUENCE 0x30 diff --git a/crypto/async/async.c b/crypto/async/async.c index 43b16a7b7c..7490419586 100644 --- 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 85dfcfa632..549a27e611 100644 --- 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 438cd0e636..0d6fafcc2d 100644 --- 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 b429d2d7f2..816dd06b6c 100644 --- a/crypto/blake2/m_blake2b.c +++ b/crypto/blake2/m_blake2b.c @@ -11,7 +11,7 @@ # include <stddef.h> # include <openssl/obj_mac.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include "internal/blake2.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/blake2/m_blake2s.c b/crypto/blake2/m_blake2s.c index dd4b68fa1c..caf8a6657a 100644 --- a/crypto/blake2/m_blake2s.c +++ b/crypto/blake2/m_blake2s.c @@ -11,7 +11,7 @@ # include <stddef.h> # include <openssl/obj_mac.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include "internal/blake2.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/bn/bn_conv.c b/crypto/bn/bn_conv.c index 9219fa4cb8..3c5ae75ef7 100644 --- a/crypto/bn/bn_conv.c +++ b/crypto/bn/bn_conv.c @@ -8,7 +8,7 @@ */ #include <openssl/err.h> -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "bn_lcl.h" static const char Hex[] = "0123456789ABCDEF"; diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c index 668be57a18..4e97a98779 100644 --- a/crypto/bn/bn_dh.c +++ b/crypto/bn/bn_dh.c @@ -12,7 +12,7 @@ #ifndef OPENSSL_NO_DH #include <openssl/dh.h> -#include "internal/bn_dh.h" +#include "crypto/bn_dh.h" /* DH parameters from RFC5114 */ # if BN_BITS2 == 64 diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index 38e66ab123..2640f3416f 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -18,10 +18,10 @@ # include <openssl/opensslconf.h> # if !defined(OPENSSL_SYS_UEFI) -# include "internal/bn_conf.h" +# include "crypto/bn_conf.h" # endif -# include "internal/bn_int.h" +# include "crypto/bn.h" /* * These preprocessor symbols control various aspects of the bignum headers diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c index 2b3e6f2076..836ff54af6 100644 --- a/crypto/bn/bn_rand.c +++ b/crypto/bn/bn_rand.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <time.h> #include "internal/cryptlib.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #include "bn_lcl.h" #include <openssl/rand.h> #include <openssl/sha.h> diff --git a/crypto/bn/bn_rsa_fips186_4.c b/crypto/bn/bn_rsa_fips186_4.c index 9a3041e2e1..2a0f35f7a5 100644 --- a/crypto/bn/bn_rsa_fips186_4.c +++ b/crypto/bn/bn_rsa_fips186_4.c @@ -30,7 +30,7 @@ #include <stdio.h> #include <openssl/bn.h> #include "bn_lcl.h" -#include "internal/bn_int.h" +#include "crypto/bn.h" /* * FIPS 186-4 Table B.1. "Min length of auxiliary primes p1, p2, q1, q2". diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c index d722f59eb7..412bc5e9f6 100644 --- a/crypto/bn/bn_srp.c +++ b/crypto/bn/bn_srp.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_SRP #include <openssl/srp.h> -#include "internal/bn_srp.h" +#include "crypto/bn_srp.h" # if (BN_BYTES == 8) # if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__) diff --git a/crypto/chacha/chacha_enc.c b/crypto/chacha/chacha_enc.c index e350c9b0f1..05a716b5d4 100644 --- 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 b1ee0d3d2f..9db2562157 100644 --- a/crypto/cmac/cm_ameth.c +++ b/crypto/cmac/cm_ameth.c @@ -10,7 +10,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include "internal/asn1_int.h" +#include "crypto/asn1.h" /* * CMAC "ASN1" method. This is just here to indicate the maximum CMAC output diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index 27e98ce0a7..15248ddf3c 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -15,8 +15,8 @@ #include <openssl/cms.h> #include <openssl/aes.h> #include "cms_lcl.h" -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" /* CMS EnvelopedData Utilities */ diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c index 8f80f6ba5d..ded7738218 100644 --- a/crypto/cms/cms_ess.c +++ b/crypto/cms/cms_ess.c @@ -16,8 +16,8 @@ #include <openssl/cms.h> #include <openssl/ess.h> #include "cms_lcl.h" -#include "internal/ess_int.h" -#include "internal/cms_int.h" +#include "crypto/ess.h" +#include "crypto/cms.h" IMPLEMENT_ASN1_FUNCTIONS(CMS_ReceiptRequest) diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c index 866749a171..364903b662 100644 --- 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 f0502a4510..d1cb16f3fd 100644 --- 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 6715e84d2f..1cea861765 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -16,10 +16,10 @@ #include <openssl/cms.h> #include <openssl/ess.h> #include "cms_lcl.h" -#include "internal/asn1_int.h" -#include "internal/evp_int.h" -#include "internal/cms_int.h" -#include "internal/ess_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" +#include "crypto/cms.h" +#include "crypto/ess.h" /* CMS SignedData Utilities */ diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index ae95ff2dd2..1117d7488c 100644 --- 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 1dd7d67998..17786e8ced 100644 --- 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 13d061b298..833b7a6551 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -11,7 +11,7 @@ #include <stdio.h> #include <string.h> #include "internal/conf.h" -#include "internal/ctype.h" +#include "crypto/ctype.h" #include <openssl/crypto.h> #include <openssl/err.h> #include <openssl/conf.h> diff --git a/crypto/context.c b/crypto/context.c index a2e19bac54..02fecf9f35 100644 --- a/crypto/context.c +++ b/crypto/context.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include "internal/thread_once.h" #include "internal/property.h" diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c index cf5f1e54c3..cb26b429b7 100644 --- a/crypto/core_namemap.c +++ b/crypto/core_namemap.c @@ -10,7 +10,7 @@ #include "e_os.h" /* strcasecmp */ #include "internal/namemap.h" #include <openssl/lhash.h> -#include "internal/lhash.h" /* openssl_lh_strcasehash */ +#include "crypto/lhash.h" /* openssl_lh_strcasehash */ /*- * The namenum entry diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 7e89bbd6b5..bc29a3b583 100644 --- 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 e7bc25b976..dbd7891399 100644 --- 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 84f1f8b952..c0bcf25567 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -13,8 +13,8 @@ #include <openssl/asn1.h> #include "dh_locl.h" #include <openssl/bn.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include <openssl/cms.h> #include <openssl/core_names.h> #include "internal/param_build.h" diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c index 8731cc2c73..71f748f829 100644 --- 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 4676a222e2..1f0f3d4d3f 100644 --- 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 1cc323839b..143a19f224 100644 --- 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 4e676fd3d1..d634dbc376 100644 --- 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 6f12741f9a..48c0cd3122 100644 --- 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 f3aab34856..3866461490 100644 --- a/crypto/dsa/dsa_ameth.c +++ b/crypto/dsa/dsa_ameth.c @@ -14,8 +14,8 @@ #include <openssl/cms.h> #include <openssl/core_names.h> #include "internal/cryptlib.h" -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "internal/param_build.h" #include "dsa_locl.h" diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c index eddcc11819..55c4522c2f 100644 --- a/crypto/dsa/dsa_asn1.c +++ b/crypto/dsa/dsa_asn1.c @@ -13,7 +13,7 @@ #include <openssl/asn1.h> #include <openssl/asn1t.h> #include <openssl/rand.h> -#include "internal/asn1_dsa.h" +#include "crypto/asn1_dsa.h" DSA_SIG *DSA_SIG_new(void) { diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c index 08f2e9f025..0b9a0afd85 100644 --- 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 496063d876..93e84b9b97 100644 --- 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 5d365aab25..8aa29c1826 100644 --- 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 f377b1f11e..a9e9a4c842 100644 --- 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 2beeb82707..74124bdc63 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -14,8 +14,8 @@ #include <openssl/bn.h> #include <openssl/cms.h> #include <openssl/asn1t.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "ec_lcl.h" #ifndef OPENSSL_NO_CMS diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c index 2726f5d151..9a8a80021c 100644 --- a/crypto/ec/ec_asn1.c +++ b/crypto/ec/ec_asn1.c @@ -13,7 +13,7 @@ #include <openssl/asn1t.h> #include <openssl/objects.h> #include "internal/nelem.h" -#include "internal/asn1_dsa.h" +#include "crypto/asn1_dsa.h" #ifndef FIPS_MODE diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c index 9b3087ed09..4b4096b0bf 100644 --- a/crypto/ec/ec_cvt.c +++ b/crypto/ec/ec_cvt.c @@ -9,7 +9,7 @@ */ #include <openssl/err.h> -#include "internal/bn_int.h" +#include "crypto/bn.h" #include "ec_lcl.h" EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h index b33d30982c..a523ab6422 100644 --- 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 be4f230623..1710decddd 100644 --- 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 ded2858ee4..5834b868e2 100644 --- 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 afa65233be..432002ca31 100644 --- a/crypto/ec/ecdsa_ossl.c +++ b/crypto/ec/ecdsa_ossl.c @@ -11,7 +11,7 @@ #include <openssl/err.h> #include <openssl/obj_mac.h> #include <openssl/rand.h> -#include "internal/bn_int.h" +#include "crypto/bn.h" #include "ec_lcl.h" int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c index a09e9c5d99..f0f3ae32dd 100644 --- 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 aaaca64426..2eedba3d84 100644 --- a/crypto/ec/ecx_meth.c +++ b/crypto/ec/ecx_meth.c @@ -12,8 +12,8 @@ #include <openssl/x509.h> #include <openssl/ec.h> #include <openssl/rand.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "ec_lcl.h" #include "curve448/curve448_lcl.h" diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index d45617567c..4600531843 100644 --- a/crypto/engine/eng_int.h +++ b/crypto/engine/eng_int.h @@ -13,7 +13,7 @@ # include <openssl/trace.h> # include "internal/cryptlib.h" -# include "internal/engine.h" +# include "crypto/engine.h" # include "internal/thread_once.h" # include "internal/refcount.h" diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index debbb16a79..53edb41a3e 100644 --- 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 7dd3b9fdf6..b6d1988d13 100644 --- a/crypto/engine/eng_rdrand.c +++ b/crypto/engine/eng_rdrand.c @@ -11,7 +11,7 @@ #include <stdio.h> #include <string.h> -#include "internal/engine.h" +#include "crypto/engine.h" #include "internal/cryptlib.h" #include <openssl/rand.h> #include <openssl/err.h> diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c index 2f167c84a8..2e01deb901 100644 --- 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 6ad995d679..8db5385b7c 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -13,16 +13,16 @@ #include <stdio.h> #include <stdarg.h> #include <string.h> -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include "internal/err.h" -#include "internal/err_int.h" +#include "crypto/err.h" #include <openssl/err.h> #include <openssl/crypto.h> #include <openssl/buffer.h> #include <openssl/bio.h> #include <openssl/opensslconf.h> #include "internal/thread_once.h" -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/constant_time_locl.h" #include "e_os.h" #include "err_locl.h" diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 972421f402..5957730d18 100644 --- 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 925ed65b96..3c09eab3e2 100644 --- a/crypto/err/openssl.ec +++ b/crypto/err/openssl.ec @@ -35,7 +35,7 @@ L CMP include/openssl/cmp.h crypto/cmp/cmp_err.c L CT include/openssl/ct.h crypto/ct/ct_err.c L ASYNC include/openssl/async.h crypto/async/async_err.c L KDF include/openssl/kdf.h crypto/kdf/kdf_err.c -L SM2 crypto/include/internal/sm2.h crypto/sm2/sm2_err.c +L SM2 include/crypto/sm2.h crypto/sm2/sm2_err.c L OSSL_STORE include/openssl/store.h crypto/store/store_err.c L ESS include/openssl/ess.h crypto/ess/ess_err.c L PROP include/internal/property.h crypto/property/property_err.c diff --git a/crypto/ess/ess_asn1.c b/crypto/ess/ess_asn1.c index 0ea08e8653..19589d97f3 100644 --- a/crypto/ess/ess_asn1.c +++ b/crypto/ess/ess_asn1.c @@ -11,7 +11,7 @@ #include <openssl/asn1t.h> #include <openssl/ess.h> #include <openssl/x509v3.h> -#include "internal/ess_int.h" +#include "crypto/ess.h" /* ASN1 stuff for ESS Structure */ diff --git a/crypto/ess/ess_lib.c b/crypto/ess/ess_lib.c index fa9cff18be..17c0ea56c6 100644 --- a/crypto/ess/ess_lib.c +++ b/crypto/ess/ess_lib.c @@ -11,7 +11,7 @@ #include <openssl/x509v3.h> #include <openssl/err.h> #include <openssl/ess.h> -#include "internal/ess_int.h" +#include "crypto/ess.h" static ESS_CERT_ID *ESS_CERT_ID_new_init(X509 *cert, int issuer_needed); static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg, diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index 9dd3ac421b..e1b6c8cc3e 100644 --- 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 7f99f32548..f94882829b 100644 --- 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 a97eaa1685..df8e5a5bcb 100644 --- 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 a0b2500d11..f7d62bd2ec 100644 --- 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 ba61c52564..7c7550e9ce 100644 --- a/crypto/evp/cmeth_lib.c +++ b/crypto/evp/cmeth_lib.c @@ -10,7 +10,7 @@ #include <string.h> #include <openssl/evp.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index 9c6aa42887..ca5f7a935e 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -14,7 +14,7 @@ #include <openssl/params.h> #include <openssl/core_names.h> #include "internal/cryptlib.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 39ed528060..17e445d8f2 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -16,11 +16,11 @@ #include <openssl/aes.h> #include <openssl/rand.h> #include <openssl/cmac.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/cryptlib.h" -#include "internal/modes_int.h" -#include "internal/siv_int.h" -#include "internal/ciphermode_platform.h" +#include "crypto/modes.h" +#include "crypto/siv.h" +#include "crypto/ciphermode_platform.h" #include "evp_locl.h" typedef struct { diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index 9e393f0b88..eddb9686e2 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -16,8 +16,8 @@ #include <openssl/sha.h> #include <openssl/rand.h> #include "internal/cryptlib.h" -#include "internal/modes_int.h" -#include "internal/evp_int.h" +#include "crypto/modes.h" +#include "crypto/evp.h" #include "internal/constant_time_locl.h" typedef struct { diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index e434ec009f..7659d8f8d3 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -16,9 +16,9 @@ #include <openssl/sha.h> #include <openssl/rand.h> #include "internal/cryptlib.h" -#include "internal/modes_int.h" +#include "crypto/modes.h" #include "internal/constant_time_locl.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" typedef struct { AES_KEY ks; diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c index 84b14826cb..9412d51b04 100644 --- a/crypto/evp/e_aria.c +++ b/crypto/evp/e_aria.c @@ -14,9 +14,9 @@ # include <openssl/modes.h> # include <openssl/rand.h> # include <openssl/rand_drbg.h> -# include "internal/aria.h" -# include "internal/evp_int.h" -# include "internal/modes_int.h" +# include "crypto/aria.h" +# include "crypto/evp.h" +# include "crypto/modes.h" # include "evp_locl.h" /* ARIA subkey Structure */ diff --git a/crypto/evp/e_bf.c b/crypto/evp/e_bf.c index 71cc990b25..0ac49fe1fe 100644 --- 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 5e66101422..50febca9bc 100644 --- a/crypto/evp/e_camellia.c +++ b/crypto/evp/e_camellia.c @@ -17,9 +17,9 @@ NON_EMPTY_TRANSLATION_UNIT # include <string.h> # include <assert.h> # include <openssl/camellia.h> -# include "internal/evp_int.h" -# include "internal/modes_int.h" -# include "internal/ciphermode_platform.h" +# include "crypto/evp.h" +# include "crypto/modes.h" +# include "crypto/ciphermode_platform.h" static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); diff --git a/crypto/evp/e_cast.c b/crypto/evp/e_cast.c index 8906bd4703..4b06717b72 100644 --- 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 570378b1af..17cce58ff1 100644 --- a/crypto/evp/e_chacha20_poly1305.c +++ b/crypto/evp/e_chacha20_poly1305.c @@ -14,9 +14,9 @@ # include <openssl/evp.h> # include <openssl/objects.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include "evp_locl.h" -# include "internal/chacha.h" +# include "crypto/chacha.h" typedef struct { union { @@ -146,7 +146,7 @@ const EVP_CIPHER *EVP_chacha20(void) } # ifndef OPENSSL_NO_POLY1305 -# include "internal/poly1305.h" +# include "crypto/poly1305.h" typedef struct { EVP_CHACHA_KEY key; diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c index 0d8e90cfa7..e5791f3447 100644 --- 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 52fde95fb0..1ceb3fc73c 100644 --- 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 0f7f4dd525..8c3a554108 100644 --- 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 2f3fcc88f2..2c8d27e3be 100644 --- 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 375714a6f4..d2201b000a 100644 --- 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 a1664b594e..092d6cf1db 100644 --- 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 4d61faff61..fc519d9042 100644 --- 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 95a626bd4f..d92d10f16c 100644 --- 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 0861ee8b2e..9a9938deaf 100644 --- 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 02292fa605..4653c10a14 100644 --- 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 285001c373..d402606b6d 100644 --- 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 ab80267c1e..b8c82cfafd 100644 --- a/crypto/evp/encode.c +++ b/crypto/evp/encode.c @@ -11,7 +11,7 @@ #include <limits.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" static unsigned char conv_ascii2bin(unsigned char a, diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 2685436d36..35bf42994d 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -17,7 +17,7 @@ #include <openssl/engine.h> #include <openssl/params.h> #include <openssl/core_names.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c index cd2bacea5d..67ba201da3 100644 --- a/crypto/evp/evp_fetch.c +++ b/crypto/evp/evp_fetch.c @@ -17,7 +17,7 @@ #include "internal/core.h" #include "internal/provider.h" #include "internal/namemap.h" -#include "internal/evp_int.h" /* evp_locl.h needs it */ +#include "crypto/evp.h" /* evp_locl.h needs it */ #include "evp_locl.h" static void default_method_store_free(void *vstore) diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index 4ec880fd13..0789aa8970 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -14,7 +14,7 @@ #include <openssl/params.h> #include <openssl/core_names.h> #include <openssl/dh.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index 8162a5e436..2d87905bf5 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -12,7 +12,7 @@ #include <openssl/evp.h> #include <openssl/pkcs12.h> #include <openssl/x509.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" /* Password based encryption (PBE) functions */ diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c index bffe2b3830..a11b856c03 100644 --- a/crypto/evp/evp_pkey.c +++ b/crypto/evp/evp_pkey.c @@ -12,9 +12,9 @@ #include "internal/cryptlib.h" #include <openssl/x509.h> #include <openssl/rand.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" -#include "internal/x509_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" +#include "crypto/x509.h" /* Extract a private key from a PKCS8 structure */ diff --git a/crypto/evp/evp_utils.c b/crypto/evp/evp_utils.c index 3da208a69f..b3571bea9f 100644 --- a/crypto/evp/evp_utils.c +++ b/crypto/evp/evp_utils.c @@ -14,7 +14,7 @@ #include <openssl/err.h> #include <openssl/asn1.h> /* evp_locl.h needs it */ #include <openssl/safestack.h> /* evp_locl.h needs it */ -#include "internal/evp_int.h" /* evp_locl.h needs it */ +#include "crypto/evp.h" /* evp_locl.h needs it */ #include "evp_locl.h" /* diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c index 53a25a424e..3caf03a0ce 100644 --- a/crypto/evp/exchange.c +++ b/crypto/evp/exchange.c @@ -11,7 +11,7 @@ #include <openssl/evp.h> #include <openssl/err.h> #include "internal/refcount.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "internal/numbers.h" /* includes SIZE_MAX */ #include "evp_locl.h" diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c index 5c57cc360e..b2b28dece2 100644 --- a/crypto/evp/kdf_lib.c +++ b/crypto/evp/kdf_lib.c @@ -17,8 +17,8 @@ #include <openssl/kdf.h> #include <openssl/core.h> #include <openssl/core_names.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "internal/numbers.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c index 7bcdcc7df3..c2b6cea673 100644 --- a/crypto/evp/kdf_meth.c +++ b/crypto/evp/kdf_meth.c @@ -12,7 +12,7 @@ #include <openssl/core.h> #include <openssl/core_numbers.h> #include <openssl/kdf.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c index 8ee28fbe60..1a4e9a297c 100644 --- a/crypto/evp/keymgmt_lib.c +++ b/crypto/evp/keymgmt_lib.c @@ -9,8 +9,8 @@ #include "internal/cryptlib.h" #include "internal/nelem.h" -#include "internal/evp_int.h" -#include "internal/asn1_int.h" +#include "crypto/evp.h" +#include "crypto/asn1.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c index c170bd676b..1dbc9df550 100644 --- a/crypto/evp/keymgmt_meth.c +++ b/crypto/evp/keymgmt_meth.c @@ -13,7 +13,7 @@ #include <openssl/err.h> #include "internal/provider.h" #include "internal/refcount.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" diff --git a/crypto/evp/m_md2.c b/crypto/evp/m_md2.c index d7738472c8..a8a0af96aa 100644 --- 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 1dc3cdee64..9638213de7 100644 --- 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 539ab76448..d817982488 100644 --- 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 af8ae31ec1..e9ed800145 100644 --- a/crypto/evp/m_md5_sha1.c +++ b/crypto/evp/m_md5_sha1.c @@ -12,7 +12,7 @@ # include <string.h> # include <openssl/evp.h> # include <openssl/obj_mac.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" # include "internal/md5_sha1.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c index 145d9550f2..fdc689e115 100644 --- 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 5dcb250fe8..51c93c0dc4 100644 --- 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 d821a58493..4e05d18ba6 100644 --- 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 1258ea03bc..421d302582 100644 --- 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 1e71eed948..727bb2731a 100644 --- a/crypto/evp/m_sha3.c +++ b/crypto/evp/m_sha3.c @@ -12,7 +12,7 @@ #include <openssl/evp.h> #include <openssl/objects.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/sha3.h" #include "evp_locl.h" diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c index 987b35b7fe..53074334bf 100644 --- 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 10c07ff551..ee69df5658 100644 --- a/crypto/evp/m_wp.c +++ b/crypto/evp/m_wp.c @@ -16,7 +16,7 @@ # include <openssl/objects.h> # include <openssl/x509.h> # include <openssl/whrlpool.h> -# include "internal/evp_int.h" +# include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/mac_lib.c b/crypto/evp/mac_lib.c index cf704ba4fc..c38c453c73 100644 --- a/crypto/evp/mac_lib.c +++ b/crypto/evp/mac_lib.c @@ -15,7 +15,7 @@ #include <openssl/core_names.h> #include <openssl/ossl_typ.h> #include "internal/nelem.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c index 8c47a6c6e8..9e67d9085b 100644 --- a/crypto/evp/mac_meth.c +++ b/crypto/evp/mac_meth.c @@ -2,7 +2,7 @@ #include <openssl/err.h> #include <openssl/core.h> #include <openssl/core_numbers.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 7c2f4f061c..901899ad3b 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -11,9 +11,9 @@ #include "internal/cryptlib.h" #include <openssl/evp.h> #include <openssl/kdf.h> -#include "internal/objects.h" +#include "crypto/objects.h" #include <openssl/x509.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" int EVP_add_cipher(const EVP_CIPHER *c) { diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index 96a72730f3..27fb959428 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -16,7 +16,7 @@ #include <openssl/hmac.h> #include <openssl/trace.h> #include <openssl/core_names.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 83cf12fff3..e2c6eaa17f 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -23,8 +23,8 @@ #include <openssl/params.h> #include <openssl/core_names.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "internal/provider.h" static void EVP_PKEY_free_it(EVP_PKEY *x); diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c index c1b0d3acda..44a69083b2 100644 --- 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 956b089572..fe4b7b568d 100644 --- a/crypto/evp/p_verify.c +++ b/crypto/evp/p_verify.c @@ -12,7 +12,7 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf, unsigned int siglen, EVP_PKEY *pkey) diff --git a/crypto/evp/pkey_kdf.c b/crypto/evp/pkey_kdf.c index 98bf5c6660..d57ff6fd47 100644 --- a/crypto/evp/pkey_kdf.c +++ b/crypto/evp/pkey_kdf.c @@ -17,7 +17,7 @@ #include <openssl/core_names.h> #include <openssl/params.h> #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #define MAX_PARAM 20 diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c index 9853e09cf1..2c60afe55f 100644 --- a/crypto/evp/pkey_mac.c +++ b/crypto/evp/pkey_mac.c @@ -13,7 +13,7 @@ #include <openssl/engine.h> #include <openssl/params.h> #include <openssl/core_names.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "evp_locl.h" /* MAC PKEY context structure */ diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c index 34db48639a..240738d3ee 100644 --- a/crypto/evp/pmeth_fn.c +++ b/crypto/evp/pmeth_fn.c @@ -12,7 +12,7 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include "internal/cryptlib.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c index c81f5a1a3f..2564bbd03e 100644 --- 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 8b386cf19f..5f0a93ed9a 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -16,8 +16,8 @@ #include <openssl/core_names.h> #include <openssl/dh.h> #include "internal/cryptlib.h" -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" #include "internal/numbers.h" #include "internal/provider.h" #include "evp_locl.h" diff --git a/crypto/ex_data.c b/crypto/ex_data.c index cd8e695855..9f08606d2f 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include "internal/thread_once.h" int do_ex_data_init(OPENSSL_CTX *ctx) diff --git a/crypto/hmac/hm_ameth.c b/crypto/hmac/hm_ameth.c index f0a5bc9a01..9ecb786106 100644 --- a/crypto/hmac/hm_ameth.c +++ b/crypto/hmac/hm_ameth.c @@ -10,8 +10,8 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include "internal/asn1_int.h" -#include "internal/evp_int.h" +#include "crypto/asn1.h" +#include "crypto/evp.h" /* * HMAC "ASN1" method. This is just here to indicate the maximum HMAC output diff --git a/crypto/include/internal/store.h b/crypto/include/internal/store.h deleted file mode 100644 index b2e9dbffbe..0000000000 --- a/crypto/include/internal/store.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -void ossl_store_cleanup_int(void); diff --git a/crypto/info.c b/crypto/info.c index 355827c451..613ddc7d8c 100644 --- a/crypto/info.c +++ b/crypto/info.c @@ -8,7 +8,7 @@ */ #include <openssl/crypto.h> -#include "internal/dso_conf.h" +#include "crypto/dso_conf.h" #include "internal/thread_once.h" #include "internal/cryptlib.h" #include "e_os.h" diff --git a/crypto/init.c b/crypto/init.c index 32162c3874..4aa3fc83da 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -8,25 +8,25 @@ */ #include "e_os.h" -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include <openssl/err.h> -#include "internal/rand_int.h" +#include "crypto/rand.h" #include "internal/bio.h" #include <openssl/evp.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/conf.h" -#include "internal/async.h" -#include "internal/engine.h" +#include "crypto/async.h" +#include "crypto/engine.h" #include "internal/comp.h" #include "internal/err.h" -#include "internal/err_int.h" -#include "internal/objects.h" +#include "crypto/err.h" +#include "crypto/objects.h" #include <stdlib.h> #include <assert.h> #include "internal/thread_once.h" -#include "internal/dso_conf.h" +#include "crypto/dso_conf.h" #include "internal/dso.h" -#include "internal/store.h" +#include "crypto/store.h" #include <openssl/cmp_util.h> /* for OSSL_CMP_log_close() */ #include <openssl/trace.h> diff --git a/crypto/initthread.c b/crypto/initthread.c index 7de8a36945..930b94a817 100644 --- a/crypto/initthread.c +++ b/crypto/initthread.c @@ -9,7 +9,7 @@ #include <openssl/crypto.h> #include <openssl/core_numbers.h> -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include "internal/providercommon.h" #include "internal/thread_once.h" diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c index f91a56a70a..65445895f5 100644 --- 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 74e53507a6..58c23e1ad6 100644 --- 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 73ba4d6ccd..8571e4848e 100644 --- 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 562d6b51e2..d3cac29b21 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -9,7 +9,7 @@ #include "e_os.h" #include "internal/cryptlib.h" -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include <stdio.h> #include <stdlib.h> #include <limits.h> diff --git a/crypto/modes/cbc128.c b/crypto/modes/cbc128.c index eb8e06c11d..eec44bd91a 100644 --- a/crypto/modes/cbc128.c +++ b/crypto/modes/cbc128.c @@ -9,7 +9,7 @@ #include <string.h> #include <openssl/crypto.h> -#include "internal/modes_int.h" +#include "crypto/modes.h" #if !defined(STRICT_ALIGNMENT) && !defined(PEDANTIC) # define STRICT_ALIGNMENT 0 diff --git a/crypto/modes/ccm128.c b/crypto/modes/ccm128.c index e97158a119..1ffd6df46f 100644 --- a/crypto/modes/ccm128.c +++ b/crypto/modes/ccm128.c @@ -9,7 +9,7 @@ #include <string.h> #include <openssl/crypto.h> -#include "internal/modes_int.h" +#include "crypto/modes.h" /* * First you setup M and L parameters and pass the key schedule. This is diff --git a/crypto/modes/cfb128.c b/crypto/modes/cfb128.c index 39644a237e..e9ce4df3a5 100644 --- a/crypto/modes/cfb128.c +++ b/crypto/modes/cfb128.c @@ -9,7 +9,7 @@ #include <string.h> #include <openssl/crypto.h> -#include "internal/modes_int.h" +#include "crypto/modes.h" /* * The input and output encrypted as though 128bit cfb mode is being used. diff --git a/crypto/modes/ctr128.c b/crypto/modes/ctr128.c index 1755b8500e..ff7499b34a 100644 --- a/crypto/modes/ctr128.c +++ b/crypto/modes/ctr128.c @@ -9,7 +9,7 @@ #include <string.h> #include <openssl/crypto.h> -#include "internal/modes_int.h" +#include "crypto/modes.h" /* * NOTE: the IV/counter CTR mode is big-endian. The code itself is diff --git a/crypto/modes/cts128.c b/crypto/modes/cts128.c index b4f2f37775..5600d9c54b 100644 --- a/crypto/modes/cts128.c +++ b/crypto/modes/cts128.c @@ -9,7 +9,7 @@ #include <string.h> #include <openssl/crypto.h> -#include "internal/modes_int.h" +#include "crypto/modes.h" /* * Trouble with Ciphertext Stealing, CTS, mode is that there is no diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c index f37653be67..d2f2da61b3 100644 --- a/crypto/modes/gcm128.c +++ b/crypto/modes/gcm128.c @@ -10,7 +10,7 @@ #include <string.h> #include <openssl/crypto.h> #include "internal/cryptlib.h" -#include "internal/modes_int.h" +#include "crypto/modes.h" #if defined(BSWAP4) && defined(STRICT_ALIGNMENT) /* redefine, because alignment is ensured */ diff --git a/crypto/modes/ocb128.c b/crypto/modes/ocb128.c index 9e7af6074f..7886700533 100644 --- a/crypto/modes/ocb128.c +++ b/crypto/modes/ocb128.c @@ -10,7 +10,7 @@ #include <string.h> #include <openssl/crypto.h> #include <openssl/err.h> -#include "internal/modes_int.h" +#include "crypto/modes.h" #ifndef OPENSSL_NO_OCB diff --git a/crypto/modes/ofb128.c b/crypto/modes/ofb128.c index b894cbb5c1..2eca09bc1b 100644 --- a/crypto/modes/ofb128.c +++ b/crypto/modes/ofb128.c @@ -9,7 +9,7 @@ #include <string.h> #include <openssl/crypto.h> -#include "internal/modes_int.h" +#include "crypto/modes.h" /* * The input and output encrypted as though 128bit ofb mode is being used. diff --git a/crypto/modes/siv128.c b/crypto/modes/siv128.c index 1d91ee78ee..712141032d 100644 --- a/crypto/modes/siv128.c +++ b/crypto/modes/siv128.c @@ -13,8 +13,8 @@ #include <openssl/evp.h> #include <openssl/core_names.h> #include <openssl/params.h> -#include "internal/modes_int.h" -#include "internal/siv_int.h" +#include "crypto/modes.h" +#include "crypto/siv.h" #ifndef OPENSSL_NO_SIV diff --git a/crypto/modes/xts128.c b/crypto/modes/xts128.c index 03b83aa0ed..9d9b65caa5 100644 --- a/crypto/modes/xts128.c +++ b/crypto/modes/xts128.c @@ -9,7 +9,7 @@ #include <string.h> #include <openssl/crypto.h> -#include "internal/modes_int.h" +#include "crypto/modes.h" int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx, const unsigned char iv[16], diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index 3ad905c939..531f524758 100644 --- 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 c4155a3dfc..1c3fe9eb5d 100644 --- 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 5dfe7c5b95..08266141e2 100644 --- 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 17f792c2b1..c75bfdb403 100644 --- 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 b33ab16266..eb07c884e7 100644 --- 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 ffcec12771..54596e4093 100644 --- 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 3b7a8436ed..b9b34c2495 100644 --- 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 181fb5a5a1..815ac8683a 100644 --- 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 b83a4fc1ca..31bca781ca 100644 --- 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 73903635ea..d69607c7bb 100644 --- a/crypto/poly1305/poly1305_ameth.c +++ b/crypto/poly1305/poly1305_ameth.c @@ -10,10 +10,10 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include "internal/asn1_int.h" -#include "internal/poly1305.h" +#include "crypto/asn1.h" +#include "crypto/poly1305.h" #include "poly1305_local.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" /* * POLY1305 "ASN1" method. This is just here to indicate the maximum diff --git a/crypto/ppccap.c b/crypto/ppccap.c index e540db1441..5b3ee754b2 100644 --- a/crypto/ppccap.c +++ b/crypto/ppccap.c @@ -29,7 +29,7 @@ #include <openssl/crypto.h> #include <openssl/bn.h> #include <internal/cryptlib.h> -#include <internal/chacha.h> +#include <crypto/chacha.h> #include "bn/bn_lcl.h" #include "ppc_arch.h" diff --git a/crypto/property/property.c b/crypto/property/property.c index e94c5de87d..4f67207a79 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -13,12 +13,12 @@ #include <stdarg.h> #include <openssl/crypto.h> #include "internal/property.h" -#include "internal/ctype.h" +#include "crypto/ctype.h" #include <openssl/lhash.h> #include <openssl/rand.h> #include "internal/thread_once.h" -#include "internal/lhash.h" -#include "internal/sparse_array.h" +#include "crypto/lhash.h" +#include "crypto/sparse_array.h" #include "property_lcl.h" /* The number of elements in the query cache before we initiate a flush */ diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c index c17b0ddefc..c9fb7602fd 100644 --- a/crypto/property/property_parse.c +++ b/crypto/property/property_parse.c @@ -14,7 +14,7 @@ #include <openssl/err.h> #include "internal/propertyerr.h" #include "internal/property.h" -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/nelem.h" #include "property_lcl.h" #include "e_os.h" diff --git a/crypto/property/property_string.c b/crypto/property/property_string.c index dcf5dcc2a4..d037f6a311 100644 --- a/crypto/property/property_string.c +++ b/crypto/property/property_string.c @@ -11,7 +11,7 @@ #include <string.h> #include <openssl/crypto.h> #include <openssl/lhash.h> -#include "internal/lhash.h" +#include "crypto/lhash.h" #include "property_lcl.h" /* diff --git a/crypto/provider_core.c b/crypto/provider_core.c index f8a002aa16..4f3123d672 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -12,7 +12,7 @@ #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/opensslv.h> -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include "internal/nelem.h" #include "internal/thread_once.h" #include "internal/provider.h" diff --git a/crypto/rand/drbg_lib.c b/crypto/rand/drbg_lib.c index bce2f74e9a..5652526568 100644 --- a/crypto/rand/drbg_lib.c +++ b/crypto/rand/drbg_lib.c @@ -13,8 +13,8 @@ #include <openssl/rand.h> #include "rand_lcl.h" #include "internal/thread_once.h" -#include "internal/rand_int.h" -#include "internal/cryptlib_int.h" +#include "crypto/rand.h" +#include "crypto/cryptlib.h" /* * Support framework for NIST SP 800-90A DRBG diff --git a/crypto/rand/rand_crng_test.c b/crypto/rand/rand_crng_test.c index 0ba0986b96..29af636f53 100644 --- a/crypto/rand/rand_crng_test.c +++ b/crypto/rand/rand_crng_test.c @@ -14,7 +14,7 @@ #include <string.h> #include <openssl/evp.h> -#include "internal/rand_int.h" +#include "crypto/rand.h" #include "internal/thread_once.h" #include "internal/cryptlib.h" #include "rand_lcl.h" diff --git a/crypto/rand/rand_lcl.h b/crypto/rand/rand_lcl.h index 0c92d75666..0f8a81f311 100644 --- a/crypto/rand/rand_lcl.h +++ b/crypto/rand/rand_lcl.h @@ -17,7 +17,7 @@ # include <openssl/ec.h> # include <openssl/rand_drbg.h> # include "internal/tsan_assist.h" -# include "internal/rand_int.h" +# include "crypto/rand.h" # include "internal/numbers.h" diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index b70b60a650..7f4f1b7f90 100644 --- a/crypto/rand/rand_lib.c +++ b/crypto/rand/rand_lib.c @@ -11,7 +11,7 @@ #include <time.h> #include "internal/cryptlib.h" #include <openssl/opensslconf.h> -#include "internal/rand_int.h" +#include "crypto/rand.h" #include <openssl/engine.h> #include "internal/thread_once.h" #include "rand_lcl.h" diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index 8641badbff..c0f995a166 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -16,7 +16,7 @@ #include <openssl/rand.h> #include <openssl/crypto.h> #include "rand_lcl.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #include <stdio.h> #include "internal/dso.h" #ifdef __linux diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c index 3f13529d0f..5fb2259158 100644 --- a/crypto/rand/rand_vms.c +++ b/crypto/rand/rand_vms.c @@ -14,7 +14,7 @@ # include <unistd.h> # include "internal/cryptlib.h" # include <openssl/rand.h> -# include "internal/rand_int.h" +# include "crypto/rand.h" # include "rand_lcl.h" # include <descrip.h> # include <dvidef.h> diff --git a/crypto/rand/rand_vxworks.c b/crypto/rand/rand_vxworks.c index 81774e097d..a32cf45bb9 100644 --- a/crypto/rand/rand_vxworks.c +++ b/crypto/rand/rand_vxworks.c @@ -14,7 +14,7 @@ NON_EMPTY_TRANSLATION_UNIT #else # include <openssl/rand.h> # include "rand_lcl.h" -# include "internal/rand_int.h" +# include "crypto/rand.h" # include "internal/cryptlib.h" # include <version.h> # include <taskLib.h> diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c index 38852dc7a0..ea0d53b8ad 100644 --- a/crypto/rand/rand_win.c +++ b/crypto/rand/rand_win.c @@ -10,7 +10,7 @@ #include "internal/cryptlib.h" #include <openssl/rand.h> #include "rand_lcl.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) # ifndef OPENSSL_RAND_SEED_OS diff --git a/crypto/ripemd/rmd_locl.h b/crypto/ripemd/rmd_locl.h index 361e21b940..bb4feb969a 100644 --- 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 bf56039b46..7b1c955870 100644 --- 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 c35ad9f545..4933982cdd 100644 --- 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 c6e570089f..83e6a35e42 100644 --- 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 5d5efdbd69..54171de2f3 100644 --- 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 993c2cea4b..dfbf00cb55 100644 --- 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 73811e7bfc..07b18ed8bb 100644 --- a/crypto/rsa/rsa_sign.c +++ b/crypto/rsa/rsa_sign.c @@ -13,7 +13,7 @@ #include <openssl/rsa.h> #include <openssl/objects.h> #include <openssl/x509.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include "rsa_locl.h" /* Size of an SSL signature: MD5+SHA1 */ diff --git a/crypto/rsa/rsa_sp800_56b_check.c b/crypto/rsa/rsa_sp800_56b_check.c index 10e264e591..36d946de4e 100644 --- a/crypto/rsa/rsa_sp800_56b_check.c +++ b/crypto/rsa/rsa_sp800_56b_check.c @@ -10,7 +10,7 @@ #include <openssl/err.h> #include <openssl/bn.h> -#include "internal/bn_int.h" +#include "crypto/bn.h" #include "rsa_locl.h" /* diff --git a/crypto/rsa/rsa_sp800_56b_gen.c b/crypto/rsa/rsa_sp800_56b_gen.c index 50c5bf14be..73c9c1d150 100644 --- a/crypto/rsa/rsa_sp800_56b_gen.c +++ b/crypto/rsa/rsa_sp800_56b_gen.c @@ -10,7 +10,7 @@ #include <openssl/err.h> #include <openssl/bn.h> -#include "internal/bn_int.h" +#include "crypto/bn.h" #include "rsa_locl.h" #define RSA_FIPS1864_MIN_KEYGEN_KEYSIZE 2048 diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c index 64de9d0168..eb00a4a7bd 100644 --- a/crypto/s390xcap.c +++ b/crypto/s390xcap.c @@ -13,7 +13,7 @@ #include <setjmp.h> #include <signal.h> #include "internal/cryptlib.h" -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "s390x_arch.h" #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c index 4881bcb17a..563ddbd1d0 100644 --- a/crypto/sha/sha1dgst.c +++ b/crypto/sha/sha1dgst.c @@ -17,7 +17,7 @@ /* The implementation is in ../md32_common.h */ #include "sha_locl.h" -#include "internal/sha.h" +#include "crypto/sha.h" int sha1_ctrl(SHA_CTX *sha1, int cmd, int mslen, void *ms) { diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c index 328c0f17c3..99833924b0 100644 --- 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 7b6d7496d0..03189a9d9c 100644 --- 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 d615e58491..f7c0ac707b 100644 --- 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 9d91178455..03f9b4982d 100644 --- 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 ba7679db35..5aa4d88915 100644 --- a/crypto/siphash/siphash_ameth.c +++ b/crypto/siphash/siphash_ameth.c @@ -10,10 +10,10 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> -#include "internal/asn1_int.h" -#include "internal/siphash.h" +#include "crypto/asn1.h" +#include "crypto/siphash.h" #include "siphash_local.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" /* * SIPHASH "ASN1" method. This is just here to indicate the maximum diff --git a/crypto/sm2/sm2_crypt.c b/crypto/sm2/sm2_crypt.c index d544210757..102f02651a 100644 --- 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 d8e1179056..93ee9f7d7a 100644 --- 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 7613e333ec..27bec2cb06 100644 --- 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 38e556241c..318e981802 100644 --- 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 38ddbfe372..4bccaaf1dc 100644 --- a/crypto/sm3/m_sm3.c +++ b/crypto/sm3/m_sm3.c @@ -13,7 +13,7 @@ #ifndef OPENSSL_NO_SM3 # include <openssl/evp.h> # include "internal/sm3.h" -# include "internal/evp_int.h" +# include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/sm3/sm3_locl.h b/crypto/sm3/sm3_locl.h index a5b79623e9..07def19cf1 100644 --- a/crypto/sm3/sm3_locl.h +++ b/crypto/sm3/sm3_locl.h @@ -37,7 +37,7 @@ void sm3_block_data_order(SM3_CTX *c, const void *p, size_t num); void sm3_transform(SM3_CTX *c, const unsigned char *data); -#include "internal/md32_common.h" +#include "crypto/md32_common.h" #define P0(X) (X ^ ROTATE(X, 9) ^ ROTATE(X, 17)) #define P1(X) (X ^ ROTATE(X, 15) ^ ROTATE(X, 23)) diff --git a/crypto/sm4/sm4.c b/crypto/sm4/sm4.c index c0454d137a..a62993c272 100644 --- a/crypto/sm4/sm4.c +++ b/crypto/sm4/sm4.c @@ -10,7 +10,7 @@ */ #include <openssl/e_os2.h> -#include "internal/sm4.h" +#include "crypto/sm4.h" static const uint8_t SM4_S[256] = { 0xD6, 0x90, 0xE9, 0xFE, 0xCC, 0xE1, 0x3D, 0xB7, 0x16, 0xB6, 0x14, 0xC2, diff --git a/crypto/sparse_array.c b/crypto/sparse_array.c index a74db5d218..9d444739f5 100644 --- a/crypto/sparse_array.c +++ b/crypto/sparse_array.c @@ -10,7 +10,7 @@ #include <openssl/crypto.h> #include <openssl/bn.h> -#include "internal/sparse_array.h" +#include "crypto/sparse_array.h" /* * How many bits are used to index each level in the tree structure? diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c index 8cba189ef3..99511954d7 100644 --- 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 79e76c9aa9..c4dd5153f2 100644 --- 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 206af12af6..88302e58f3 100644 --- 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 db050c07cc..c5d8cc456e 100644 --- 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 8c55c431c1..2d3b307e04 100644 --- 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 3022e368c6..8cd57836a9 100644 --- a/crypto/store/store_register.c +++ b/crypto/store/store_register.c @@ -8,7 +8,7 @@ */ #include <string.h> -#include "internal/ctype.h" +#include "crypto/ctype.h" #include <assert.h> #include <openssl/err.h> diff --git a/crypto/trace.c b/crypto/trace.c index cc99fff37c..7ff6af8837 100755 --- a/crypto/trace.c +++ b/crypto/trace.c @@ -16,7 +16,7 @@ #include <openssl/trace.h> #include "internal/bio.h" #include "internal/nelem.h" -#include "internal/cryptlib_int.h" +#include "crypto/cryptlib.h" #include "e_os.h" /* strcasecmp for Windows */ diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c index 7791fc73c8..74fa93d05e 100644 --- a/crypto/ts/ts_rsp_sign.c +++ b/crypto/ts/ts_rsp_sign.c @@ -15,7 +15,7 @@ #include <openssl/pkcs7.h> #include <openssl/crypto.h> #include "ts_lcl.h" -#include "internal/ess_int.h" +#include "crypto/ess.h" static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *); static int def_time_cb(struct TS_resp_ctx *, void *, long *sec, long *usec); diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c index e658354eb3..0b6ea1ed62 100644 --- a/crypto/ts/ts_rsp_verify.c +++ b/crypto/ts/ts_rsp_verify.c @@ -13,7 +13,7 @@ #include <openssl/ts.h> #include <openssl/pkcs7.h> #include "ts_lcl.h" -#include "internal/ess_int.h" +#include "crypto/ess.h" static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted, X509 *signer, STACK_OF(X509) **chain); diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index e53b9b44a6..720a4b9f55 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -19,7 +19,7 @@ #endif #include <openssl/x509.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include "x509_lcl.h" struct lookup_dir_hashes_st { diff --git a/crypto/x509/pcy_cache.c b/crypto/x509/pcy_cache.c index 21a89e62c0..56d3401ffb 100644 --- a/crypto/x509/pcy_cache.c +++ b/crypto/x509/pcy_cache.c @@ -10,7 +10,7 @@ #include "internal/cryptlib.h" #include <openssl/x509.h> #include <openssl/x509v3.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include "pcy_int.h" diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c index 243d6e2b7c..ec72dbd33b 100644 --- a/crypto/x509/pcy_map.c +++ b/crypto/x509/pcy_map.c @@ -10,7 +10,7 @@ #include "internal/cryptlib.h" #include <openssl/x509.h> #include <openssl/x509v3.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include "pcy_int.h" diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c index 3367228829..4969bb34bf 100644 --- a/crypto/x509/t_x509.c +++ b/crypto/x509/t_x509.c @@ -14,7 +14,7 @@ #include <openssl/objects.h> #include <openssl/x509.h> #include <openssl/x509v3.h> -#include "internal/asn1_int.h" +#include "crypto/asn1.h" #ifndef OPENSSL_NO_STDIO int X509_print_fp(FILE *fp, X509 *x) diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c index 9e6bffed28..a33dd9990d 100644 --- a/crypto/x509/v3_addr.c +++ b/crypto/x509/v3_addr.c @@ -20,7 +20,7 @@ #include <openssl/asn1t.h> #include <openssl/buffer.h> #include <openssl/x509v3.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include "ext_dat.h" #ifndef OPENSSL_NO_RFC3779 diff --git a/crypto/x509/v3_asid.c b/crypto/x509/v3_asid.c index 2287675005..dfd48f7331 100644 --- a/crypto/x509/v3_asid.c +++ b/crypto/x509/v3_asid.c @@ -20,7 +20,7 @@ #include <openssl/asn1t.h> #include <openssl/x509v3.h> #include <openssl/x509.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include <openssl/bn.h> #include "ext_dat.h" diff --git a/crypto/x509/v3_conf.c b/crypto/x509/v3_conf.c index b7b74c4f25..47b1cfc90b 100644 --- a/crypto/x509/v3_conf.c +++ b/crypto/x509/v3_conf.c @@ -10,11 +10,11 @@ /* extension creation utilities */ #include <stdio.h> -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/cryptlib.h" #include <openssl/conf.h> #include <openssl/x509.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include <openssl/x509v3.h> static int v3_check_critical(const char **value); diff --git a/crypto/x509/v3_crld.c b/crypto/x509/v3_crld.c index 766bf0e5c8..c3517b817c 100644 --- a/crypto/x509/v3_crld.c +++ b/crypto/x509/v3_crld.c @@ -14,7 +14,7 @@ #include <openssl/asn1t.h> #include <openssl/x509v3.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include "ext_dat.h" static void *v2i_crld(const X509V3_EXT_METHOD *method, diff --git a/crypto/x509/v3_ncons.c b/crypto/x509/v3_ncons.c index 9a8ca16685..3be0c05fce 100644 --- a/crypto/x509/v3_ncons.c +++ b/crypto/x509/v3_ncons.c @@ -10,13 +10,13 @@ #include "internal/cryptlib.h" #include "internal/numbers.h" #include <stdio.h> -#include "internal/asn1_int.h" +#include "crypto/asn1.h" #include <openssl/asn1t.h> #include <openssl/conf.h> #include <openssl/x509v3.h> #include <openssl/bn.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include "ext_dat.h" static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, diff --git a/crypto/x509/v3_purp.c b/crypto/x509/v3_purp.c index 40f976bdda..3248e286ae 100644 --- a/crypto/x509/v3_purp.c +++ b/crypto/x509/v3_purp.c @@ -12,7 +12,7 @@ #include "internal/numbers.h" #include <openssl/x509v3.h> #include <openssl/x509_vfy.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include "internal/tsan_assist.h" static void x509v3_cache_extensions(X509 *x); diff --git a/crypto/x509/v3_skey.c b/crypto/x509/v3_skey.c index f8a780d916..c69975f6af 100644 --- a/crypto/x509/v3_skey.c +++ b/crypto/x509/v3_skey.c @@ -10,7 +10,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/x509v3.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include "ext_dat.h" static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c index 24f50a13b7..1516d988f0 100644 --- a/crypto/x509/v3_utl.c +++ b/crypto/x509/v3_utl.c @@ -12,11 +12,11 @@ #include "e_os.h" #include "internal/cryptlib.h" #include <stdio.h> -#include "internal/ctype.h" +#include "crypto/ctype.h" #include <openssl/conf.h> #include <openssl/crypto.h> #include <openssl/x509v3.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include <openssl/bn.h> #include "ext_dat.h" diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c index d7bbbc1947..f208cd6a04 100644 --- 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 e13be607df..a7b85857bd 100644 --- 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 c81a00e0a7..f6404d59e9 100644 --- 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 cb16de1f71..9d8f48d2ee 100644 --- 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 c45043a72e..d7dd3754f5 100644 --- 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 b0176bc90b..9382f37a8a 100644 --- 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 3dfe66440a..66cf91fc3b 100644 --- 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 2347e55938..b6a45acbcd 100644 --- 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 f337cd14cb..0dd9772c10 100644 --- 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 5fe0754e96..c681dbaa65 100644 --- 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 ae447aa98f..f1992ddcf0 100644 --- 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 bf01450a1c..443ab42bdd 100644 --- 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 592466316d..3256ec2304 100644 --- 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 392f47e8dc..43b29d3bc6 100644 --- a/crypto/x509/x_all.c +++ b/crypto/x509/x_all.c @@ -13,7 +13,7 @@ #include <openssl/asn1.h> #include <openssl/evp.h> #include <openssl/x509.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" #include <openssl/ocsp.h> #include <openssl/rsa.h> #include <openssl/dsa.h> @@ -21,8 +21,8 @@ #ifndef OPENSSL_NO_SM2 -# include "internal/asn1_int.h" -# include "internal/evp_int.h" +# include "crypto/asn1.h" +# include "crypto/evp.h" static int common_verify_sm2(void *data, EVP_PKEY *pkey, int mdnid, int pknid, int req) diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c index 3984f0147f..d06eb69a5b 100644 --- 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 8fd6566b01..93ba9555be 100644 --- 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 d81f53844f..6e8540835f 100644 --- 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 5bda794a82..e9cc9ba41c 100644 --- 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 d91c2d24da..7b41ce0777 100644 --- 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 a29d3dfce8..18d09e300e 100644 --- a/crypto/x509/x_x509a.c +++ b/crypto/x509/x_x509a.c @@ -12,7 +12,7 @@ #include <openssl/evp.h> #include <openssl/asn1t.h> #include <openssl/x509.h> -#include "internal/x509_int.h" +#include "crypto/x509.h" /* * X509_CERT_AUX routines. These are used to encode additional user diff --git a/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod b/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod index 60695266a7..8617c97581 100644 --- a/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod +++ b/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod @@ -11,7 +11,7 @@ ossl_sa_TYPE_doall_arg, ossl_sa_TYPE_get, ossl_sa_TYPE_set =for comment generic - #include "internal/sparse_array.h" + #include "crypto/sparse_array.h" typedef struct sparse_array_st OPENSSL_SA; diff --git a/doc/internal/man3/evp_keymgmt_export_to_provider.pod b/doc/internal/man3/evp_keymgmt_export_to_provider.pod index 72b766fb93..2cb40940b4 100644 --- a/doc/internal/man3/evp_keymgmt_export_to_provider.pod +++ b/doc/internal/man3/evp_keymgmt_export_to_provider.pod @@ -8,7 +8,7 @@ evp_keymgmt_clear_pkey_cache =head1 SYNOPSIS - #include "internal/evp_int.h" + #include "crypto/evp.h" void *evp_keymgmt_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt); void evp_keymgmt_clear_pkey_cache(EVP_PKEY *pk); diff --git a/doc/internal/man3/evp_keymgmt_freekey.pod b/doc/internal/man3/evp_keymgmt_freekey.pod index 597c34b6d4..8be73aee81 100644 --- a/doc/internal/man3/evp_keymgmt_freekey.pod +++ b/doc/internal/man3/evp_keymgmt_freekey.pod @@ -14,7 +14,7 @@ evp_keymgmt_importkey_types, evp_keymgmt_exportkey_types =head1 SYNOPSIS - #include "internal/evp_int.h" + #include "crypto/evp.h" void *evp_keymgmt_importdomparams(const EVP_KEYMGMT *keymgmt, const OSSL_PARAM params[]); diff --git a/doc/internal/man3/ossl_init_thread_deregister.pod b/doc/internal/man3/ossl_init_thread_deregister.pod index ccfb419731..923b525477 100644 --- a/doc/internal/man3/ossl_init_thread_deregister.pod +++ b/doc/internal/man3/ossl_init_thread_deregister.pod @@ -9,7 +9,7 @@ ossl_init_thread_deregister =head1 SYNOPSIS - #include "internal/cryptlib_int.h" + #include "crypto/cryptlib.h" #include <openssl/core.h> typedef void (*OSSL_thread_stop_handler_fn)(void *arg); diff --git a/doc/internal/man3/rand_bytes_ex.pod b/doc/internal/man3/rand_bytes_ex.pod index cf54e02a31..e1bb0f04df 100644 --- a/doc/internal/man3/rand_bytes_ex.pod +++ b/doc/internal/man3/rand_bytes_ex.pod @@ -7,7 +7,7 @@ rand_bytes_ex, rand_priv_bytes_ex =head1 SYNOPSIS - #include "internal/rand_int.h" + #include "crypto/rand.h" int rand_bytes_ex(OPENSSL_CTX *ctx, unsigned char *buf, int num); int rand_priv_bytes_ex(OPENSSL_CTX *ctx, unsigned char *buf, int num); diff --git a/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H b/include/crypto/__DECC_INCLUDE_EPILOGUE.H index e57c0eab3e..e57c0eab3e 100644 --- a/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H +++ b/include/crypto/__DECC_INCLUDE_EPILOGUE.H diff --git a/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H b/include/crypto/__DECC_INCLUDE_PROLOGUE.H index a013957557..a013957557 100644 --- a/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H +++ b/include/crypto/__DECC_INCLUDE_PROLOGUE.H diff --git a/crypto/include/internal/aria.h b/include/crypto/aria.h index 4bfbd5a74a..4bfbd5a74a 100644 --- a/crypto/include/internal/aria.h +++ b/include/crypto/aria.h diff --git a/crypto/include/internal/asn1_int.h b/include/crypto/asn1.h index 674fa704a1..674fa704a1 100644 --- a/crypto/include/internal/asn1_int.h +++ b/include/crypto/asn1.h diff --git a/crypto/include/internal/asn1_dsa.h b/include/crypto/asn1_dsa.h index d2570516a1..d2570516a1 100644 --- a/crypto/include/internal/asn1_dsa.h +++ b/include/crypto/asn1_dsa.h diff --git a/crypto/include/internal/async.h b/include/crypto/async.h index e9a89da314..e9a89da314 100644 --- a/crypto/include/internal/async.h +++ b/include/crypto/async.h diff --git a/crypto/include/internal/bn_int.h b/include/crypto/bn.h index cb8b17662a..cb8b17662a 100644 --- a/crypto/include/internal/bn_int.h +++ b/include/crypto/bn.h diff --git a/crypto/include/internal/bn_conf.h.in b/include/crypto/bn_conf.h.in index 9061d20d82..9061d20d82 100644 --- a/crypto/include/internal/bn_conf.h.in +++ b/include/crypto/bn_conf.h.in diff --git a/crypto/include/internal/bn_dh.h b/include/crypto/bn_dh.h index 9077234250..9077234250 100644 --- a/crypto/include/internal/bn_dh.h +++ b/include/crypto/bn_dh.h diff --git a/crypto/include/internal/bn_srp.h b/include/crypto/bn_srp.h index 897618cd9e..897618cd9e 100644 --- a/crypto/include/internal/bn_srp.h +++ b/include/crypto/bn_srp.h diff --git a/crypto/include/internal/chacha.h b/include/crypto/chacha.h index e095522c50..e095522c50 100644 --- a/crypto/include/internal/chacha.h +++ b/include/crypto/chacha.h diff --git a/crypto/include/internal/ciphermode_platform.h b/include/crypto/ciphermode_platform.h index b16062fa93..b16062fa93 100644 --- a/crypto/include/internal/ciphermode_platform.h +++ b/include/crypto/ciphermode_platform.h diff --git a/crypto/include/internal/cms_int.h b/include/crypto/cms.h index c630991d68..c630991d68 100644 --- a/crypto/include/internal/cms_int.h +++ b/include/crypto/cms.h diff --git a/crypto/include/internal/cryptlib_int.h b/include/crypto/cryptlib.h index 69d94be54a..69d94be54a 100644 --- a/crypto/include/internal/cryptlib_int.h +++ b/include/crypto/cryptlib.h diff --git a/crypto/include/internal/ctype.h b/include/crypto/ctype.h index d0660cf9c4..d0660cf9c4 100644 --- a/crypto/include/internal/ctype.h +++ b/include/crypto/ctype.h diff --git a/crypto/include/internal/dso_conf.h.in b/include/crypto/dso_conf.h.in index 9a373b2032..9a373b2032 100644 --- a/crypto/include/internal/dso_conf.h.in +++ b/include/crypto/dso_conf.h.in diff --git a/crypto/include/internal/ec_int.h b/include/crypto/ec.h index 9d8882df2e..9d8882df2e 100644 --- a/crypto/include/internal/ec_int.h +++ b/include/crypto/ec.h diff --git a/crypto/include/internal/engine.h b/include/crypto/engine.h index fac6ed0966..fac6ed0966 100644 --- a/crypto/include/internal/engine.h +++ b/include/crypto/engine.h diff --git a/crypto/include/internal/err_int.h b/include/crypto/err.h index 68c6d62e30..68c6d62e30 100644 --- a/crypto/include/internal/err_int.h +++ b/include/crypto/err.h diff --git a/crypto/include/internal/ess_int.h b/include/crypto/ess.h index ac6c5c61d7..ac6c5c61d7 100644 --- a/crypto/include/internal/ess_int.h +++ b/include/crypto/ess.h diff --git a/crypto/include/internal/evp_int.h b/include/crypto/evp.h index b9dc95164c..b9dc95164c 100644 --- a/crypto/include/internal/evp_int.h +++ b/include/crypto/evp.h diff --git a/crypto/include/internal/lhash.h b/include/crypto/lhash.h index de0c8b0408..de0c8b0408 100644 --- a/crypto/include/internal/lhash.h +++ b/include/crypto/lhash.h diff --git a/crypto/include/internal/md32_common.h b/include/crypto/md32_common.h index 3b16f1b721..3b16f1b721 100644 --- a/crypto/include/internal/md32_common.h +++ b/include/crypto/md32_common.h diff --git a/crypto/include/internal/modes_int.h b/include/crypto/modes.h index 08e4ffae74..08e4ffae74 100644 --- a/crypto/include/internal/modes_int.h +++ b/include/crypto/modes.h diff --git a/crypto/include/internal/objects.h b/include/crypto/objects.h index 7db718f961..7db718f961 100644 --- a/crypto/include/internal/objects.h +++ b/include/crypto/objects.h diff --git a/crypto/include/internal/poly1305.h b/include/crypto/poly1305.h index 46f834e231..46f834e231 100644 --- a/crypto/include/internal/poly1305.h +++ b/include/crypto/poly1305.h diff --git a/crypto/include/internal/rand_int.h b/include/crypto/rand.h index bc427e3cf4..bc427e3cf4 100644 --- a/crypto/include/internal/rand_int.h +++ b/include/crypto/rand.h diff --git a/crypto/include/internal/sha.h b/include/crypto/sha.h index 3863261563..3863261563 100644 --- a/crypto/include/internal/sha.h +++ b/include/crypto/sha.h diff --git a/crypto/include/internal/siphash.h b/include/crypto/siphash.h index 1575141c40..1575141c40 100644 --- a/crypto/include/internal/siphash.h +++ b/include/crypto/siphash.h diff --git a/crypto/include/internal/siv_int.h b/include/crypto/siv.h index 8a8ef6e15f..8a8ef6e15f 100644 --- a/crypto/include/internal/siv_int.h +++ b/include/crypto/siv.h diff --git a/crypto/include/internal/sm2.h b/include/crypto/sm2.h index dad70e6547..dad70e6547 100644 --- a/crypto/include/internal/sm2.h +++ b/include/crypto/sm2.h diff --git a/crypto/include/internal/sm2err.h b/include/crypto/sm2err.h index 923bb6c4b8..923bb6c4b8 100644 --- a/crypto/include/internal/sm2err.h +++ b/include/crypto/sm2err.h diff --git a/crypto/include/internal/sm4.h b/include/crypto/sm4.h index f2e1728773..f2e1728773 100644 --- a/crypto/include/internal/sm4.h +++ b/include/crypto/sm4.h diff --git a/crypto/include/internal/sparse_array.h b/include/crypto/sparse_array.h index 037ccfeee9..037ccfeee9 100644 --- a/crypto/include/internal/sparse_array.h +++ b/include/crypto/sparse_array.h diff --git a/crypto/include/internal/store_int.h b/include/crypto/store.h index 67f2526261..afad09c778 100644 --- a/crypto/include/internal/store_int.h +++ b/include/crypto/store.h @@ -1,5 +1,5 @@ /* - * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_STORE_INT_H -# define HEADER_STORE_INT_H +#ifndef HEADER_STORE_H +# define HEADER_STORE_H # include <openssl/bio.h> # include <openssl/store.h> @@ -23,4 +23,6 @@ OSSL_STORE_CTX *ossl_store_attach_pem_bio(BIO *bp, const UI_METHOD *ui_method, void *ui_data); int ossl_store_detach_pem_bio(OSSL_STORE_CTX *ctx); +void ossl_store_cleanup_int(void); + #endif diff --git a/crypto/include/internal/x509_int.h b/include/crypto/x509.h index 11a776953b..11a776953b 100644 --- a/crypto/include/internal/x509_int.h +++ b/include/crypto/x509.h diff --git a/providers/build.info b/providers/build.info index 9642a3c153..80b2952494 100644 --- a/providers/build.info +++ b/providers/build.info @@ -9,7 +9,7 @@ IF[{- !$disabled{fips} -}] SOURCE[fips]=fips.ld GENERATE[fips.ld]=../util/providers.num ENDIF - INCLUDE[fips]=.. ../include ../crypto/include common/include + INCLUDE[fips]=.. ../include common/include DEFINE[fips]=FIPS_MODE ENDIF @@ -25,6 +25,6 @@ IF[{- !$disabled{legacy} -}] GENERATE[legacy.ld]=../util/providers.num ENDIF DEPEND[legacy]=../libcrypto - INCLUDE[legacy]=.. ../include ../crypto/include common/include + INCLUDE[legacy]=.. ../include common/include ENDIF ENDIF diff --git a/providers/common/ciphers/cipher_gcm.c b/providers/common/ciphers/cipher_gcm.c index b5c79daee7..09cd70cc53 100644 --- a/providers/common/ciphers/cipher_gcm.c +++ b/providers/common/ciphers/cipher_gcm.c @@ -12,7 +12,7 @@ #include "cipher_locl.h" #include "internal/ciphers/cipher_gcm.h" #include "internal/providercommonerr.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #include "internal/provider_ctx.h" static int gcm_tls_init(PROV_GCM_CTX *dat, unsigned char *aad, size_t aad_len); diff --git a/providers/common/ciphers/cipher_tdes.c b/providers/common/ciphers/cipher_tdes.c index e3e80d186a..0548531678 100644 --- a/providers/common/ciphers/cipher_tdes.c +++ b/providers/common/ciphers/cipher_tdes.c @@ -9,7 +9,7 @@ #include "cipher_locl.h" #include "internal/ciphers/cipher_tdes.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #include "internal/provider_algs.h" #include "internal/providercommonerr.h" diff --git a/providers/common/digests/sha2_prov.c b/providers/common/digests/sha2_prov.c index b872676506..d2c7df2ee6 100644 --- a/providers/common/digests/sha2_prov.c +++ b/providers/common/digests/sha2_prov.c @@ -16,7 +16,7 @@ #include <openssl/core_names.h> #include "internal/digestcommon.h" #include "internal/provider_algs.h" -#include "internal/sha.h" +#include "crypto/sha.h" static OSSL_OP_digest_set_ctx_params_fn sha1_set_ctx_params; static OSSL_OP_digest_settable_ctx_params_fn sha1_settable_ctx_params; diff --git a/providers/common/include/internal/ciphers/ciphercommon.h b/providers/common/include/internal/ciphers/ciphercommon.h index 7539d8cb81..9a01abf6cb 100644 --- a/providers/common/include/internal/ciphers/ciphercommon.h +++ b/providers/common/include/internal/ciphers/ciphercommon.h @@ -12,8 +12,8 @@ #include <openssl/core_names.h> #include <openssl/evp.h> #include "internal/cryptlib.h" -#include "internal/modes_int.h" -#include "internal/ciphermode_platform.h" +#include "crypto/modes.h" +#include "crypto/ciphermode_platform.h" #define MAXCHUNK ((size_t)1 << (sizeof(long) * 8 - 2)) #define MAXBITCHUNK ((size_t)1 << (sizeof(size_t) * 8 - 4)) diff --git a/providers/common/kdfs/hkdf.c b/providers/common/kdfs/hkdf.c index ac5cc34a21..041811f0e1 100644 --- a/providers/common/kdfs/hkdf.c +++ b/providers/common/kdfs/hkdf.c @@ -16,7 +16,7 @@ #include <openssl/core_names.h> #include "internal/cryptlib.h" #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_ctx.h" #include "internal/providercommonerr.h" #include "internal/provider_algs.h" diff --git a/providers/common/kdfs/kbkdf.c b/providers/common/kdfs/kbkdf.c index 77cee258e8..ffffef0b17 100644 --- a/providers/common/kdfs/kbkdf.c +++ b/providers/common/kdfs/kbkdf.c @@ -35,7 +35,7 @@ #include <openssl/params.h> #include "internal/cryptlib.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/numbers.h" #include "internal/provider_algs.h" #include "internal/provider_ctx.h" diff --git a/providers/common/kdfs/pbkdf2.c b/providers/common/kdfs/pbkdf2.c index c8480125b2..b98123b872 100644 --- a/providers/common/kdfs/pbkdf2.c +++ b/providers/common/kdfs/pbkdf2.c @@ -16,7 +16,7 @@ #include <openssl/core_names.h> #include "internal/cryptlib.h" #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_ctx.h" #include "internal/providercommonerr.h" #include "internal/provider_algs.h" diff --git a/providers/common/kdfs/sskdf.c b/providers/common/kdfs/sskdf.c index d74da436a2..1e538a9c0a 100644 --- a/providers/common/kdfs/sskdf.c +++ b/providers/common/kdfs/sskdf.c @@ -44,7 +44,7 @@ #include <openssl/params.h> #include "internal/cryptlib.h" #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_ctx.h" #include "internal/providercommonerr.h" #include "internal/provider_algs.h" diff --git a/providers/common/kdfs/tls1_prf.c b/providers/common/kdfs/tls1_prf.c index 3053b756dc..af49b1b044 100644 --- a/providers/common/kdfs/tls1_prf.c +++ b/providers/common/kdfs/tls1_prf.c @@ -54,7 +54,7 @@ #include <openssl/params.h> #include "internal/cryptlib.h" #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_ctx.h" #include "internal/providercommonerr.h" #include "internal/provider_algs.h" diff --git a/providers/default/ciphers/cipher_aria.h b/providers/default/ciphers/cipher_aria.h index 984be8f4aa..e95e4ca93c 100644 --- a/providers/default/ciphers/cipher_aria.h +++ b/providers/default/ciphers/cipher_aria.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/aria.h" +#include "crypto/aria.h" #include "internal/ciphers/ciphercommon.h" typedef struct prov_aria_ctx_st { diff --git a/providers/default/ciphers/cipher_aria_ccm.h b/providers/default/ciphers/cipher_aria_ccm.h index b3e990766d..fe0a3908bc 100644 --- a/providers/default/ciphers/cipher_aria_ccm.h +++ b/providers/default/ciphers/cipher_aria_ccm.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/aria.h" +#include "crypto/aria.h" #include "internal/ciphers/ciphercommon.h" #include "internal/ciphers/cipher_ccm.h" diff --git a/providers/default/ciphers/cipher_aria_gcm.h b/providers/default/ciphers/cipher_aria_gcm.h index 3499ceaaf7..ac5c248201 100644 --- a/providers/default/ciphers/cipher_aria_gcm.h +++ b/providers/default/ciphers/cipher_aria_gcm.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/aria.h" +#include "crypto/aria.h" #include "internal/ciphers/ciphercommon.h" #include "internal/ciphers/cipher_gcm.h" diff --git a/providers/default/ciphers/cipher_des.c b/providers/default/ciphers/cipher_des.c index a1976fb737..9456c205b8 100644 --- a/providers/default/ciphers/cipher_des.c +++ b/providers/default/ciphers/cipher_des.c @@ -9,7 +9,7 @@ #include "cipher_locl.h" #include "cipher_des.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #include "internal/provider_algs.h" #include "internal/providercommonerr.h" diff --git a/providers/default/ciphers/cipher_sm4.h b/providers/default/ciphers/cipher_sm4.h index 842c218f30..4740bb3355 100644 --- a/providers/default/ciphers/cipher_sm4.h +++ b/providers/default/ciphers/cipher_sm4.h @@ -8,7 +8,7 @@ */ #include "internal/ciphers/ciphercommon.h" -#include "internal/sm4.h" +#include "crypto/sm4.h" typedef struct prov_cast_ctx_st { PROV_CIPHER_CTX base; /* Must be first */ diff --git a/providers/default/ciphers/cipher_tdes_wrap.c b/providers/default/ciphers/cipher_tdes_wrap.c index 08662dbdb0..b48b3c9733 100644 --- a/providers/default/ciphers/cipher_tdes_wrap.c +++ b/providers/default/ciphers/cipher_tdes_wrap.c @@ -9,8 +9,8 @@ #include <openssl/sha.h> #include "cipher_tdes_default.h" -#include "internal/evp_int.h" -#include "internal/rand_int.h" +#include "crypto/evp.h" +#include "crypto/rand.h" #include "internal/provider_algs.h" #include "internal/providercommonerr.h" diff --git a/providers/default/kdfs/scrypt.c b/providers/default/kdfs/scrypt.c index abb4437d70..505963eec5 100644 --- a/providers/default/kdfs/scrypt.c +++ b/providers/default/kdfs/scrypt.c @@ -14,7 +14,7 @@ #include <openssl/kdf.h> #include <openssl/err.h> #include <openssl/core_names.h> -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/numbers.h" #include "internal/provider_algs.h" #include "internal/provider_ctx.h" diff --git a/providers/default/kdfs/sshkdf.c b/providers/default/kdfs/sshkdf.c index 2db5397294..7e6445dbdd 100644 --- a/providers/default/kdfs/sshkdf.c +++ b/providers/default/kdfs/sshkdf.c @@ -15,7 +15,7 @@ #include <openssl/core_names.h> #include "internal/cryptlib.h" #include "internal/numbers.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_ctx.h" #include "internal/providercommonerr.h" #include "internal/provider_algs.h" diff --git a/providers/default/kdfs/x942kdf.c b/providers/default/kdfs/x942kdf.c index 7c3afef911..65c586fb99 100644 --- a/providers/default/kdfs/x942kdf.c +++ b/providers/default/kdfs/x942kdf.c @@ -24,7 +24,7 @@ # include <openssl/core_names.h> # include "internal/cryptlib.h" # include "internal/numbers.h" -# include "internal/evp_int.h" +# include "crypto/evp.h" # include "internal/provider_ctx.h" # include "internal/providercommonerr.h" # include "internal/provider_algs.h" diff --git a/providers/default/macs/poly1305_prov.c b/providers/default/macs/poly1305_prov.c index e76f982ace..88005716e6 100644 --- a/providers/default/macs/poly1305_prov.c +++ b/providers/default/macs/poly1305_prov.c @@ -13,7 +13,7 @@ #include <openssl/evp.h> #include <openssl/err.h> -#include "internal/poly1305.h" +#include "crypto/poly1305.h" /* * TODO(3.0) when poly1305 has moved entirely to our providers, this * header should be moved to the provider include directory. For the diff --git a/providers/default/macs/siphash_prov.c b/providers/default/macs/siphash_prov.c index 1a36846bfe..a9511925f0 100644 --- a/providers/default/macs/siphash_prov.c +++ b/providers/default/macs/siphash_prov.c @@ -14,7 +14,7 @@ #include <openssl/evp.h> #include <openssl/err.h> -#include "internal/siphash.h" +#include "crypto/siphash.h" /* * TODO(3.0) when siphash has moved entirely to our providers, this * header should be moved to the provider include directory. For the diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index ce843552d7..166d02496e 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -25,7 +25,7 @@ #include "internal/cryptlib.h" #include "internal/property.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" #include "internal/provider_algs.h" #include "internal/provider_ctx.h" #include "internal/providercommon.h" diff --git a/test/asn1_dsa_internal_test.c b/test/asn1_dsa_internal_test.c index a62f5e4cd4..21e574d3fb 100644 --- a/test/asn1_dsa_internal_test.c +++ b/test/asn1_dsa_internal_test.c @@ -11,7 +11,7 @@ #include <string.h> #include <openssl/bn.h> -#include "internal/asn1_dsa.h" +#include "crypto/asn1_dsa.h" #include "testutil.h" static unsigned char t_dsa_sig[] = { diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c index 753449cabb..e77299a7c8 100644 --- a/test/asn1_internal_test.c +++ b/test/asn1_internal_test.c @@ -59,7 +59,7 @@ static int test_tbl_standard(void) * ***/ -#include "internal/asn1_int.h" +#include "crypto/asn1.h" #include "../crypto/asn1/standard_methods.h" static int test_standard_methods(void) diff --git a/test/bn_internal_test.c b/test/bn_internal_test.c index cf47e8b734..f3e874960d 100644 --- a/test/bn_internal_test.c +++ b/test/bn_internal_test.c @@ -20,7 +20,7 @@ #include "internal/numbers.h" #include "testutil.h" #include "bn_prime.h" -#include "internal/bn_int.h" +#include "crypto/bn.h" static BN_CTX *ctx; diff --git a/test/build.info b/test/build.info index caa70da821..7328641243 100644 --- a/test/build.info +++ b/test/build.info @@ -546,7 +546,7 @@ IF[{- !$disabled{tests} -}] DEPEND[property_test]=../libcrypto.a libtestutil.a SOURCE[ctype_internal_test]=ctype_internal_test.c - INCLUDE[ctype_internal_test]=.. ../crypto/include ../include ../apps/include + INCLUDE[ctype_internal_test]=.. ../include ../apps/include DEPEND[ctype_internal_test]=../libcrypto.a libtestutil.a SOURCE[sparse_array_test]=sparse_array_test.c @@ -578,11 +578,11 @@ IF[{- !$disabled{tests} -}] DEPEND[rdrand_sanitytest]=../libcrypto.a libtestutil.a SOURCE[rsa_sp800_56b_test]=rsa_sp800_56b_test.c - INCLUDE[rsa_sp800_56b_test]=.. ../include ../crypto/include ../crypto/rsa ../apps/include + INCLUDE[rsa_sp800_56b_test]=.. ../include ../crypto/rsa ../apps/include DEPEND[rsa_sp800_56b_test]=../libcrypto.a libtestutil.a SOURCE[bn_internal_test]=bn_internal_test.c - INCLUDE[bn_internal_test]=.. ../include ../crypto/include ../crypto/bn ../apps/include + INCLUDE[bn_internal_test]=.. ../include ../crypto/bn ../apps/include DEPEND[bn_internal_test]=../libcrypto.a libtestutil.a SOURCE[asn1_dsa_internal_test]=asn1_dsa_internal_test.c diff --git a/test/chacha_internal_test.c b/test/chacha_internal_test.c index 40f1f12fcd..878bd752e0 100644 --- a/test/chacha_internal_test.c +++ b/test/chacha_internal_test.c @@ -15,7 +15,7 @@ #include <string.h> #include <openssl/opensslconf.h> #include "testutil.h" -#include "internal/chacha.h" +#include "crypto/chacha.h" static const unsigned int key[] = { 0x03020100, 0x07060504, 0x0b0a0908, 0x0f0e0d0c, diff --git a/test/ctype_internal_test.c b/test/ctype_internal_test.c index b0aac6a4d2..e2e7dc0bac 100644 --- a/test/ctype_internal_test.c +++ b/test/ctype_internal_test.c @@ -8,7 +8,7 @@ */ #include "testutil.h" -#include "internal/ctype.h" +#include "crypto/ctype.h" #include "internal/nelem.h" #include <ctype.h> #include <stdio.h> diff --git a/test/drbgtest.c b/test/drbgtest.c index 4559ffd635..f5b19344b6 100644 --- a/test/drbgtest.c +++ b/test/drbgtest.c @@ -16,7 +16,7 @@ #include <openssl/evp.h> #include <openssl/aes.h> #include "../crypto/rand/rand_lcl.h" -#include "../crypto/include/internal/rand_int.h" +#include "../include/crypto/rand.h" #if defined(_WIN32) # include <windows.h> diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c index 1898e31de8..12c21e195c 100644 --- a/test/evp_extra_test.c +++ b/test/evp_extra_test.c @@ -24,7 +24,7 @@ #include <openssl/dsa.h> #include "testutil.h" #include "internal/nelem.h" -#include "internal/evp_int.h" +#include "crypto/evp.h" /* * kExampleRSAKeyDER is an RSA private key in ASN.1, DER format. Of course, you diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c index 02e5c8d0a8..37ca2b14bd 100644 --- a/test/modes_internal_test.c +++ b/test/modes_internal_test.c @@ -15,7 +15,7 @@ #include <openssl/aes.h> #include <openssl/modes.h> #include "testutil.h" -#include "internal/modes_int.h" +#include "crypto/modes.h" #include "internal/nelem.h" typedef struct { diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c index e2f9381621..504e474b7c 100644 --- a/test/poly1305_internal_test.c +++ b/test/poly1305_internal_test.c @@ -13,7 +13,7 @@ #include <string.h> #include "testutil.h" -#include "internal/poly1305.h" +#include "crypto/poly1305.h" #include "../crypto/poly1305/poly1305_local.h" #include "internal/nelem.h" diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c index 6934b89dc0..84d90daeeb 100644 --- a/test/shlibloadtest.c +++ b/test/shlibloadtest.c @@ -13,7 +13,7 @@ #include <openssl/opensslv.h> #include <openssl/ssl.h> #include <openssl/ossl_typ.h> -#include "internal/dso_conf.h" +#include "crypto/dso_conf.h" typedef void DSO; diff --git a/test/siphash_internal_test.c b/test/siphash_internal_test.c index 75caefd899..e77e9d265f 100644 --- a/test/siphash_internal_test.c +++ b/test/siphash_internal_test.c @@ -14,7 +14,7 @@ #include <openssl/bio.h> #include "testutil.h" -#include "internal/siphash.h" +#include "crypto/siphash.h" #include "../crypto/siphash/siphash_local.h" #include "internal/nelem.h" diff --git a/test/sm2_internal_test.c b/test/sm2_internal_test.c index 8e76daa913..0c626526b1 100644 --- a/test/sm2_internal_test.c +++ b/test/sm2_internal_test.c @@ -21,7 +21,7 @@ #ifndef OPENSSL_NO_SM2 -# include "internal/sm2.h" +# include "crypto/sm2.h" static RAND_METHOD fake_rand; static const RAND_METHOD *saved_rand; diff --git a/test/sm4_internal_test.c b/test/sm4_internal_test.c index 7ccd6e46db..0a5ea738e5 100644 --- a/test/sm4_internal_test.c +++ b/test/sm4_internal_test.c @@ -17,7 +17,7 @@ #include "testutil.h" #ifndef OPENSSL_NO_SM4 -# include "internal/sm4.h" +# include "crypto/sm4.h" static int test_sm4_ecb(void) { diff --git a/test/sparse_array_test.c b/test/sparse_array_test.c index 5cc8038f7f..2c7f5a878c 100644 --- a/test/sparse_array_test.c +++ b/test/sparse_array_test.c @@ -15,7 +15,7 @@ #include <openssl/crypto.h> #include <internal/nelem.h> -#include "internal/sparse_array.h" +#include "crypto/sparse_array.h" #include "testutil.h" /* The macros below generate unused functions which error out one of the clang |