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/objects | |
| parent | ea8e1fe55b51d9da69977d8dc3f2ffd648d438df (diff) | |
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/objects')
| -rw-r--r-- | crypto/objects/o_names.c | 2 | ||||
| -rw-r--r-- | crypto/objects/obj_dat.c | 6 | ||||
| -rw-r--r-- | crypto/objects/obj_lib.c | 2 |
3 files changed, 5 insertions, 5 deletions
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) { |