summaryrefslogtreecommitdiffstats
path: root/crypto/aria/aria.c
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-09-28 00:45:33 +0200
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-09-28 20:26:34 +0200
commit25f2138b0ab54a65ba713c093ca3734d88f7cb51 (patch)
tree0438d0f46a6a591d5833d74e0ccd9cb5da24fa2b /crypto/aria/aria.c
parentAdd legacy include guard manually to opensslconf.h.in (diff)
downloadopenssl-25f2138b0ab54a65ba713c093ca3734d88f7cb51.tar.xz
openssl-25f2138b0ab54a65ba713c093ca3734d88f7cb51.zip
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/aria/aria.c')
-rw-r--r--crypto/aria/aria.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index 67bd8d95d8..c1b2254af7 100644
--- a/crypto/aria/aria.c
+++ b/crypto/aria/aria.c
@@ -19,7 +19,7 @@
*/
#include <openssl/e_os2.h>
-#include "internal/aria.h"
+#include "crypto/aria.h"
#include <assert.h>
#include <string.h>