diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-04-16 09:17:39 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-04-16 21:57:22 -0400 |
| commit | 5c8e9d531ba54d26e4bcbe66710c7c75bf0fc4e9 (patch) | |
| tree | d2b4df2874b5063be58d9234a25a322931d599cf | |
| parent | 529243992bcfbb9ac9aade69451eb2c663739c04 (diff) | |
| download | openssl-5c8e9d531ba54d26e4bcbe66710c7c75bf0fc4e9.tar.gz | |
[squash]Build works with/out NO_ENGINE and NO_AFALG
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3229)
| -rw-r--r-- | test/afalgtest.c | 47 | ||||
| -rw-r--r-- | test/build.info | 2 |
2 files changed, 24 insertions, 25 deletions
diff --git a/test/afalgtest.c b/test/afalgtest.c index cae3053cad..40ea025405 100644 --- a/test/afalgtest.c +++ b/test/afalgtest.c @@ -10,6 +10,20 @@ #include <stdio.h> #include <openssl/opensslconf.h> +#include <string.h> +#include <openssl/engine.h> +#include <openssl/evp.h> +#include <openssl/rand.h> +#include "testutil.h" + +/* Use a buffer size which is not aligned to block size */ +#define BUFFER_SIZE (8 * 1024) - 13 + +#ifndef OPENSSL_NO_ENGINE +static ENGINE *e; +#endif + + #ifndef OPENSSL_NO_AFALGENG # include <linux/version.h> # define K_MAJ 4 @@ -27,18 +41,6 @@ #endif #ifndef OPENSSL_NO_AFALGENG -/* #if 1 */ -#include <string.h> -#include <openssl/engine.h> -#include <openssl/evp.h> -#include <openssl/rand.h> -#include "testutil.h" - -/* Use a buffer size which is not aligned to block size */ -#define BUFFER_SIZE (8 * 1024) - 13 - -static ENGINE *e; - static int test_afalg_aes_128_cbc(void) { EVP_CIPHER_CTX *ctx; @@ -81,11 +83,16 @@ static int test_afalg_aes_128_cbc(void) EVP_CIPHER_CTX_free(ctx); return ret; } +#endif int main(int argc, char **argv) { int ret = 0; +#ifdef OPENSSL_NO_ENGINE + setup_test(); + ret = run_tests(argv[0]); +#else ENGINE_load_builtin_engines(); # ifndef OPENSSL_NO_STATIC_ENGINE OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL); @@ -97,21 +104,13 @@ int main(int argc, char **argv) /* Probably a platform env issue, not a test failure. */ TEST_info("Can't load AFALG engine"); } else { +# ifndef OPENSSL_NO_AFALGENG ADD_TEST(test_afalg_aes_128_cbc); +# endif } ret = run_tests(argv[0]); - ENGINE_free(e); - return finish_test(ret); -} - -#else /* OPENSSL_NO_AFALGENG */ +#endif -int main(int argc, char **argv) -{ - fprintf(stderr, "AFALG not supported - skipping AFALG tests\n"); - printf("PASS\n"); - return 0; + return finish_test(ret); } - -#endif diff --git a/test/build.info b/test/build.info index 2d290dfbd6..537b361f5d 100644 --- a/test/build.info +++ b/test/build.info @@ -231,7 +231,7 @@ IF[{- !$disabled{tests} -}] INCLUDE[threadstest]=.. ../include DEPEND[threadstest]=../libcrypto - SOURCE[afalgtest]=afalgtest.c + SOURCE[afalgtest]=afalgtest.c testutil.c INCLUDE[afalgtest]=.. ../include DEPEND[afalgtest]=../libcrypto |