/*
- * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2018 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
#include <openssl/crypto.h>
#include "testutil.h"
+#include "../e_os.h"
static int test_sec_mem(void)
{
-#if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)
+#ifdef OPENSSL_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)
if (!TEST_ptr(p)
/* 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);
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
}
+static int test_sec_mem_clear(void)
+{
+#ifdef OPENSSL_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;
}