[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  80b06b0cc067e908f512ccf5f2d283d41c050a8f (commit)
      from  b997adb3a518b065240e70acf38ec5f77a937f53 (commit)


- Log -----------------------------------------------------------------
commit 80b06b0cc067e908f512ccf5f2d283d41c050a8f
Author: Todd Short <tshort at akamai.com>
Date:   Wed Apr 12 16:32:38 2017 -0400

    Fix unit tests when no-bf configured
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3206)

-----------------------------------------------------------------------

Summary of changes:
 test/bftest.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/test/bftest.c b/test/bftest.c
index 978fd58..eea9fcb 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]);
+}