[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  7d57d4d040eecdc6f169e95522bafb4a31e2aae5 (commit)
      from  74b31db68ac5f1fc8d85f8fbd53dc186d0016b0b (commit)


- Log -----------------------------------------------------------------
commit 7d57d4d040eecdc6f169e95522bafb4a31e2aae5
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Jan 11 17:11:24 2016 +0000

    Fix jpaketest compilation error.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/jpaketest.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/jpaketest.c b/test/jpaketest.c
index 2771e51..1c9cf24 100644
--- a/test/jpaketest.c
+++ b/test/jpaketest.c
@@ -112,12 +112,14 @@ int main(int argc, char **argv)
     BIGNUM *g = NULL;
     BIGNUM *q = NULL;
     BIGNUM *secret = BN_new();
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG
     BIO *bio_err;
 
     bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
     CRYPTO_set_mem_debug_functions(1)
     CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+#endif
 
     ERR_load_crypto_strings();
 
@@ -176,7 +178,9 @@ int main(int argc, char **argv)
     CRYPTO_cleanup_all_ex_data();
     ERR_remove_thread_state(NULL);
     ERR_free_strings();
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG
     CRYPTO_mem_leaks(bio_err);
+#endif
 
     return 0;
 }