From 3ef77b40f926008cac2d3f13e832710a226d8bf2 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Wed, 18 Mar 2020 16:48:05 +0300 Subject: Proper spelling of UTF-8 and SHA-1 --- plugins/SecureIM/src/cryptopp.h | 2 +- plugins/SecureIM/src/language.cpp | 8 ++++---- plugins/SecureIM/src/options.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/SecureIM/src') diff --git a/plugins/SecureIM/src/cryptopp.h b/plugins/SecureIM/src/cryptopp.h index 089d101cd7..3bf3fdd778 100644 --- a/plugins/SecureIM/src/cryptopp.h +++ b/plugins/SecureIM/src/cryptopp.h @@ -43,7 +43,7 @@ typedef struct { int (__cdecl *rsa_set_pubkey)(HANDLE,PBYTE,int); // загружает паблик ключ для указанного контекста void (__cdecl *rsa_set_timeout)(int); // установить таймаут для установки секюрного соединения int (__cdecl *rsa_get_state)(HANDLE); // получить статус указанного контекста - int (__cdecl *rsa_get_hash)(PBYTE,int,PBYTE,int*); // вычисляет SHA1(key) + int (__cdecl *rsa_get_hash)(PBYTE,int,PBYTE,int*); // вычисляет SHA-1 (key) int (__cdecl *rsa_connect)(HANDLE); // запускает процесс установки содинения с указанным контекстом int (__cdecl *rsa_disconnect)(HANDLE); // разрывает соединение с указанным контекстом int (__cdecl *rsa_disabled)(HANDLE); // разрывает соединение по причине "disabled" diff --git a/plugins/SecureIM/src/language.cpp b/plugins/SecureIM/src/language.cpp index 5cfbfe113c..887e7ce496 100644 --- a/plugins/SecureIM/src/language.cpp +++ b/plugins/SecureIM/src/language.cpp @@ -95,7 +95,7 @@ LPCSTR sim506 = LPGEN("Error while decoding RSA message"); LPCSTR sim507 = LPGEN("Session closed on timeout"); LPCSTR sim508 = LPGEN("Session closed by other side when status \"disabled\""); LPCSTR sim510 = LPGEN("Session closed on error: %02x"); -LPCSTR sim520 = LPGEN("SecureIM received RSA Public Key from \"%s\"\n\nSHA1: %s\n\nDo you Accept this Key?"); -LPCSTR sim521 = LPGEN("SecureIM auto accepted RSA Public key from: %s uin: %s SHA1: %s"); -LPCSTR sim522 = LPGEN("SecureIM received NEW RSA Public Key from \"%s\"\n\nNew SHA1: %s\n\nOld SHA1: %s\n\nDo you Replace this Key?"); -LPCSTR sim523 = LPGEN("SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA1: %s Old SHA1: %s"); +LPCSTR sim520 = LPGEN("SecureIM received RSA Public Key from \"%s\"\n\nSHA-1: %s\n\nDo you Accept this Key?"); +LPCSTR sim521 = LPGEN("SecureIM auto accepted RSA Public key from: %s uin: %s SHA-1: %s"); +LPCSTR sim522 = LPGEN("SecureIM received NEW RSA Public Key from \"%s\"\n\nNew SHA-1: %s\n\nOld SHA-1: %s\n\nDo you Replace this Key?"); +LPCSTR sim523 = LPGEN("SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA-1: %s Old SHA-1: %s"); diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index de2c241c46..c441eea3be 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -439,7 +439,7 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR hMenu = LoadMenu(g_plugin.getInst(), MAKEINTRESOURCE((ptr->tmode == MODE_NATIVE) ? IDM_CLIST01 : IDM_CLIST11)); break; case 4: // PSK/PUB - case 5: // SHA1 + case 5: // SHA-1 hMenu = LoadMenu(g_plugin.getInst(), MAKEINTRESOURCE((ptr->tmode == MODE_NATIVE) ? IDM_CLIST02 : IDM_CLIST12)); break; default: // full menu @@ -555,7 +555,7 @@ INT_PTR CALLBACK DlgProcOptionsProto(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM if (res == IDOK) { if (!mir_exp->rsa_import_keypair(CPP_MODE_RSA, priv, passphrase)) msgbox(hDlg, sim113, MODULENAME, MB_OK | MB_ICONEXCLAMATION); - else // обновить SHA1 значение + else // обновить SHA-1 значение RefreshProtoDlg(hDlg); } } -- cgit v1.2.3