Be more explicit about RSAES-PKCS#1v1.5 error handling

[openssl.git] / test / secmemtest.c

diff --git a/test/secmemtest.c b/test/secmemtest.c
index cb7d1ec63de142b422ea89e1dd59491b0287bdc6..588f31ae676ac6e872b04c54021331afe30c8299 100644 (file)
--- a/test/secmemtest.c
+++ b/test/secmemtest.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2022 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
@@ -10,32 +10,41 @@
 #include <openssl/crypto.h>
 
 #include "testutil.h"
+#include "internal/e_os.h"
 
 static int test_sec_mem(void)
 {
-#if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)
+#ifndef OPENSSL_NO_SECURE_MEMORY
     int testresult = 0;
     char *p = NULL, *q = NULL, *r = NULL, *s = NULL;
 
+    TEST_info("Secure memory is implemented.");
+
+    s = OPENSSL_secure_malloc(20);
+    /* s = non-secure 20 */
+    if (!TEST_ptr(s)
+        || !TEST_false(CRYPTO_secure_allocated(s)))
+        goto end;
     r = OPENSSL_secure_malloc(20);
-    /* r = non-secure 20 */
+    /* r = non-secure 20, s = non-secure 20 */
     if (!TEST_ptr(r)
         || !TEST_true(CRYPTO_secure_malloc_init(4096, 32))
         || !TEST_false(CRYPTO_secure_allocated(r)))
         goto end;
     p = OPENSSL_secure_malloc(20);
     if (!TEST_ptr(p)
-        /* r = non-secure 20, p = secure 20 */
+        /* r = non-secure 20, p = secure 20, s = non-secure 20 */
         || !TEST_true(CRYPTO_secure_allocated(p))
-        /* 20 secure -> 32-byte minimum allocaton unit */
+        /* 20 secure -> 32-byte minimum allocation unit */
         || !TEST_size_t_eq(CRYPTO_secure_used(), 32))
         goto end;
     q = OPENSSL_malloc(20);
     if (!TEST_ptr(q))
         goto end;
-    /* r = non-secure 20, p = secure 20, q = non-secure 20 */
+    /* r = non-secure 20, p = secure 20, q = non-secure 20, s = non-secure 20 */
     if (!TEST_false(CRYPTO_secure_allocated(q)))
         goto end;
+    OPENSSL_secure_clear_free(s, 20);
     s = OPENSSL_secure_malloc(20);
     if (!TEST_ptr(s)
         /* r = non-secure 20, p = secure 20, q = non-secure 20, s = secure 20 */
@@ -43,7 +52,7 @@ static int test_sec_mem(void)
         /* 2 * 20 secure -> 64 bytes allocated */
         || !TEST_size_t_eq(CRYPTO_secure_used(), 64))
         goto end;
-    OPENSSL_secure_free(p);
+    OPENSSL_secure_clear_free(p, 20);
     p = NULL;
     /* 20 secure -> 32 bytes allocated */
     if (!TEST_size_t_eq(CRYPTO_secure_used(), 32))
@@ -68,19 +77,22 @@ static int test_sec_mem(void)
     TEST_ptr_null(OPENSSL_secure_malloc((size_t)-1));
     TEST_true(CRYPTO_secure_malloc_done());
 
-    TEST_info("Possible infinite loop: small arena");
-    if (!TEST_false(CRYPTO_secure_malloc_init(16, 16)))
+    /*
+     * If init fails, then initialized should be false, if not, this
+     * could cause an infinite loop secure_malloc, but we don't test it
+     */
+    if (TEST_false(CRYPTO_secure_malloc_init(16, 16)) &&
+        !TEST_false(CRYPTO_secure_malloc_initialized())) {
+        TEST_true(CRYPTO_secure_malloc_done());
         goto end;
-    TEST_false(CRYPTO_secure_malloc_initialized());
-    TEST_ptr_null(OPENSSL_secure_malloc((size_t)-1));
-    TEST_true(CRYPTO_secure_malloc_done());
+    }
 
     /*-
      * There was also a possible infinite loop when the number of
      * elements was 1<<31, as |int i| was set to that, which is a
      * negative number. However, it requires minimum input values:
      *
-     * CRYPTO_secure_malloc_init((size_t)1<<34, (size_t)1<<4);
+     * CRYPTO_secure_malloc_init((size_t)1<<34, 1<<4);
      *
      * Which really only works on 64-bit systems, since it took 16 GB
      * secure memory arena to trigger the problem. It naturally takes
@@ -101,11 +113,11 @@ static int test_sec_mem(void)
      */
     if (sizeof(size_t) > 4) {
         TEST_info("Possible infinite loop: 1<<31 limit");
-        if (TEST_true(CRYPTO_secure_malloc_init((size_t)1<<34, (size_t)1<<4) != 0))
+        if (TEST_true(CRYPTO_secure_malloc_init((size_t)1<<34, 1<<4) != 0))
             TEST_true(CRYPTO_secure_malloc_done());
     }
 # endif
-    
+
     /* this can complete - it was not really secure */
     testresult = 1;
  end:
@@ -115,12 +127,57 @@ static int test_sec_mem(void)
     OPENSSL_secure_free(s);
     return testresult;
 #else
+    TEST_info("Secure memory is *not* implemented.");
     /* Should fail. */
     return TEST_false(CRYPTO_secure_malloc_init(4096, 32));
 #endif
 }
 
-void register_tests(void)
+static int test_sec_mem_clear(void)
+{
+#ifndef OPENSSL_NO_SECURE_MEMORY
+    const int size = 64;
+    unsigned char *p = NULL;
+    int i, res = 0;
+
+    if (!TEST_true(CRYPTO_secure_malloc_init(4096, 32))
+            || !TEST_ptr(p = OPENSSL_secure_malloc(size)))
+        goto err;
+
+    for (i = 0; i < size; i++)
+        if (!TEST_uchar_eq(p[i], 0))
+            goto err;
+
+    for (i = 0; i < size; i++)
+        p[i] = (unsigned char)(i + ' ' + 1);
+
+    OPENSSL_secure_free(p);
+
+    /*
+     * A deliberate use after free here to verify that the memory has been
+     * cleared properly.  Since secure free doesn't return the memory to
+     * libc's memory pool, it technically isn't freed.  However, the header
+     * bytes have to be skipped and these consist of two pointers in the
+     * current implementation.
+     */
+    for (i = sizeof(void *) * 2; i < size; i++)
+        if (!TEST_uchar_eq(p[i], 0))
+            return 0;
+
+    res = 1;
+    p = NULL;
+err:
+    OPENSSL_secure_free(p);
+    CRYPTO_secure_malloc_done();
+    return res;
+#else
+    return 1;
+#endif
+}
+
+int setup_tests(void)
 {
     ADD_TEST(test_sec_mem);
+    ADD_TEST(test_sec_mem_clear);
+    return 1;
 }