diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2019-07-16 09:46:14 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2019-07-16 09:46:14 +1000 |
commit | 459b15d451194ee90834ea58bfb8c91479e9ef9b (patch) | |
tree | 89aee6711deb4b8523865674562cee52522fbfe7 /test | |
parent | 0d03acea7aa45e94903fb12186ed6cc324eb1b03 (diff) |
Add Common shared code needed to move aes ciphers to providers
Custom aes ciphers will be placed into multiple new files
(instead of the monolithic setup used in the e_aes.c legacy code)
so it makes sense to have a header for the platform specific
code that needs to be shared between files.
modes_lcl.h has also moved to modes_int.h to allow sharing with the
provider source.
Code that will be common to AEAD ciphers has also been added. These
will be used by seperate PR's for GCM, CCM & OCB.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9301)
Diffstat (limited to 'test')
-rw-r--r-- | test/build.info | 2 | ||||
-rw-r--r-- | test/modes_internal_test.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/build.info b/test/build.info index e38f142259..6966149811 100644 --- a/test/build.info +++ b/test/build.info @@ -504,7 +504,7 @@ IF[{- !$disabled{tests} -}] DEPEND[asn1_internal_test]=../libcrypto.a libtestutil.a SOURCE[modes_internal_test]=modes_internal_test.c - INCLUDE[modes_internal_test]=.. ../include ../apps/include + INCLUDE[modes_internal_test]=.. ../include ../apps/include ../crypto/include DEPEND[modes_internal_test]=../libcrypto.a libtestutil.a SOURCE[x509_internal_test]=x509_internal_test.c diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c index 656dfab4c5..02e5c8d0a8 100644 --- a/test/modes_internal_test.c +++ b/test/modes_internal_test.c @@ -14,8 +14,8 @@ #include <openssl/aes.h> #include <openssl/modes.h> -#include "../crypto/modes/modes_lcl.h" #include "testutil.h" +#include "internal/modes_int.h" #include "internal/nelem.h" typedef struct { |