[squash]Build works with/out NO_ENGINE and NO_AFALG
authorRich Salz <rsalz@openssl.org>
Sun, 16 Apr 2017 13:17:39 +0000 (09:17 -0400)
committerRich Salz <rsalz@openssl.org>
Mon, 17 Apr 2017 01:57:22 +0000 (21:57 -0400)
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3229)

test/afalgtest.c
test/build.info

index cae3053..40ea025 100644 (file)
 #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
 #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
index 2d290df..537b361 100644 (file)
@@ -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