diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-07-29 17:47:43 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-07-29 19:31:12 +0200 |
| commit | 8bf2d93057a8b2a9f3851b3b42065c84d1202fa9 (patch) | |
| tree | bb65e78327e12be409be51a8193fb08e6f30a4c4 /test | |
| parent | 358d446f259cd8acb13b2919bce12ed34bf6ce56 (diff) | |
Add some test coverage for OPENSSL_secure_clear_free
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4044)
Diffstat (limited to 'test')
| -rw-r--r-- | test/secmemtest.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/test/secmemtest.c b/test/secmemtest.c index 5592ce7ad2..a6ccc3b26c 100644 --- a/test/secmemtest.c +++ b/test/secmemtest.c @@ -17,15 +17,20 @@ 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 */ || !TEST_size_t_eq(CRYPTO_secure_used(), 32)) @@ -33,9 +38,10 @@ static int test_sec_mem(void) 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)) |