diff options
author | Jack Lloyd <[email protected]> | 2017-09-03 08:09:58 -0400 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2017-09-03 08:09:58 -0400 |
commit | 27198fc299a2ea899d723b5fb3c3439e1157c3fb (patch) | |
tree | a5eeac31b12c4fc6b97e1556a3761f5ce72c7544 /src/lib/utils/mem_ops.cpp | |
parent | 20667782f65a9f368c6536c98e22dd49d18175ef (diff) |
Move secure_scrub_memory to os_utils.cpp
Diffstat (limited to 'src/lib/utils/mem_ops.cpp')
-rw-r--r-- | src/lib/utils/mem_ops.cpp | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/src/lib/utils/mem_ops.cpp b/src/lib/utils/mem_ops.cpp deleted file mode 100644 index c81d4fac2..000000000 --- a/src/lib/utils/mem_ops.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* -* Memory Scrubbing -* (C) 2012,2015,2016 Jack Lloyd -* -* Botan is released under the Simplified BSD License (see license.txt) -*/ - -#include <botan/mem_ops.h> - -#if defined(BOTAN_TARGET_OS_HAS_RTLSECUREZEROMEMORY) - #define NOMINMAX 1 - #include <windows.h> -#endif - -namespace Botan { - -void secure_scrub_memory(void* ptr, size_t n) - { -#if defined(BOTAN_TARGET_OS_HAS_RTLSECUREZEROMEMORY) - ::RtlSecureZeroMemory(ptr, n); -#elif defined(BOTAN_USE_VOLATILE_MEMSET_FOR_ZERO) && (BOTAN_USE_VOLATILE_MEMSET_FOR_ZERO == 1) - /* - Call memset through a static volatile pointer, which the compiler - should not elide. This construct should be safe in conforming - compilers, but who knows. I did confirm that on x86-64 GCC 6.1 and - Clang 3.8 both create code that saves the memset address in the - data segment and uncondtionally loads and jumps to that address. - */ - static void* (*const volatile memset_ptr)(void*, int, size_t) = std::memset; - (memset_ptr)(ptr, 0, n); -#else - volatile uint8_t* p = reinterpret_cast<volatile uint8_t*>(ptr); - - for(size_t i = 0; i != n; ++i) - p[i] = 0; -#endif - } - -} |