OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Fix string conversions in pfPasswordStore.

Browse Source
This commit is contained in:
Joseph Davies
2014-01-28 16:14:31 -08:00
parent 9fb8ea615d
commit 8c03aaf353
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Sources/Plasma/FeatureLib/pfPasswordStore/pfPasswordStore.cpp
View File

@ -142,6 +142,7 @@ bool pfFilePasswordStore::SetPassword(const plString& username, const plString&
#ifdef HS_BUILD_FOR_WIN32 #ifdef HS_BUILD_FOR_WIN32
#include "hsWindows.h"
#include <wincred.h> #include <wincred.h>
/***************************************************************************** /*****************************************************************************
@ -153,11 +154,11 @@ const plString pfWin32PasswordStore::GetPassword(const plString& username)
plString target = plString::Format("%s__%s", plProduct::UUID(), username.c_str()); plString target = plString::Format("%s__%s", plProduct::UUID(), username.c_str());
plString password = plString::Null; plString password = plString::Null;
if (!CredReadW(target.ToUtf16(), CRED_TYPE_GENERIC, 0, &credential)) { if (!CredReadW(target.ToWchar().GetData(), CRED_TYPE_GENERIC, 0, &credential)) {
return password; return password;
} }
password = plString::FromUtf16((uint16_t*)credential->CredentialBlob, credential->CredentialBlobSize); password = plString::FromUtf8(reinterpret_cast<const char *>(credential->CredentialBlob), credential->CredentialBlobSize);
memset(credential->CredentialBlob, 0, credential->CredentialBlobSize); memset(credential->CredentialBlob, 0, credential->CredentialBlobSize);
CredFree(credential); CredFree(credential);
@ -172,20 +173,23 @@ bool pfWin32PasswordStore::SetPassword(const plString& username, const plString&
plString target = plString::Format("%s__%s", plProduct::UUID(), username.c_str()); plString target = plString::Format("%s__%s", plProduct::UUID(), username.c_str());
if (password.IsNull()) { if (password.IsNull()) {
if (CredDeleteW(target.ToUtf16(), CRED_TYPE_GENERIC, 0)) { if (CredDeleteW(target.ToWchar().GetData(), CRED_TYPE_GENERIC, 0)) {
return true; return true;
} }
return false; return false;
} }
plStringBuffer<wchar_t> tbuff = target.ToWchar();
plStringBuffer<char> pbuff = password.ToUtf8();
plStringBuffer<wchar_t> ubuff = username.ToWchar();
memset(&credential, 0, sizeof(CREDENTIALW)); memset(&credential, 0, sizeof(CREDENTIALW));
credential.Type = CRED_TYPE_GENERIC; credential.Type = CRED_TYPE_GENERIC;
credential.TargetName = target.ToUtf16(); credential.TargetName = (LPWSTR)tbuff.GetData();
credential.CredentialBlobSize = password.GetSize(); credential.CredentialBlobSize = pbuff.GetSize();
credential.CredentialBlob = (LPBYTE)password.ToUtf16(); credential.CredentialBlob = (LPBYTE)pbuff.GetData();
credential.Persist = CRED_PERSIST_LOCAL_MACHINE; credential.Persist = CRED_PERSIST_LOCAL_MACHINE;
credential.UserName = username.ToUtf16(); credential.UserName = (LPWSTR)ubuff.GetData();
if (!CredWriteW(&credential, 0)) { if (!CredWriteW(&credential, 0)) {
return false; return false;

8
Sources/Plasma/FeatureLib/pfPasswordStore/pfPasswordStore_impl.h
View File

@ -76,8 +76,12 @@ public:
#endif //HS_BUILD_FOR_WIN32 #endif //HS_BUILD_FOR_WIN32
// TODO: A Linux libsecret-based storage mechanism /**
* @todo A Linux libsecret-based storage mechanism.
*/
// TODO: An OSX KeyChain-based storage mechanism /**
* @todo An OSX KeyChain-based storage mechanism.
*/
#endif //pfPasswordStore_impl_inc #endif //pfPasswordStore_impl_inc