Browse Source

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)
Dr. Matthias St. Pierre 3 years ago
parent
commit
25f2138b0a
329 changed files with 398 additions and 406 deletions
  1. +1
    -1
      .gitignore
  2. +7
    -7
      build.info
  3. +1
    -1
      crypto/aria/aria.c
  4. +1
    -1
      crypto/asn1/a_d2i_fp.c
  5. +1
    -1
      crypto/asn1/a_mbstr.c
  6. +2
    -2
      crypto/asn1/a_object.c
  7. +1
    -1
      crypto/asn1/a_print.c
  8. +2
    -2
      crypto/asn1/a_sign.c
  9. +1
    -1
      crypto/asn1/a_strex.c
  10. +1
    -1
      crypto/asn1/a_time.c
  11. +2
    -2
      crypto/asn1/a_verify.c
  12. +2
    -2
      crypto/asn1/ameth_lib.c
  13. +2
    -2
      crypto/asn1/asn_mime.c
  14. +3
    -3
      crypto/asn1/asn_moid.c
  15. +2
    -2
      crypto/asn1/d2i_param.c
  16. +2
    -2
      crypto/asn1/d2i_pr.c
  17. +1
    -1
      crypto/asn1/d2i_pu.c
  18. +1
    -1
      crypto/asn1/f_int.c
  19. +1
    -1
      crypto/asn1/f_string.c
  20. +2
    -2
      crypto/asn1/i2d_param.c
  21. +2
    -2
      crypto/asn1/i2d_pr.c
  22. +1
    -1
      crypto/asn1/p8_pkey.c
  23. +1
    -1
      crypto/asn1/t_pkey.c
  24. +1
    -1
      crypto/asn1/tasn_enc.c
  25. +1
    -1
      crypto/asn1/tasn_prn.c
  26. +1
    -1
      crypto/asn1/x_algor.c
  27. +1
    -1
      crypto/asn1/x_sig.c
  28. +1
    -1
      crypto/asn1_dsa.c
  29. +1
    -1
      crypto/async/async.c
  30. +1
    -1
      crypto/async/async_locl.h
  31. +1
    -1
      crypto/bio/b_print.c
  32. +1
    -1
      crypto/blake2/m_blake2b.c
  33. +1
    -1
      crypto/blake2/m_blake2s.c
  34. +1
    -1
      crypto/bn/bn_conv.c
  35. +1
    -1
      crypto/bn/bn_dh.c
  36. +2
    -2
      crypto/bn/bn_lcl.h
  37. +1
    -1
      crypto/bn/bn_rand.c
  38. +1
    -1
      crypto/bn/bn_rsa_fips186_4.c
  39. +1
    -1
      crypto/bn/bn_srp.c
  40. +1
    -1
      crypto/chacha/chacha_enc.c
  41. +1
    -1
      crypto/cmac/cm_ameth.c
  42. +2
    -2
      crypto/cms/cms_env.c
  43. +2
    -2
      crypto/cms/cms_ess.c
  44. +1
    -1
      crypto/cms/cms_kari.c
  45. +1
    -1
      crypto/cms/cms_pwri.c
  46. +4
    -4
      crypto/cms/cms_sd.c
  47. +1
    -1
      crypto/cms/cms_smime.c
  48. +1
    -1
      crypto/comp/c_zlib.c
  49. +1
    -1
      crypto/conf/conf_lib.c
  50. +1
    -1
      crypto/context.c
  51. +1
    -1
      crypto/core_namemap.c
  52. +2
    -2
      crypto/cryptlib.c
  53. +1
    -1
      crypto/ctype.c
  54. +2
    -2
      crypto/dh/dh_ameth.c
  55. +1
    -1
      crypto/dh/dh_key.c
  56. +1
    -1
      crypto/dh/dh_pmeth.c
  57. +1
    -1
      crypto/dh/dh_rfc5114.c
  58. +1
    -1
      crypto/dh/dh_rfc7919.c
  59. +1
    -1
      crypto/dllmain.c
  60. +2
    -2
      crypto/dsa/dsa_ameth.c
  61. +1
    -1
      crypto/dsa/dsa_asn1.c
  62. +1
    -1
      crypto/dsa/dsa_ossl.c
  63. +1
    -1
      crypto/dsa/dsa_pmeth.c
  64. +1
    -1
      crypto/dso/dso_locl.h
  65. +1
    -1
      crypto/ec/ec2_smpl.c
  66. +2
    -2
      crypto/ec/ec_ameth.c
  67. +1
    -1
      crypto/ec/ec_asn1.c
  68. +1
    -1
      crypto/ec/ec_cvt.c
  69. +1
    -1
      crypto/ec/ec_lcl.h
  70. +1
    -1
      crypto/ec/ec_mult.c
  71. +1
    -1
      crypto/ec/ec_pmeth.c
  72. +1
    -1
      crypto/ec/ecdsa_ossl.c
  73. +1
    -1
      crypto/ec/ecp_nistz256.c
  74. +2
    -2
      crypto/ec/ecx_meth.c
  75. +1
    -1
      crypto/engine/eng_int.h
  76. +1
    -1
      crypto/engine/eng_openssl.c
  77. +1
    -1
      crypto/engine/eng_rdrand.c
  78. +1
    -1
      crypto/engine/tb_asnmth.c
  79. +3
    -3
      crypto/err/err.c
  80. +1
    -1
      crypto/err/err_all.c
  81. +1
    -1
      crypto/err/openssl.ec
  82. +1
    -1
      crypto/ess/ess_asn1.c
  83. +1
    -1
      crypto/ess/ess_lib.c
  84. +1
    -1
      crypto/evp/bio_md.c
  85. +1
    -1
      crypto/evp/bio_ok.c
  86. +1
    -1
      crypto/evp/c_allc.c
  87. +1
    -1
      crypto/evp/c_alld.c
  88. +1
    -1
      crypto/evp/cmeth_lib.c
  89. +1
    -1
      crypto/evp/digest.c
  90. +4
    -4
      crypto/evp/e_aes.c
  91. +2
    -2
      crypto/evp/e_aes_cbc_hmac_sha1.c
  92. +2
    -2
      crypto/evp/e_aes_cbc_hmac_sha256.c
  93. +3
    -3
      crypto/evp/e_aria.c
  94. +1
    -1
      crypto/evp/e_bf.c
  95. +3
    -3
      crypto/evp/e_camellia.c
  96. +1
    -1
      crypto/evp/e_cast.c
  97. +3
    -3
      crypto/evp/e_chacha20_poly1305.c
  98. +1
    -1
      crypto/evp/e_des.c
  99. +1
    -1
      crypto/evp/e_des3.c
  100. +1
    -1
      crypto/evp/e_idea.c

+ 1
- 1
.gitignore View File

@ -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


+ 7
- 7
build.info View File

@ -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


+ 1
- 1
crypto/aria/aria.c View File

@ -19,7 +19,7 @@
*/
#include <openssl/e_os2.h>
#include "internal/aria.h"
#include "crypto/aria.h"
#include <assert.h>
#include <string.h>


+ 1
- 1
crypto/asn1/a_d2i_fp.c View File

@ -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


+ 1
- 1
crypto/asn1/a_mbstr.c View File

@ -8,7 +8,7 @@
*/
#include <stdio.h>
#include "internal/ctype.h"
#include "crypto/ctype.h"
#include "internal/cryptlib.h"
#include <openssl/asn1.h>


+ 2
- 2
crypto/asn1/a_object.c View File

@ -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)


+ 1
- 1
crypto/asn1/a_print.c View File

@ -8,7 +8,7 @@
*/
#include <stdio.h>
#include "internal/ctype.h"
#include "crypto/ctype.h"
#include "internal/cryptlib.h"
#include <openssl/asn1.h>


+ 2
- 2
crypto/asn1/a_sign.c View File

@ -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


+ 1
- 1
crypto/asn1/a_strex.c View File

@ -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>


+ 1
- 1
crypto/asn1/a_time.c View File

@ -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"


+ 2
- 2
crypto/asn1/a_verify.c View File

@ -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


+ 2
- 2
crypto/asn1/ameth_lib.c View File

@ -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"


+ 2
- 2
crypto/asn1/asn_mime.c View File

@ -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"


+ 3
- 3
crypto/asn1/asn_moid.c View File

@ -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 */


+ 2
- 2
crypto/asn1/d2i_param.c View File

@ -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)


+ 2
- 2
crypto/asn1/d2i_pr.c View File

@ -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)


+ 1
- 1
crypto/asn1/d2i_pu.c View File

@ -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)


+ 1
- 1
crypto/asn1/f_int.c View File

@ -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>


+ 1
- 1
crypto/asn1/f_string.c View File

@ -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>


+ 2
- 2
crypto/asn1/i2d_param.c View File

@ -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)
{


+ 2
- 2
crypto/asn1/i2d_pr.c View File

@ -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)
{


+ 1
- 1
crypto/asn1/p8_pkey.c View File

@ -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,


+ 1
- 1
crypto/asn1/t_pkey.c View File

@ -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


+ 1
- 1
crypto/asn1/tasn_enc.c View File

@ -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,


+ 1
- 1
crypto/asn1/tasn_prn.c View File

@ -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"
/*


+ 1
- 1
crypto/asn1/x_algor.c View File

@ -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),


+ 1
- 1
crypto/asn1/x_sig.c View File

@ -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),


+ 1
- 1
crypto/asn1_dsa.c View File

@ -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


+ 1
- 1
crypto/async/async.c View File

@ -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


+ 1
- 1
crypto/async/async_locl.h View File

@ -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;


+ 1
- 1
crypto/bio/b_print.c View File

@ -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>


+ 1
- 1
crypto/blake2/m_blake2b.c View File

@ -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)


+ 1
- 1
crypto/blake2/m_blake2s.c View File

@ -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)


+ 1
- 1
crypto/bn/bn_conv.c View File

@ -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";


+ 1
- 1
crypto/bn/bn_dh.c View File

@ -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


+ 2
- 2
crypto/bn/bn_lcl.h View File

@ -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


+ 1
- 1
crypto/bn/bn_rand.c View File

@ -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>


+ 1
- 1
crypto/bn/bn_rsa_fips186_4.c View File

@ -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".


+ 1
- 1
crypto/bn/bn_srp.c View File

@ -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__)


+ 1
- 1
crypto/chacha/chacha_enc.c View File

@ -11,7 +11,7 @@
#include <string.h>
#include "internal/chacha.h"
#include "crypto/chacha.h"
typedef unsigned int u32;
typedef unsigned char u8;


+ 1
- 1
crypto/cmac/cm_ameth.c View File

@ -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


+ 2
- 2
crypto/cms/cms_env.c View File

@ -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 */


+ 2
- 2
crypto/cms/cms_ess.c View File

@ -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)


+ 1
- 1
crypto/cms/cms_kari.c View File

@ -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 */


+ 1
- 1
crypto/cms/cms_pwri.c View File

@ -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)


+ 4
- 4
crypto/cms/cms_sd.c View File

@ -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 */


+ 1
- 1
crypto/cms/cms_smime.c View File

@ -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)
{


+ 1
- 1
crypto/comp/c_zlib.c View File

@ -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"


+ 1
- 1
crypto/conf/conf_lib.c View File

@ -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>


+ 1
- 1
crypto/context.c View File

@ -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"


+ 1
- 1
crypto/core_namemap.c View File

@ -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


+ 2
- 2
crypto/cryptlib.c View File

@ -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)
{


+ 1
- 1
crypto/ctype.c View File

@ -9,7 +9,7 @@
#include <string.h>
#include <stdio.h>
#include "internal/ctype.h"
#include "crypto/ctype.h"
#include "openssl/ebcdic.h"
/*


+ 2
- 2
crypto/dh/dh_ameth.c View File

@ -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"


+ 1
- 1
crypto/dh/dh_key.c View File

@ -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);


+ 1
- 1
crypto/dh/dh_pmeth.c View File

@ -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 */


+ 1
- 1
crypto/dh/dh_rfc5114.c View File

@ -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


+ 1
- 1
crypto/dh/dh_rfc7919.c View File

@ -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)
{


+ 1
- 1
crypto/dllmain.c View File

@ -8,7 +8,7 @@
*/
#include "e_os.h"
#include "internal/cryptlib_int.h"
#include "crypto/cryptlib.h"
#if defined(_WIN32) || defined(__CYGWIN__)
# ifdef __CYGWIN__


+ 2
- 2
crypto/dsa/dsa_ameth.c View File

@ -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"


+ 1
- 1
crypto/dsa/dsa_asn1.c View File

@ -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)
{


+ 1
- 1
crypto/dsa/dsa_ossl.c View File

@ -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"


+ 1
- 1
crypto/dsa/dsa_pmeth.c View File

@ -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 */


+ 1
- 1
crypto/dso/dso_locl.h View File

@ -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"
/**********************************************************************/


+ 1
- 1
crypto/ec/ec2_smpl.c View File

@ -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


+ 2
- 2
crypto/ec/ec_ameth.c View File

@ -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


+ 1
- 1
crypto/ec/ec_asn1.c View File

@ -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


+ 1
- 1
crypto/ec/ec_cvt.c View File

@ -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,


+ 1
- 1
crypto/ec/ec_lcl.h View File

@ -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


+ 1
- 1
crypto/ec/ec_mult.c View File

@ -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"


+ 1
- 1
crypto/ec/ec_pmeth.c View File

@ -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 */


+ 1
- 1
crypto/ec/ecdsa_ossl.c View File

@ -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,


+ 1
- 1
crypto/ec/ecp_nistz256.c View File

@ -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"


+ 2
- 2
crypto/ec/ecx_meth.c View File

@ -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"


+ 1
- 1
crypto/engine/eng_int.h View File

@ -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"


+ 1
- 1
crypto/engine/eng_openssl.c View File

@ -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>


+ 1
- 1
crypto/engine/eng_rdrand.c View File

@ -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>


+ 1
- 1
crypto/engine/tb_asnmth.c View File

@ -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


+ 3
- 3
crypto/err/err.c View File

@ -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"


+ 1
- 1
crypto/err/err_all.c View File

@ -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>


+ 1
- 1
crypto/err/openssl.ec View File

@ -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


+ 1
- 1
crypto/ess/ess_asn1.c View File

@ -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 */


+ 1
- 1
crypto/ess/ess_lib.c View File

@ -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,


+ 1
- 1
crypto/evp/bio_md.c View File

@ -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"


+ 1
- 1
crypto/evp/bio_ok.c View File

@ -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);


+ 1
- 1
crypto/evp/c_allc.c View File

@ -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>


+ 1
- 1
crypto/evp/c_alld.c View File

@ -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>


+ 1
- 1
crypto/evp/cmeth_lib.c View File

@ -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"


+ 1
- 1
crypto/evp/digest.c View File

@ -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"


+ 4
- 4
crypto/evp/e_aes.c View File

@ -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 {


+ 2
- 2
crypto/evp/e_aes_cbc_hmac_sha1.c View File

@ -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 {


+ 2
- 2
crypto/evp/e_aes_cbc_hmac_sha256.c View File

@ -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;


+ 3
- 3
crypto/evp/e_aria.c View File

@ -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 */


+ 1
- 1
crypto/evp/e_bf.c View File

@ -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>


+ 3
- 3
crypto/evp/e_camellia.c View File

@ -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);


+ 1
- 1
crypto/evp/e_cast.c View File

@ -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,


+ 3
- 3
crypto/evp/e_chacha20_poly1305.c View File

@ -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;


+ 1
- 1
crypto/evp/e_des.c View File

@ -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>


+ 1
- 1
crypto/evp/e_des3.c View File

@ -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"


+ 1
- 1
crypto/evp/e_idea.c View File

@ -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 */


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save