Introduce SSL_CTX_set_stateless_cookie_{generate,verify}_cb

[openssl.git] / test / memleaktest.c

diff --git a/test/memleaktest.c b/test/memleaktest.c
index 2b23df788b93575af612299860a931f764a1f5d3..d239bd23b80298840840e09bd3b52d15f974415a 100644 (file)
--- a/test/memleaktest.c
+++ b/test/memleaktest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -7,12 +7,23 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <stdio.h>
 #include <string.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 
-int main(int argc, char **argv)
+#include "testutil.h"
+
+/*
+ * We use a proper main function here instead of the custom main from the
+ * test framework because the CRYPTO_mem_leaks_fp function cannot be called
+ * a second time without trying to use a null pointer.  The test framework
+ * calls this function as part of its close down.
+ *
+ * A work around is to call putenv("OPENSSL_DEBUG_MEMORY=0"); before exiting
+ * but that is worse than avoiding the test framework's main.
+ */
+
+int main(int argc, char *argv[])
 {
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
     char *p;
@@ -25,10 +36,8 @@ int main(int argc, char **argv)
     CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
     lost = OPENSSL_malloc(3);
-    if (lost == NULL) {
-        fprintf(stderr, "OPENSSL_malloc failed\n");
-        return 1;
-    }
+    if (!TEST_ptr(lost))
+        return EXIT_FAILURE;
 
     if (argv[1] && strcmp(argv[1], "freeit") == 0) {
         OPENSSL_free(lost);
@@ -37,10 +46,11 @@ int main(int argc, char **argv)
 
     noleak = CRYPTO_mem_leaks_fp(stderr);
     /* If -1 return value something bad happened */
-    if (noleak == -1)
-        return 1;
-    return ((lost != NULL) ^ (noleak == 0));
+    if (!TEST_int_ne(noleak, -1))
+        return EXIT_FAILURE;
+
+    return TEST_int_eq(lost != NULL, noleak == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 #else
-    return 0;
+    return EXIT_SUCCESS;
 #endif
 }