diff options
| author | aunsane <aunsane@gmail.com> | 2017-04-01 18:38:46 +0300 |
|---|---|---|
| committer | aunsane <aunsane@gmail.com> | 2017-04-01 18:39:16 +0300 |
| commit | 177bd7053cb265b1634e1a1a2a635ca4a8b72395 (patch) | |
| tree | 958289fd7c2430cb77152d291078c68dbb20b5e0 | |
| parent | c04b64dd007293f45f6059c02073c45fc9211409 (diff) | |
Tox: fixed #784
disabled profile encription to prevent corruption
| -rw-r--r-- | protocols/Tox/res/resource.rc | 7 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_profile.cpp | 4 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_transfer.cpp | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc index 3b6964f7b2..56f63b82b6 100644 --- a/protocols/Tox/res/resource.rc +++ b/protocols/Tox/res/resource.rc @@ -152,7 +152,7 @@ CAPTION "Enter password" FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
EDITTEXT IDC_PASSWORD,7,24,197,12,ES_PASSWORD | ES_AUTOHSCROLL
- CONTROL "Save password",IDC_SAVEPERMANENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,40,197,12
+ CONTROL "Save password",IDC_SAVEPERMANENTLY,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,7,40,197,12
DEFPUSHBUTTON "OK",IDOK,101,56,50,14
PUSHBUTTON "Cancel",IDCANCEL,154,56,50,14
LTEXT "Tox profile is encrypted. Enter the password to continue.",IDC_STATIC,7,5,197,18
@@ -382,6 +382,11 @@ BEGIN 0
END
+IDD_PASSWORD AFX_DIALOG_LAYOUT
+BEGIN
+ 0
+END
+
#endif // English resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/Tox/src/tox_profile.cpp b/protocols/Tox/src/tox_profile.cpp index aec34c6381..49ff8a0a64 100644 --- a/protocols/Tox/src/tox_profile.cpp +++ b/protocols/Tox/src/tox_profile.cpp @@ -108,7 +108,7 @@ void CToxProto::SaveToxProfile(Tox *tox) uint8_t *data = (uint8_t*)mir_calloc(size + TOX_PASS_ENCRYPTION_EXTRA_LENGTH);
tox_get_savedata(tox, data);
- pass_ptrA password(mir_utf8encodeW(pass_ptrT(getWStringA("Password"))));
+ /*pass_ptrA password(mir_utf8encodeW(pass_ptrT(getWStringA("Password"))));
if (password && mir_strlen(password))
{
TOX_ERR_ENCRYPTION coreEncryptError;
@@ -119,7 +119,7 @@ void CToxProto::SaveToxProfile(Tox *tox) return;
}
size += TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
- }
+ }*/
ptrW profilePath(GetToxProfilePath());
FILE *profile = _wfopen(profilePath, L"wb");
diff --git a/protocols/Tox/src/tox_transfer.cpp b/protocols/Tox/src/tox_transfer.cpp index d67d92ba9f..38caa0ffbb 100644 --- a/protocols/Tox/src/tox_transfer.cpp +++ b/protocols/Tox/src/tox_transfer.cpp @@ -16,7 +16,7 @@ void CToxProto::OnFriendFile(Tox *tox, uint32_t friendNumber, uint32_t fileNumbe {
case TOX_FILE_KIND_AVATAR:
{
- Netlib_Logf(proto->m_hNetlibUser, __FUNCTION__": incoming avatar (%d) from %s(%d)", fileNumber, (const char*)pubKey, friendNumber);
+ proto->debugLogA(__FUNCTION__": incoming avatar (%d) from %s(%d)", fileNumber, (const char*)pubKey, friendNumber);
ptrW address(proto->getWStringA(hContact, TOX_SETTINGS_ID));
wchar_t avatarName[MAX_PATH];
|