diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2020-09-09 10:12:44 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2020-09-09 10:12:44 +0000 |
| commit | b3d3d81c8260eb83fcf61fa0e40b830faf17df8d (patch) | |
| tree | 7275c53cbe39aeb25d93036b0b64134a59b2d77f | |
| parent | 3d10b28df4b8bc6feb710cb646a363e71c8f6cb4 (diff) | |
| parent | 3095bccd2e1cec29bdc346ee7d7fb67f0ccd4dcf (diff) | |
| download | gtk+-b3d3d81c8260eb83fcf61fa0e40b830faf17df8d.tar.gz | |
Merge branch 'gtksecurememory-win32' into 'master'
Port gtksecurememory.c to Windows
See merge request GNOME/gtk!2548
| -rw-r--r-- | gtk/gtksecurememory.c | 47 | ||||
| -rw-r--r-- | gtk/meson.build | 1 |
2 files changed, 48 insertions, 0 deletions
diff --git a/gtk/gtksecurememory.c b/gtk/gtksecurememory.c index 55db84398b..15ce9e0b85 100644 --- a/gtk/gtksecurememory.c +++ b/gtk/gtksecurememory.c @@ -44,7 +44,11 @@ #include <stdio.h> #include <stdlib.h> #include <errno.h> + +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif + #include <assert.h> #ifdef WITH_VALGRIND @@ -80,6 +84,12 @@ typedef struct { #include <glib.h> +#ifdef G_OS_WIN32 +# define WIN32_LEAN_AND_MEAN +# include <windows.h> +# include <dpapi.h> /* for CryptProtectMemory() */ +#endif + #define GTK_SECURE_POOL_VER_STR "1.0" static int show_warning = 1; @@ -936,6 +946,33 @@ sec_acquire_pages (size_t *sz, show_warning = 1; return pages; +#elif defined G_OS_WIN32 + /* Make sure sz is a multiple of CRYPTPROTECTMEMORY_BLOCK_SIZE in wincrypt.h */ + *sz = (*sz + CRYPTPROTECTMEMORY_BLOCK_SIZE - 1) & ~(CRYPTPROTECTMEMORY_BLOCK_SIZE - 1); + + void *data = (void *) LocalAlloc (LPTR, *sz); + + if (data == NULL) { + if (show_warning && gtk_secure_warnings) + fprintf (stderr, "couldn't allocate %lu bytes of memory (%s): %#010X\n", + (unsigned long)*sz, during_tag, GetLastError ()); + show_warning = 0; + return NULL; + } + + if (!CryptProtectMemory (data, *sz, CRYPTPROTECTMEMORY_SAME_PROCESS)) { + if (show_warning && gtk_secure_warnings) + fprintf (stderr, "couldn't encrypt %lu bytes of memory (%s): %#010X\n", + (unsigned long)*sz, during_tag, GetLastError ()); + show_warning = 0; + return NULL; + } + + DEBUG_ALLOC ("gtk-secure-memory: new block ", *sz); + + show_warning = 1; + return data; + #else if (show_warning && gtk_secure_warnings) fprintf (stderr, "your system does not support private memory"); @@ -961,6 +998,16 @@ sec_release_pages (void *pages, size_t sz) DEBUG_ALLOC ("gtk-secure-memory: freed block ", sz); +#elif defined G_OS_WIN32 + g_assert (sz % CRYPTPROTECTMEMORY_BLOCK_SIZE == 0); + + if (!CryptUnprotectMemory (pages, sz, CRYPTPROTECTMEMORY_SAME_PROCESS)) + fprintf (stderr, "couldn't decrypt private memory: %#010X\n", GetLastError ()); + + if (LocalFree (pages) != NULL) + fprintf (stderr, "couldn't free private anonymous memory: %#010X\n", GetLastError ()); + + DEBUG_ALLOC ("gtk-secure-memory: freed block ", sz); #else g_assert (FALSE); #endif diff --git a/gtk/meson.build b/gtk/meson.build index eed4dd734b..0581349041 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -1000,6 +1000,7 @@ if win32_enabled gtk_deps += [cc.find_library('advapi32'), cc.find_library('comctl32'), + cc.find_library('crypt32'), # For CryptProtectMemory() cc.find_library('dwmapi'), cc.find_library('imm32'), cc.find_library('setupapi'), |