Index: /trunk/src/VBox/Main/include/ConsoleImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/ConsoleImpl.h	(revision 52018)
+++ /trunk/src/VBox/Main/include/ConsoleImpl.h	(revision 52019)
@@ -56,5 +56,5 @@
 
 #include <iprt/uuid.h>
-#include <iprt/mem.h>
+#include <iprt/memsafer.h>
 #include <VBox/RemoteDesktop/VRDE.h>
 #include <VBox/vmm/pdmdrv.h>
@@ -585,6 +585,5 @@
             ~SecretKey()
             {
-                RTMemWipeThoroughly(m_pbKey, m_cbKey, 3 /* cPasses */);
-                RTMemLockedFree(m_pbKey);
+                RTMemSaferFree(m_pbKey, m_cbKey);
                 m_cRefs = 0;
                 m_pbKey = NULL;
Index: /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 52018)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 52019)
@@ -93,4 +93,5 @@
 #include <iprt/system.h>
 #include <iprt/base64.h>
+#include <iprt/memsafer.h>
 
 #include <VBox/vmm/vmapi.h>
@@ -4645,5 +4646,5 @@
         if (cbKey != -1)
         {
-            uint8_t *pbKey = (uint8_t *)RTMemLockedAlloc(cbKey);
+            uint8_t *pbKey = (uint8_t *)RTMemSaferAllocZ(cbKey);
             if (pbKey)
             {