Sync more common files on master with nist-branch

This commit is contained in:
Douglas Stebila 2018-10-03 12:47:17 -04:00
parent b1cee208e6
commit 97ed95da21
2 changed files with 4 additions and 3 deletions

View File

@ -8,7 +8,7 @@
#include <windows.h>
#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
}

View File

@ -10,6 +10,7 @@
#include <string.h>
#include <oqs/common.h>
#if USE_OPENSSL
#include <openssl/conf.h>
#include <openssl/evp.h>