From 97ed95da21bb3268ae4ab4ae4c4ba293c8daa371 Mon Sep 17 00:00:00 2001 From: Douglas Stebila Date: Wed, 3 Oct 2018 12:47:17 -0400 Subject: [PATCH] Sync more common files on master with nist-branch --- src/common/common.c | 6 +++--- src/common/rand_nist.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/common.c b/src/common/common.c index eb2b51797..1cd945a1c 100644 --- a/src/common/common.c +++ b/src/common/common.c @@ -8,7 +8,7 @@ #include #endif -void OQS_API OQS_MEM_cleanse(void *ptr, size_t len) { +OQS_API void OQS_MEM_cleanse(void *ptr, size_t len) { #if defined(_WIN32) SecureZeroMemory(ptr, len); #elif defined(HAVE_MEMSET_S) @@ -22,14 +22,14 @@ void OQS_API OQS_MEM_cleanse(void *ptr, size_t len) { #endif } -void OQS_API OQS_MEM_secure_free(void *ptr, size_t len) { +OQS_API void OQS_MEM_secure_free(void *ptr, size_t len) { if (ptr != NULL) { OQS_MEM_cleanse(ptr, len); free(ptr); // IGNORE free-check } } -void OQS_API OQS_MEM_insecure_free(void *ptr) { +OQS_API void OQS_MEM_insecure_free(void *ptr) { free(ptr); // IGNORE free-check } diff --git a/src/common/rand_nist.c b/src/common/rand_nist.c index 3ef56b96e..3a5d2de27 100644 --- a/src/common/rand_nist.c +++ b/src/common/rand_nist.c @@ -10,6 +10,7 @@ #include #include + #if USE_OPENSSL #include #include