diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-02 15:51:46 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-02 15:51:46 +0000 |
| commit | eca1b167120907f6d927de29f449c93bdf381a83 (patch) | |
| tree | 0699691346ba01d3963cf5c3ef49138713f37205 /plugins/CryptoPP/cpp_keys.cpp | |
| parent | 1ed8a4ff1ec95b0df08a5bf48bb372c8481e381b (diff) | |
- removed __asm piece
git-svn-id: http://svn.miranda-ng.org/main/trunk@717 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/CryptoPP/cpp_keys.cpp')
| -rw-r--r-- | plugins/CryptoPP/cpp_keys.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/CryptoPP/cpp_keys.cpp b/plugins/CryptoPP/cpp_keys.cpp index 16e4e0d281..b21da13ada 100644 --- a/plugins/CryptoPP/cpp_keys.cpp +++ b/plugins/CryptoPP/cpp_keys.cpp @@ -10,10 +10,10 @@ LPSTR __cdecl cpp_init_keya(HANDLE context, int features) { pSIMDATA p = (pSIMDATA) cpp_alloc_pdata(ptr);
int send_features = FEATURES;
- if(p->KeyP) send_features |= FEATURES_PSK;
+ if (p->KeyP) send_features |= FEATURES_PSK;
SAFE_DELETE(p->dh);
- if(features & FEATURES_NEWPG) {
+ if (features & FEATURES_NEWPG) {
Integer p0("0x865734026113B4DF0082CED84C197718516088FBDA406CFDFD7F033694E11E46F01C8F01E0E5AE6B09F6284691C7DD30A5BA8A74BA4B780198624B84BC8DAF6E0DFF874C0440ABB5C043C82E9E9C9E6F1A470B6A2A6BCEAC9460C43B1BB1331DF0FFD898DB74D22E8A71DB2659F1B0F52F337718D233DED611DA25AEAA90F3BE0C42FA9E541D0487DF58A77E2F44D295AD0C54C369CE260C969CA12F690EAAFAEEF8676C631AF29A3DE3389D3000B94EFA775E31FCA879AEB00A4D05EEF50D4C084A049EB12EF4CDFBD48E36B29CEAF8978D535D6C70BB274D1FEA02ABD521D2EF482A76326C17AF597FCB9B8BF37D9110E22AB0746D6A9779DF5133822E3F15");
Integer q0("0xF1515160E1BFC7636338C13AD5BA775318E287147A1F96B73CF0FB4D97EFFB9D1FCDCF31AB9D92C4F49C9F8D50F06E697D2313E2EBAC7781312A51F458D66FFC687960CAA86BDF150A36ED53D79FBDB4F501FD25E37C181B45F9555D7F1C6124CAB29A822AD1E7BF5DA93C2FDB12A61919B5E5359793CBB16E71516919040A7F");
Integer g0("0x434158F2FF2CF667E3CC1A707770DDE7B56048F6C5005473C6DC4A5E3FC490667F2908C44F9ADC2071EB8A8A1EC6AD6901CDAAAFE806626E3F4C5E69D4FCBF9DF1B67D574DC61C687C4BEF3ACF77A7256752F4D3A7EAEEE5874ED4912AB10C5B122A24E698B14CAC3E0FD006E0DB02714E028AECCA25BAB9DDCA2CF6405E862B403C61BC381D64B46BD96D3FEFBE22B7497FCBDA2B49C840C1B2853502A5216B036F83D2EAD8F835B603FC5BA1EFB816C7634915B1D43963FDD1B1ED626F48CCF8F152392E4693D38C566016708FA9E9598AECF95A8B067212669247552418E538A706564F855D3D5D50717D356259A20D8FD0C6B2A9FCC045D3F7AED1E857C5");
@@ -42,7 +42,7 @@ LPSTR __cdecl cpp_init_keya(HANDLE context, int features) { p->KeyA = (PBYTE) malloc(KEYSIZE);
memcpy(p->KeyA,priv1,KEYSIZE);
- if(p->KeyP) {
+ if (p->KeyP) {
// encrypt PUBLIC use PSK
string ciphered;
CFB_Mode<AES>::Encryption enc(p->KeyP,Tiger::DIGESTSIZE,IV);
@@ -58,7 +58,7 @@ LPSTR __cdecl cpp_init_keya(HANDLE context, int features) { memcpy((PVOID)&publ1[KEYSIZE],(PVOID)&send_features,2);
SAFE_FREE(ptr->tmp);
- if(ptr->mode & MODE_BASE64 || features & FEATURES_NEWPG)
+ if (ptr->mode & MODE_BASE64 || features & FEATURES_NEWPG)
ptr->tmp = base64encode((LPSTR)&publ1,KEYSIZE+2);
else
ptr->tmp = base16encode((LPSTR)&publ1,KEYSIZE+2);
@@ -91,10 +91,10 @@ int __cdecl cpp_init_keyb(HANDLE context, LPCSTR key) { return 0;
}
- if(clen==KEYSIZE+2)
+ if (clen==KEYSIZE+2)
memcpy((PVOID)&ptr->features,(PVOID)(pub_binary+KEYSIZE),2);
- if(p->KeyP) {
+ if (p->KeyP) {
if (!(ptr->features & FEATURES_PSK)) { // if NO PSK on other side
#if defined(_DEBUG) || defined(NETLIB_LOG)
Sent_NetLog("cpp_init_keyb: error no_psk");
@@ -124,7 +124,7 @@ int __cdecl cpp_init_keyb(HANDLE context, LPCSTR key) { SAFE_FREE(p->KeyB);
p->KeyB = (PBYTE) pub_binary;
- if(p->PubA && memcmp(p->PubA,p->KeyB,KEYSIZE)==0) {
+ if (p->PubA && memcmp(p->PubA,p->KeyB,KEYSIZE)==0) {
#if defined(_DEBUG) || defined(NETLIB_LOG)
Sent_NetLog("cpp_init_keyb: error bad_keyb keya==keyb");
#endif
|