From 024c7fb409dc9b0c921a41a89a411496a17b0f70 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 1 Apr 2014 14:58:49 +0000 Subject: CryptoPP: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@8813 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CryptoPP/src/cpp_misc.cpp | 132 ++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 68 deletions(-) (limited to 'plugins/CryptoPP/src/cpp_misc.cpp') diff --git a/plugins/CryptoPP/src/cpp_misc.cpp b/plugins/CryptoPP/src/cpp_misc.cpp index ec7a0ae043..a0721ed5f3 100644 --- a/plugins/CryptoPP/src/cpp_misc.cpp +++ b/plugins/CryptoPP/src/cpp_misc.cpp @@ -1,97 +1,93 @@ #include "commonheaders.h" - -int __cdecl cpp_get_features(HANDLE context) { - pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; - return ptr->features; +int __cdecl cpp_get_features(HANDLE context) +{ + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; + return ptr->features; } - -int __cdecl cpp_get_error(HANDLE context) { - pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; - return ptr->error; +int __cdecl cpp_get_error(HANDLE context) +{ + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; + return ptr->error; } - -int __cdecl cpp_get_version(void) { - return PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM); +int __cdecl cpp_get_version(void) +{ + return PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM); } - -BOOL cpp_get_simdata(HANDLE context, pCNTX *ptr, pSIMDATA *p) { - *ptr = get_context_on_id(context); if (!ptr) return 0; -// if (!*ptr || !(*ptr)->pdata || (*ptr)->mode&(MODE_PGP|MODE_GPG|MODE_RSA)) return FALSE; - if (!*ptr || (*ptr)->mode&(MODE_PGP|MODE_GPG|MODE_RSA)) return FALSE; - *p = (pSIMDATA) cpp_alloc_pdata(*ptr); - return TRUE; +BOOL cpp_get_simdata(HANDLE context, pCNTX *ptr, pSIMDATA *p) +{ + *ptr = get_context_on_id(context); if (!ptr) return 0; + if (!*ptr || (*ptr)->mode&(MODE_PGP | MODE_GPG | MODE_RSA)) return FALSE; + *p = (pSIMDATA)cpp_alloc_pdata(*ptr); + return TRUE; } - -int __cdecl cpp_size_keyx(void) { - return(Tiger::DIGESTSIZE+2); +int __cdecl cpp_size_keyx(void) +{ + return(Tiger::DIGESTSIZE + 2); } - -void __cdecl cpp_get_keyx(HANDLE context, BYTE *key) { - pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return; - memcpy(key,p->KeyX,Tiger::DIGESTSIZE); - memcpy(key+Tiger::DIGESTSIZE,&ptr->features,2); +void __cdecl cpp_get_keyx(HANDLE context, BYTE *key) +{ + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context, &ptr, &p)) return; + memcpy(key, p->KeyX, Tiger::DIGESTSIZE); + memcpy(key + Tiger::DIGESTSIZE, &ptr->features, 2); } - -void __cdecl cpp_set_keyx(HANDLE context, BYTE *key) { - pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return; - SAFE_FREE(p->PubA); - SAFE_FREE(p->KeyA); - mir_free(p->KeyB); p->KeyB = 0; - SAFE_FREE(p->KeyX); - p->KeyX = (PBYTE) malloc(Tiger::DIGESTSIZE+2); - memcpy(p->KeyX,key,Tiger::DIGESTSIZE); - memcpy(&ptr->features,key+Tiger::DIGESTSIZE,2); +void __cdecl cpp_set_keyx(HANDLE context, BYTE *key) +{ + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context, &ptr, &p)) return; + SAFE_FREE(p->PubA); + SAFE_FREE(p->KeyA); + mir_free(p->KeyB); p->KeyB = 0; + SAFE_FREE(p->KeyX); + p->KeyX = (PBYTE)malloc(Tiger::DIGESTSIZE + 2); + memcpy(p->KeyX, key, Tiger::DIGESTSIZE); + memcpy(&ptr->features, key + Tiger::DIGESTSIZE, 2); } - -void __cdecl cpp_get_keyp(HANDLE context, BYTE *key) { - pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return; - memcpy(key,p->KeyP,Tiger::DIGESTSIZE); +void __cdecl cpp_get_keyp(HANDLE context, BYTE *key) +{ + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context, &ptr, &p)) return; + memcpy(key, p->KeyP, Tiger::DIGESTSIZE); } - -int __cdecl cpp_size_keyp(void) { - return(Tiger::DIGESTSIZE); +int __cdecl cpp_size_keyp(void) +{ + return(Tiger::DIGESTSIZE); } - -void __cdecl cpp_set_keyp(HANDLE context, BYTE *key) { - pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return; - SAFE_FREE(p->KeyP); - p->KeyP = (PBYTE) malloc(Tiger::DIGESTSIZE); - memcpy(p->KeyP,key,Tiger::DIGESTSIZE); +void __cdecl cpp_set_keyp(HANDLE context, BYTE *key) +{ + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context, &ptr, &p)) return; + SAFE_FREE(p->KeyP); + p->KeyP = (PBYTE)malloc(Tiger::DIGESTSIZE); + memcpy(p->KeyP, key, Tiger::DIGESTSIZE); } - -int __cdecl cpp_keya(HANDLE context) { - pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return 0; - return p->KeyA!=NULL; +int __cdecl cpp_keya(HANDLE context) +{ + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context, &ptr, &p)) return 0; + return p->KeyA != NULL; } - -int __cdecl cpp_keyb(HANDLE context) { - pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return 0; - return p->KeyB!=NULL; +int __cdecl cpp_keyb(HANDLE context) +{ + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context, &ptr, &p)) return 0; + return p->KeyB != NULL; } - -int __cdecl cpp_keyx(HANDLE context) { - pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return 0; - return p->KeyX!=NULL; +int __cdecl cpp_keyx(HANDLE context) +{ + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context, &ptr, &p)) return 0; + return p->KeyX != NULL; } - -int __cdecl cpp_keyp(HANDLE context) { - pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return 0; - return p->KeyP!=NULL; +int __cdecl cpp_keyp(HANDLE context) +{ + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context, &ptr, &p)) return 0; + return p->KeyP != NULL; } - - -// EOF -- cgit v1.2.3