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 /crypto/cms | |
parent | ea8e1fe55b51d9da69977d8dc3f2ffd648d438df (diff) | |
download | openssl-25f2138b0ab54a65ba713c093ca3734d88f7cb51.tar.gz |
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)
Diffstat (limited to 'crypto/cms')
-rw-r--r-- | crypto/cms/cms_env.c | 4 | ||||
-rw-r--r-- | crypto/cms/cms_ess.c | 4 | ||||
-rw-r--r-- | crypto/cms/cms_kari.c | 2 | ||||
-rw-r--r-- | crypto/cms/cms_pwri.c | 2 | ||||
-rw-r--r-- | crypto/cms/cms_sd.c | 8 | ||||
-rw-r--r-- | crypto/cms/cms_smime.c | 2 |
6 files changed, 11 insertions, 11 deletions
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) { |