diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-11-19 18:01:14 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-11-19 18:01:14 +0000 |
| commit | d6e05cc3bca53565d9ca65377ab8b0b6190774b3 (patch) | |
| tree | 76040facd4d0b82162069a19cae8f7f024bf1f65 /protocols/Yahoo/src | |
| parent | 2ef414538760079fa2955fca1a2c03d610459fa8 (diff) | |
preparing to the transparent cyphering: end of MS_DB_CRYPT_ENCODESTRING/MS_DB_CRYPT_DECODESTRING
git-svn-id: http://svn.miranda-ng.org/main/trunk@6938 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Yahoo/src')
| -rw-r--r-- | protocols/Yahoo/src/options.cpp | 2 | ||||
| -rw-r--r-- | protocols/Yahoo/src/proto.cpp | 66 |
2 files changed, 29 insertions, 39 deletions
diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp index d53e46b965..f0fdfe9611 100644 --- a/protocols/Yahoo/src/options.cpp +++ b/protocols/Yahoo/src/options.cpp @@ -48,7 +48,6 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, if ( !ppro->getString( YAHOO_PASSWORD, &dbv)) {
//bit of a security hole here, since it's easy to extract a password from an edit box
- CallService(MS_DB_CRYPT_DECODESTRING, strlen( dbv.pszVal )+1, (LPARAM)dbv.pszVal);
SetDlgItemTextA(hwndDlg, IDC_PASSWORD, dbv.pszVal );
db_free(&dbv);
}
@@ -110,7 +109,6 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, ppro->setString( YAHOO_LOGINID, str );
GetDlgItemTextA(hwndDlg, IDC_PASSWORD, str, sizeof( str ));
- CallService(MS_DB_CRYPT_ENCODESTRING, sizeof(str), (LPARAM)str);
dbv.pszVal = NULL;
if ( ppro->getString( YAHOO_PASSWORD, &dbv) || lstrcmpA( str, dbv.pszVal ))
reconnectRequired = true;
diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index 9c7be6525d..c7e3821ab8 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -440,28 +440,29 @@ int __cdecl CYahooProto::SetStatus( int iNewStatus ) * Load Yahoo ID from the database.
*/
if (!getString(YAHOO_LOGINID, &dbv)) {
- if (lstrlenA(dbv.pszVal) > 0) {
+ if (lstrlenA(dbv.pszVal) > 0)
lstrcpynA(m_yahoo_id, dbv.pszVal, 255);
- } else
+ else
err++;
db_free(&dbv);
- } else {
+ }
+ else {
ProtoBroadcastAck(NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGINERR_BADUSERID);
err++;
}
- if (err) {
+ if (err)
lstrcpynA(errmsg, Translate("Please enter your Yahoo ID in Options/Network/Yahoo"), 80);
- } else {
+ else {
if (!getString(YAHOO_PASSWORD, &dbv)) {
- CallService(MS_DB_CRYPT_DECODESTRING, lstrlenA(dbv.pszVal) + 1, (LPARAM) dbv.pszVal);
- if (lstrlenA(dbv.pszVal) > 0) {
+ if (lstrlenA(dbv.pszVal) > 0)
lstrcpynA(m_password, dbv.pszVal, 255);
- } else
+ else
err++;
db_free(&dbv);
- } else {
+ }
+ else {
ProtoBroadcastAck(NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGINERR_WRONGPASSWORD);
err++;
}
@@ -483,9 +484,8 @@ int __cdecl CYahooProto::SetStatus( int iNewStatus ) FREE(m_pw_token); // No Token yet.
if (!getString(YAHOO_PWTOKEN, &dbv)) {
- if (lstrlenA(dbv.pszVal) > 0) {
+ if (lstrlenA(dbv.pszVal) > 0)
m_pw_token = strdup(dbv.pszVal);
- }
db_free(&dbv);
}
@@ -719,33 +719,29 @@ int __cdecl CYahooProto::OnEvent( PROTOEVENTTYPE eventType, WPARAM wParam, LPARA INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
- switch (msg)
- {
+ DBVARIANT dbv;
+ CYahooProto* ppro = (CYahooProto*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+
+ switch (msg) {
case WM_INITDIALOG:
- {
- TranslateDialogDefault(hwndDlg);
+ TranslateDialogDefault(hwndDlg);
- CYahooProto* ppro = (CYahooProto*)lParam;
- SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
+ ppro = (CYahooProto*)lParam;
+ SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
- DBVARIANT dbv;
- if ( !ppro->getString(YAHOO_LOGINID, &dbv))
- {
- SetDlgItemTextA(hwndDlg, IDC_HANDLE, dbv.pszVal);
- db_free(&dbv);
- }
-
- if ( !ppro->getString(YAHOO_PASSWORD, &dbv))
- {
- CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal) + 1, (LPARAM) dbv.pszVal);
- SetDlgItemTextA(hwndDlg, IDC_PASSWORD, dbv.pszVal);
- db_free(&dbv);
- }
+ if ( !ppro->getString(YAHOO_LOGINID, &dbv)) {
+ SetDlgItemTextA(hwndDlg, IDC_HANDLE, dbv.pszVal);
+ db_free(&dbv);
+ }
- SetButtonCheck(hwndDlg, IDC_YAHOO_JAPAN, ppro->getByte("YahooJapan", 0));
- return TRUE;
+ if ( !ppro->getString(YAHOO_PASSWORD, &dbv)) {
+ SetDlgItemTextA(hwndDlg, IDC_PASSWORD, dbv.pszVal);
+ db_free(&dbv);
}
+ SetButtonCheck(hwndDlg, IDC_YAHOO_JAPAN, ppro->getByte("YahooJapan", 0));
+ return TRUE;
+
case WM_COMMAND:
if ( LOWORD( wParam ) == IDC_NEWYAHOOACCOUNTLINK ) {
CallService(MS_UTILS_OPENURL,
@@ -769,11 +765,8 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM break;
case WM_NOTIFY:
- if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY )
- {
- CYahooProto* ppro = (CYahooProto*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+ if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY ) {
char str[128];
- DBVARIANT dbv;
BOOL reconnectRequired = FALSE;
GetDlgItemTextA(hwndDlg, IDC_HANDLE, str, sizeof(str));
@@ -798,7 +791,6 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (reconnectRequired)
ppro->delSetting(YAHOO_PWTOKEN);
- CallService(MS_DB_CRYPT_ENCODESTRING, sizeof(str), (LPARAM) str);
ppro->setString(YAHOO_PASSWORD, str);
ppro->setByte("YahooJapan", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_YAHOO_JAPAN ));
|