Commit 705871364bce85f7ef46f7c3f4e680a4591aa304
2013-06-17T08:53:22
Merge pull request #1654 from yorah/memzero Memzero stuffs
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
diff --git a/src/transports/cred.c b/src/transports/cred.c
index 4916c6e..ba5de6e 100644
--- a/src/transports/cred.c
+++ b/src/transports/cred.c
@@ -17,7 +17,7 @@ static void plaintext_free(struct git_cred *cred)
git__free(c->username);
/* Zero the memory which previously held the password */
- memset(c->password, 0x0, pass_len);
+ git__memzero(c->password, pass_len);
git__free(c->password);
memset(c, 0, sizeof(*c));
@@ -73,7 +73,7 @@ static void ssh_keyfile_passphrase_free(struct git_cred *cred)
if (c->passphrase) {
/* Zero the memory which previously held the passphrase */
- memset(c->passphrase, 0x0, pass_len);
+ git__memzero(c->passphrase, pass_len);
git__free(c->passphrase);
}
diff --git a/src/util.c b/src/util.c
index 1d084da..da15a03 100644
--- a/src/util.c
+++ b/src/util.c
@@ -722,12 +722,3 @@ void git__insertsort_r(
if (freeswap)
git__free(swapel);
}
-
-void git__memzero(volatile void *data, size_t size)
-{
- volatile uint8_t *scan = data;
- uint8_t *end = scan + size;
-
- while (scan < end)
- *scan++ = 0x0;
-}
diff --git a/src/util.h b/src/util.h
index 0de4666..1ef9e65 100644
--- a/src/util.h
+++ b/src/util.h
@@ -325,6 +325,16 @@ extern size_t git__unescape(char *str);
* Safely zero-out memory, making sure that the compiler
* doesn't optimize away the operation.
*/
-extern void git__memzero(volatile void *data, size_t size);
+GIT_INLINE(void) git__memzero(void *data, size_t size)
+{
+#ifdef _MSC_VER
+ SecureZeroMemory((PVOID)data, size);
+#else
+ volatile uint8_t *scan = (volatile uint8_t *)data;
+
+ while (size--)
+ *scan++ = 0x0;
+#endif
+}
#endif /* INCLUDE_util_h__ */