[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b158049cbdff7efa9afd93eb55bb7df95c0f385f (commit)
      from  140dab3d3a099feb38d5987adb471c61a8eabb4b (commit)


- Log -----------------------------------------------------------------
commit b158049cbdff7efa9afd93eb55bb7df95c0f385f
Author: Paul Yang <yang.yang at baishancloud.com>
Date:   Tue Aug 15 11:44:56 2017 +0800

    Use new setup_tests in code of rsa_test
    
    Although this piece of code will not be compiled at current stage, but
    there seems a plan to re-open the 'no-rsa' option in the future so this
    should be fixed.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4161)

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

Summary of changes:
 test/rsa_test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/rsa_test.c b/test/rsa_test.c
index 88464da..55339f9 100644
--- a/test/rsa_test.c
+++ b/test/rsa_test.c
@@ -22,9 +22,10 @@
 #include "testutil.h"
 
 #ifdef OPENSSL_NO_RSA
-void setup_tests(void)
+int setup_tests(void)
 {
     /* No tests */
+    return 1;
 }
 #else
 # include <openssl/rsa.h>