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/default/macs | |
| 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/default/macs')
| -rw-r--r-- | providers/default/macs/poly1305_prov.c | 2 | ||||
| -rw-r--r-- | providers/default/macs/siphash_prov.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/providers/default/macs/poly1305_prov.c b/providers/default/macs/poly1305_prov.c index e76f982ace..88005716e6 100644 --- a/providers/default/macs/poly1305_prov.c +++ b/providers/default/macs/poly1305_prov.c @@ -13,7 +13,7 @@ #include <openssl/evp.h> #include <openssl/err.h> -#include "internal/poly1305.h" +#include "crypto/poly1305.h" /* * TODO(3.0) when poly1305 has moved entirely to our providers, this * header should be moved to the provider include directory. For the diff --git a/providers/default/macs/siphash_prov.c b/providers/default/macs/siphash_prov.c index 1a36846bfe..a9511925f0 100644 --- a/providers/default/macs/siphash_prov.c +++ b/providers/default/macs/siphash_prov.c @@ -14,7 +14,7 @@ #include <openssl/evp.h> #include <openssl/err.h> -#include "internal/siphash.h" +#include "crypto/siphash.h" /* * TODO(3.0) when siphash has moved entirely to our providers, this * header should be moved to the provider include directory. For the |