denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memwipe() of leading unaligned bytes

Browse Source
This commit is contained in:
Martin Willi
2011-05-24 11:49:20 +02:00
parent 8c1bfe6545
commit d45b242b60
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils.h
+8 -5
View File
@@ -347,17 +347,20 @@ void memwipe_noinline(void *ptr, size_t n);
static inline void memwipe_inline(void *ptr, size_t n) static inline void memwipe_inline(void *ptr, size_t n)
{ {
volatile char *c = (volatile char*)ptr; volatile char *c = (volatile char*)ptr;
int m, i; size_t m, i;
/* byte wise until long aligned */ /* byte wise until long aligned */
for (i = 0; (uintptr_t)&c % sizeof(long) && i < n; i++) for (i = 0; (uintptr_t)&c[i] % sizeof(long) && i < n; i++)
{ {
c[i] = 0; c[i] = 0;
} }
/* word wize */ /* word wise */
for (m = n - sizeof(long); i <= m; i += sizeof(long)) if (n >= sizeof(long))
{ {
*(volatile long*)&c[i] = 0; for (m = n - sizeof(long); i <= m; i += sizeof(long))
{
*(volatile long*)&c[i] = 0;
}
} }
/* byte wise of the rest */ /* byte wise of the rest */
for (; i < n; i++) for (; i < n; i++)