[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b6e3250671654e0344127be9dd49b3fb4a82f94b (commit)
      from  58e754fcb8f0456a50a0cac71a77be073e7c45b8 (commit)


- Log -----------------------------------------------------------------
commit b6e3250671654e0344127be9dd49b3fb4a82f94b
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Apr 26 11:21:29 2017 -0400

    Fix unit-tests when no-srp 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/3274)

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

Summary of changes:
 test/srptest.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/test/srptest.c b/test/srptest.c
index c908c39..d28c3bc 100644
--- a/test/srptest.c
+++ b/test/srptest.c
@@ -8,22 +8,15 @@
  */
 
 #include <openssl/opensslconf.h>
-#ifdef OPENSSL_NO_SRP
+# include "testutil.h"
 
+#ifdef OPENSSL_NO_SRP
 # include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-    printf("No SRP support\n");
-    return (0);
-}
-
 #else
 
 # include <openssl/srp.h>
 # include <openssl/rand.h>
 # include <openssl/err.h>
-# include "testutil.h"
 
 static void showbn(const char *name, const BIGNUM *bn)
 {
@@ -276,10 +269,14 @@ static int run_srp_tests(void)
 
     return 1;
 }
+#endif
 
 void register_tests(void)
 {
+#ifdef OPENSSL_NO_SRP
+    printf("No SRP support\n");
+#else
     ADD_TEST(run_srp_tests);
     ADD_TEST(run_srp_kat);
-}
 #endif
+}