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 /providers/build.info | |
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 'providers/build.info')
-rw-r--r-- | providers/build.info | 4 |
1 files changed, 2 insertions, 2 deletions
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 |