Skip to content

Commit 0c994d5

Browse files
mspncpmspncp
committed
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 <[email protected]> (Merged from #9681)
1 parent 61df219 commit 0c994d5

File tree

247 files changed

+301
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+301
-309
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Makefile
2727
# Auto generated headers
2828
/crypto/buildinf.h
2929
/apps/progs.h
30-
/crypto/include/internal/*_conf.h
30+
/include/crypto/*_conf.h
3131
/openssl/include/opensslconf.h
3232
/util/domd
3333

‎build.info

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
"";
1010
-}
1111
LIBS=libcrypto libssl
12-
INCLUDE[libcrypto]=. crypto/include include
12+
INCLUDE[libcrypto]=. include
1313
INCLUDE[libssl]=. include
1414
DEPEND[libssl]=libcrypto
1515

1616
# Empty DEPEND "indices" means the dependencies are expected to be built
1717
# unconditionally before anything else.
18-
DEPEND[]=include/openssl/opensslconf.h crypto/include/internal/bn_conf.h \
19-
crypto/include/internal/dso_conf.h
18+
DEPEND[]=include/openssl/opensslconf.h include/crypto/bn_conf.h \
19+
include/crypto/dso_conf.h
2020
DEPEND[include/openssl/opensslconf.h]=configdata.pm
2121
GENERATE[include/openssl/opensslconf.h]=include/openssl/opensslconf.h.in
22-
DEPEND[crypto/include/internal/bn_conf.h]=configdata.pm
23-
GENERATE[crypto/include/internal/bn_conf.h]=crypto/include/internal/bn_conf.h.in
24-
DEPEND[crypto/include/internal/dso_conf.h]=configdata.pm
25-
GENERATE[crypto/include/internal/dso_conf.h]=crypto/include/internal/dso_conf.h.in
22+
DEPEND[include/crypto/bn_conf.h]=configdata.pm
23+
GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in
24+
DEPEND[include/crypto/dso_conf.h]=configdata.pm
25+
GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in
2626

2727
IF[{- defined $target{shared_defflag} -}]
2828
IF[{- $config{target} =~ /^mingw/ -}]

‎crypto/aria/aria.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020

2121
#include <openssl/e_os2.h>
22-
#include "internal/aria.h"
22+
#include "crypto/aria.h"
2323

2424
#include <assert.h>
2525
#include <string.h>

‎crypto/asn1/a_d2i_fp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "internal/numbers.h"
1414
#include <openssl/buffer.h>
1515
#include <openssl/asn1.h>
16-
#include "internal/asn1_int.h"
16+
#include "crypto/asn1.h"
1717

1818
#ifndef NO_OLD_ASN1
1919
# ifndef OPENSSL_NO_STDIO

‎crypto/asn1/a_mbstr.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
#include <stdio.h>
11-
#include "internal/ctype.h"
11+
#include "crypto/ctype.h"
1212
#include "internal/cryptlib.h"
1313
#include <openssl/asn1.h>
1414

‎crypto/asn1/a_object.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
#include <stdio.h>
1111
#include <limits.h>
12-
#include "internal/ctype.h"
12+
#include "crypto/ctype.h"
1313
#include "internal/cryptlib.h"
1414
#include <openssl/buffer.h>
1515
#include <openssl/asn1.h>
1616
#include <openssl/objects.h>
1717
#include <openssl/bn.h>
18-
#include "internal/asn1_int.h"
18+
#include "crypto/asn1.h"
1919
#include "asn1_locl.h"
2020

2121
int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp)

‎crypto/asn1/a_print.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
#include <stdio.h>
11-
#include "internal/ctype.h"
11+
#include "crypto/ctype.h"
1212
#include "internal/cryptlib.h"
1313
#include <openssl/asn1.h>
1414

‎crypto/asn1/a_sign.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <openssl/x509.h>
1919
#include <openssl/objects.h>
2020
#include <openssl/buffer.h>
21-
#include "internal/asn1_int.h"
22-
#include "internal/evp_int.h"
21+
#include "crypto/asn1.h"
22+
#include "crypto/evp.h"
2323

2424
#ifndef NO_ASN1_OLD
2525

‎crypto/asn1/a_strex.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <stdio.h>
1111
#include <string.h>
1212
#include "internal/cryptlib.h"
13-
#include "internal/asn1_int.h"
13+
#include "crypto/asn1.h"
1414
#include <openssl/crypto.h>
1515
#include <openssl/x509.h>
1616
#include <openssl/asn1.h>

‎crypto/asn1/a_time.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <stdio.h>
1818
#include <time.h>
19-
#include "internal/ctype.h"
19+
#include "crypto/ctype.h"
2020
#include "internal/cryptlib.h"
2121
#include <openssl/asn1t.h>
2222
#include "asn1_locl.h"

‎crypto/asn1/a_verify.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <openssl/objects.h>
1919
#include <openssl/buffer.h>
2020
#include <openssl/evp.h>
21-
#include "internal/asn1_int.h"
22-
#include "internal/evp_int.h"
21+
#include "crypto/asn1.h"
22+
#include "crypto/evp.h"
2323

2424
#ifndef NO_ASN1_OLD
2525

‎crypto/asn1/ameth_lib.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include <openssl/asn1t.h>
1414
#include <openssl/x509.h>
1515
#include <openssl/engine.h>
16-
#include "internal/asn1_int.h"
17-
#include "internal/evp_int.h"
16+
#include "crypto/asn1.h"
17+
#include "crypto/evp.h"
1818

1919
#include "standard_methods.h"
2020

‎crypto/asn1/asn_mime.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
*/
99

1010
#include <stdio.h>
11-
#include "internal/ctype.h"
11+
#include "crypto/ctype.h"
1212
#include "internal/cryptlib.h"
1313
#include <openssl/rand.h>
1414
#include <openssl/x509.h>
1515
#include <openssl/asn1.h>
1616
#include <openssl/asn1t.h>
17-
#include "internal/evp_int.h"
17+
#include "crypto/evp.h"
1818
#include "internal/bio.h"
1919
#include "asn1_locl.h"
2020

‎crypto/asn1/asn_moid.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
*/
99

1010
#include <stdio.h>
11-
#include "internal/ctype.h"
11+
#include "crypto/ctype.h"
1212
#include <openssl/crypto.h>
1313
#include "internal/cryptlib.h"
1414
#include <openssl/conf.h>
1515
#include <openssl/x509.h>
16-
#include "internal/asn1_int.h"
17-
#include "internal/objects.h"
16+
#include "crypto/asn1.h"
17+
#include "crypto/objects.h"
1818

1919
/* Simple ASN1 OID module: add all objects in a given section */
2020

‎crypto/asn1/d2i_pr.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include <openssl/engine.h>
1616
#include <openssl/x509.h>
1717
#include <openssl/asn1.h>
18-
#include "internal/asn1_int.h"
19-
#include "internal/evp_int.h"
18+
#include "crypto/asn1.h"
19+
#include "crypto/evp.h"
2020

2121
EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
2222
long length)

‎crypto/asn1/d2i_pu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <openssl/dsa.h>
1818
#include <openssl/ec.h>
1919

20-
#include "internal/evp_int.h"
20+
#include "crypto/evp.h"
2121

2222
EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
2323
long length)

‎crypto/asn1/f_int.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
#include <stdio.h>
11-
#include "internal/ctype.h"
11+
#include "crypto/ctype.h"
1212
#include "internal/cryptlib.h"
1313
#include <openssl/buffer.h>
1414
#include <openssl/asn1.h>

‎crypto/asn1/f_string.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
#include <stdio.h>
11-
#include "internal/ctype.h"
11+
#include "crypto/ctype.h"
1212
#include "internal/cryptlib.h"
1313
#include <openssl/buffer.h>
1414
#include <openssl/asn1.h>

‎crypto/asn1/i2d_pr.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include "internal/cryptlib.h"
1212
#include <openssl/evp.h>
1313
#include <openssl/x509.h>
14-
#include "internal/asn1_int.h"
15-
#include "internal/evp_int.h"
14+
#include "crypto/asn1.h"
15+
#include "crypto/evp.h"
1616

1717
int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp)
1818
{

‎crypto/asn1/p8_pkey.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "internal/cryptlib.h"
1212
#include <openssl/asn1t.h>
1313
#include <openssl/x509.h>
14-
#include "internal/x509_int.h"
14+
#include "crypto/x509.h"
1515

1616
/* Minor tweak to operation: zero private key data */
1717
static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,

‎crypto/asn1/t_pkey.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "internal/cryptlib.h"
1212
#include <openssl/objects.h>
1313
#include <openssl/buffer.h>
14-
#include "internal/bn_int.h"
14+
#include "crypto/bn.h"
1515

1616
/* Number of octets per line */
1717
#define ASN1_BUF_PRINT_WIDTH 15

‎crypto/asn1/tasn_enc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <openssl/asn1.h>
1414
#include <openssl/asn1t.h>
1515
#include <openssl/objects.h>
16-
#include "internal/asn1_int.h"
16+
#include "crypto/asn1.h"
1717
#include "asn1_locl.h"
1818

1919
static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,

‎crypto/asn1/tasn_prn.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <openssl/buffer.h>
1616
#include <openssl/err.h>
1717
#include <openssl/x509v3.h>
18-
#include "internal/asn1_int.h"
18+
#include "crypto/asn1.h"
1919
#include "asn1_locl.h"
2020

2121
/*

‎crypto/asn1/x_algor.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <openssl/x509.h>
1212
#include <openssl/asn1.h>
1313
#include <openssl/asn1t.h>
14-
#include "internal/evp_int.h"
14+
#include "crypto/evp.h"
1515

1616
ASN1_SEQUENCE(X509_ALGOR) = {
1717
ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT),

‎crypto/asn1/x_sig.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "internal/cryptlib.h"
1212
#include <openssl/asn1t.h>
1313
#include <openssl/x509.h>
14-
#include "internal/x509_int.h"
14+
#include "crypto/x509.h"
1515

1616
ASN1_SEQUENCE(X509_SIG) = {
1717
ASN1_SIMPLE(X509_SIG, algor, X509_ALGOR),

‎crypto/async/async.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "async_locl.h"
2020

2121
#include <openssl/err.h>
22-
#include "internal/cryptlib_int.h"
22+
#include "crypto/cryptlib.h"
2323
#include <string.h>
2424

2525
#define ASYNC_JOB_RUNNING 0

‎crypto/async/async_locl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# include <windows.h>
2121
#endif
2222

23-
#include "internal/async.h"
23+
#include "crypto/async.h"
2424
#include <openssl/crypto.h>
2525

2626
typedef struct async_ctx_st async_ctx;

‎crypto/bio/b_print.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <stdio.h>
1111
#include <string.h>
1212
#include "internal/cryptlib.h"
13-
#include "internal/ctype.h"
13+
#include "crypto/ctype.h"
1414
#include "internal/numbers.h"
1515
#include <openssl/bio.h>
1616

‎crypto/blake2/m_blake2b.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# include <openssl/evp.h>
2222
# include <openssl/objects.h>
2323
# include "blake2_locl.h"
24-
# include "internal/evp_int.h"
24+
# include "crypto/evp.h"
2525

2626
static int init(EVP_MD_CTX *ctx)
2727
{

‎crypto/blake2/m_blake2s.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# include <openssl/evp.h>
2222
# include <openssl/objects.h>
2323
# include "blake2_locl.h"
24-
# include "internal/evp_int.h"
24+
# include "crypto/evp.h"
2525

2626
static int init(EVP_MD_CTX *ctx)
2727
{

‎crypto/bn/bn_dh.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#ifndef OPENSSL_NO_DH
1414
#include <openssl/dh.h>
15-
#include "internal/bn_dh.h"
15+
#include "crypto/bn_dh.h"
1616
/* DH parameters from RFC5114 */
1717

1818
# if BN_BITS2 == 64

‎crypto/bn/bn_lcl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
# include <openssl/opensslconf.h>
1919

2020
# if !defined(OPENSSL_SYS_UEFI)
21-
# include "internal/bn_conf.h"
21+
# include "crypto/bn_conf.h"
2222
# endif
2323

24-
# include "internal/bn_int.h"
24+
# include "crypto/bn.h"
2525

2626
/*
2727
* These preprocessor symbols control various aspects of the bignum headers

‎crypto/bn/bn_print.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
#include <stdio.h>
11-
#include "internal/ctype.h"
11+
#include "crypto/ctype.h"
1212
#include <limits.h>
1313
#include "internal/cryptlib.h"
1414
#include <openssl/buffer.h>

‎crypto/bn/bn_srp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef OPENSSL_NO_SRP
1414

1515
#include <openssl/srp.h>
16-
#include "internal/bn_srp.h"
16+
#include "crypto/bn_srp.h"
1717

1818
# if (BN_BYTES == 8)
1919
# if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)

‎crypto/chacha/chacha_enc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <string.h>
1313

14-
#include "internal/chacha.h"
14+
#include "crypto/chacha.h"
1515

1616
typedef unsigned int u32;
1717
typedef unsigned char u8;

‎crypto/cmac/cm_ameth.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "internal/cryptlib.h"
1212
#include <openssl/evp.h>
1313
#include <openssl/cmac.h>
14-
#include "internal/asn1_int.h"
14+
#include "crypto/asn1.h"
1515

1616
/*
1717
* CMAC "ASN1" method. This is just here to indicate the maximum CMAC output

‎crypto/cmac/cm_pmeth.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <openssl/x509v3.h>
1414
#include <openssl/evp.h>
1515
#include <openssl/cmac.h>
16-
#include "internal/evp_int.h"
16+
#include "crypto/evp.h"
1717

1818
/* The context structure and "key" is simply a CMAC_CTX */
1919

‎crypto/cms/cms_env.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include <openssl/cms.h>
1616
#include <openssl/aes.h>
1717
#include "cms_lcl.h"
18-
#include "internal/asn1_int.h"
19-
#include "internal/evp_int.h"
18+
#include "crypto/asn1.h"
19+
#include "crypto/evp.h"
2020

2121
/* CMS EnvelopedData Utilities */
2222

0 commit comments

Comments
 (0)