test/.../evppkey.txt: X25519 regression test vectors.

[openssl.git] / test / secmemtest.c

diff --git a/test/secmemtest.c b/test/secmemtest.c
index cb7d1ec63de142b422ea89e1dd59491b0287bdc6..9efa2c89d53d0c060ad74175cb5f911e019029df 100644 (file)
--- a/test/secmemtest.c
+++ b/test/secmemtest.c
@@ -17,25 +17,31 @@ static int test_sec_mem(void)
     int testresult = 0;
     char *p = NULL, *q = NULL, *r = NULL, *s = NULL;
 
+    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 +49,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,12 +74,15 @@ 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
@@ -105,7 +114,7 @@ static int test_sec_mem(void)
             TEST_true(CRYPTO_secure_malloc_done());
     }
 # endif
-    
+
     /* this can complete - it was not really secure */
     testresult = 1;
  end:
@@ -120,7 +129,8 @@ static int test_sec_mem(void)
 #endif
 }
 
-void register_tests(void)
+int setup_tests(void)
 {
     ADD_TEST(test_sec_mem);
+    return 1;
 }