diff options
author | Todd Short <tshort@akamai.com> | 2017-04-12 16:32:38 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-04-14 07:33:45 -0400 |
commit | 80b06b0cc067e908f512ccf5f2d283d41c050a8f (patch) | |
tree | fd41e145fba37fcf81e33a324f1bdd1cdad0f2ad | |
parent | b997adb3a518b065240e70acf38ec5f77a937f53 (diff) |
Fix unit tests when no-bf configured
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3206)
-rw-r--r-- | test/bftest.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/test/bftest.c b/test/bftest.c index 978fd582b1..eea9fcb7b9 100644 --- a/test/bftest.c +++ b/test/bftest.c @@ -22,13 +22,7 @@ #include "../e_os.h" -#ifdef OPENSSL_NO_BF -int main(int argc, char *argv[]) -{ - printf("No BF support\n"); - return (0); -} -#else +#ifndef OPENSSL_NO_BF # include <openssl/blowfish.h> # ifdef CHARSET_EBCDIC @@ -440,10 +434,11 @@ static int test_bf_ofb64(void) return ret; } +#endif int test_main(int argc, char *argv[]) { - int ret; +#ifndef OPENSSL_NO_BF # ifdef CHARSET_EBCDIC int n; @@ -461,10 +456,7 @@ int test_main(int argc, char *argv[]) ADD_TEST(test_bf_ofb64); if (argc > 1) - ret = print_test_data(); - else - ret = run_tests(argv[0]); - - return ret; -} + return print_test_data(); #endif + return run_tests(argv[0]); +} |