Changeset 66307 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 28, 2017 3:05:31 PM (8 years ago)

Author:

vboxsync

Message:

Windows Additions/VBoxCredProv: Zero'ed out a bit too much, resulted in not being able to log in under certain circumstances, adjusted logging.

File:

• trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvCredential.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvCredential.cpp

@@ -167 +167 @@
     AssertPtrReturn(pwszSource,   E_POINTER);
 
-    size_t cbLen = (RTUtf16Len(pwszSource) + 1 /* Trailing zero */) * sizeof(WCHAR);
+    size_t cbLen = RTUtf16Len(pwszSource) * sizeof(RTUTF16);
 
     pUnicodeDest->Buffer = (LPWSTR)CoTaskMemAlloc(cbLen);
@@ -196 +196 @@
 
         /* Make sure to wipe contents before free'ing. */
-        RTMemWipeThoroughly(pUnicode->Buffer, pUnicode->MaximumLength * sizeof(WCHAR), 3 /* Passes */);
+        RTMemWipeThoroughly(pUnicode->Buffer, pUnicode->MaximumLength /* MaximumLength is bytes! */, 3 /* Passes */);
 
         CoTaskMemFree(pUnicode->Buffer);
@@ -322 +322 @@
                   + pLogonIn->Password.Length;
 
-    VBoxCredProvVerbose(3, "VBoxCredProvCredential::AllocateLogonPackage: Allocating %ld bytes (%zu bytes credentials)\n",
+#ifdef DEBUG /* Do not reveal any hints to credential data in release mode. */
+    VBoxCredProvVerbose(1, "VBoxCredProvCredential::AllocateLogonPackage: Allocating %ld bytes (%zu bytes credentials)\n",
                         cbLogon, cbLogon - sizeof(KERB_INTERACTIVE_UNLOCK_LOGON));
+#endif
 
     KERB_INTERACTIVE_UNLOCK_LOGON *pLogon = (KERB_INTERACTIVE_UNLOCK_LOGON*)CoTaskMemAlloc(cbLogon);
@@ -1041 +1043 @@
                             /* We're done -- let the logon UI know. */
                             *pcpGetSerializationResponse = CPGSR_RETURN_CREDENTIAL_FINISHED;
+
+                            VBoxCredProvVerbose(1, "VBoxCredProvCredential::GetSerialization: Finished for user '%ls' (domain '%s')\n",
+                                                m_apwszCredentials[VBOXCREDPROV_FIELDID_USERNAME],
+                                                m_apwszCredentials[VBOXCREDPROV_FIELDID_DOMAINNAME]);
                         }
                         else
@@ -1061 +1067 @@
         VBoxCredProvVerbose(1, "VBoxCredProvCredential::GetSerialization: kerberosLogonCreate failed with hr=0x%08x\n", hr);
 
-    VBoxCredProvVerbose(0, "VBoxCredProvCredential::GetSerialization returned hr=0x%08x\n", hr);
+    VBoxCredProvVerbose(1, "VBoxCredProvCredential::GetSerialization returned hr=0x%08x\n", hr);
     return hr;
 }