[CMS] Test decryption of a ciphertext encrypted from 1.1.1

[openssl.git] / test / memleaktest.c

diff --git a/test/memleaktest.c b/test/memleaktest.c
index 2b23df788b93575af612299860a931f764a1f5d3..1e07723a6f15b6b25d6c05b67aa024d3e55815da 100644 (file)
--- a/test/memleaktest.c
+++ b/test/memleaktest.c
@@ -1,46 +1,59 @@
 /*
- * 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
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * 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"
+
+/* __has_feature is a clang-ism, while __SANITIZE_ADDRESS__ is a gcc-ism */
+#if defined(__has_feature)
+# if __has_feature(address_sanitizer)
+#  define __SANITIZE_ADDRESS__ 1
+# endif
+#endif
+/* If __SANITIZE_ADDRESS__ isn't defined, define it to be false */
+#ifndef __SANITIZE_ADDRESS__
+# define __SANITIZE_ADDRESS__ 0
+#endif
+
+/*
+ * We use a proper main function here instead of the custom main from the
+ * test framework to avoid CRYPTO_mem_leaks stuff.
+ */
+
+int main(int argc, char *argv[])
 {
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
-    char *p;
+#if __SANITIZE_ADDRESS__
+    int exitcode = EXIT_SUCCESS;
+#else
+    /*
+     * When we don't sanitize, we set the exit code to what we would expect
+     * to get when we are sanitizing.  This makes it easy for wrapper scripts
+     * to detect that we get the result we expect.
+     */
+    int exitcode = EXIT_FAILURE;
+#endif
     char *lost;
-    int noleak;
-
-    p = getenv("OPENSSL_DEBUG_MEMORY");
-    if (p != NULL && strcmp(p, "on") == 0)
-        CRYPTO_set_mem_debug(1);
-    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;
+
+    strcpy(lost, "ab");
 
     if (argv[1] && strcmp(argv[1], "freeit") == 0) {
         OPENSSL_free(lost);
-        lost = NULL;
+        exitcode = EXIT_SUCCESS;
     }
 
-    noleak = CRYPTO_mem_leaks_fp(stderr);
-    /* If -1 return value something bad happened */
-    if (noleak == -1)
-        return 1;
-    return ((lost != NULL) ^ (noleak == 0));
-#else
-    return 0;
-#endif
+    lost = NULL;
+    return exitcode;
 }