CryptoPP: code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@8813 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 62 insertions, 64 deletions

diff --git a/plugins/CryptoPP/src/commonheaders.h b/plugins/CryptoPP/src/commonheaders.h
index 9b4fce001a..c1dfa05234 100644
--- a/plugins/CryptoPP/src/commonheaders.h
+++ b/plugins/CryptoPP/src/commonheaders.h
@@ -54,7 +54,6 @@
 #include "cryptopp.h"

 #include "version.h"

 #include "resource.h"

-#include "dllloader.h"

 #include "mmi.h"

 #include "utf8.h"

 #include "base16.h"

@@ -94,67 +93,66 @@ int Sent_NetLog(const char *,...);
 

 PBYTE cpp_alloc_pdata(pCNTX);

 

-extern "C" {

- DLLEXPORT HANDLE __cdecl cpp_create_context(int); // create crypt-context

- DLLEXPORT void   __cdecl cpp_delete_context(HANDLE); // delete crypt-context

- DLLEXPORT void   __cdecl cpp_reset_context(HANDLE);  // reset crypt-context (free all data)

- DLLEXPORT LPSTR  __cdecl cpp_init_keya(HANDLE,int);    // make KeyA

- DLLEXPORT int    __cdecl cpp_init_keyb(HANDLE,LPCSTR); // load KeyB

- DLLEXPORT int    __cdecl cpp_calc_keyx(HANDLE);        // calculate KeyX

- DLLEXPORT int    __cdecl cpp_init_keyp(HANDLE,LPCSTR); // make KeyP from password

- DLLEXPORT LPSTR  __cdecl cpp_encodeA(HANDLE,LPCSTR); // encode ANSIz string

- DLLEXPORT LPSTR  __cdecl cpp_encodeW(HANDLE,LPWSTR); // encode USC2z string

- DLLEXPORT LPSTR  __cdecl cpp_encodeU(HANDLE,LPCSTR); // encode UTF8z string

- DLLEXPORT LPSTR  __cdecl cpp_decode(HANDLE,LPCSTR);  // decode as ANSIzUCS2z

- DLLEXPORT LPSTR  __cdecl cpp_decodeU(HANDLE,LPCSTR); // decode as UTF8z

- DLLEXPORT int    __cdecl cpp_encrypt_file(HANDLE,LPCSTR,LPCSTR); // encrypt file

- DLLEXPORT int    __cdecl cpp_decrypt_file(HANDLE,LPCSTR,LPCSTR); // decrypt file

- DLLEXPORT int    __cdecl cpp_get_features(HANDLE); // get features field from client

- DLLEXPORT int    __cdecl cpp_get_error(HANDLE);    // get last error code

- DLLEXPORT int    __cdecl cpp_get_version(void); // get dll version

- DLLEXPORT int    __cdecl cpp_size_keyx(void);

- DLLEXPORT void   __cdecl cpp_get_keyx(HANDLE,byte*); // get crypto key

- DLLEXPORT void   __cdecl cpp_set_keyx(HANDLE,byte*); // set crypto key

- DLLEXPORT int    __cdecl cpp_size_keyp(void);

- DLLEXPORT void   __cdecl cpp_get_keyp(HANDLE,byte*); // get pre-shared key

- DLLEXPORT void   __cdecl cpp_set_keyp(HANDLE,byte*); // set pre-shared key

- DLLEXPORT int    __cdecl cpp_keya(HANDLE); // KeyA exist ?

- DLLEXPORT int    __cdecl cpp_keyb(HANDLE); // KeyB exist ?

- DLLEXPORT int    __cdecl cpp_keyx(HANDLE); // KeyX exist ?

- DLLEXPORT int    __cdecl cpp_keyp(HANDLE); // KeyP exist ?

-

- DLLEXPORT int    __cdecl pgp_init(void);

- DLLEXPORT int    __cdecl pgp_done(void);

- DLLEXPORT int    __cdecl pgp_open_keyrings(LPSTR,LPSTR);

- DLLEXPORT int    __cdecl pgp_close_keyrings(void);

- DLLEXPORT int    __cdecl pgp_get_version(void);

- DLLEXPORT LPSTR  __cdecl pgp_get_error(void);

- DLLEXPORT int    __cdecl pgp_set_priv_key(LPCSTR);

- DLLEXPORT int    __cdecl pgp_set_key(HANDLE,LPCSTR);

- DLLEXPORT int    __cdecl pgp_set_keyid(HANDLE,PVOID);

- DLLEXPORT int    __cdecl pgp_size_keyid(void);

- DLLEXPORT PVOID  __cdecl pgp_select_keyid(HWND,LPSTR);

- DLLEXPORT LPSTR  __cdecl pgp_encode(HANDLE,LPCSTR);

- DLLEXPORT LPSTR  __cdecl pgp_decode(HANDLE,LPCSTR);

-

- DLLEXPORT int    __cdecl gpg_init(void);

- DLLEXPORT int    __cdecl gpg_done(void);

- DLLEXPORT int    __cdecl gpg_open_keyrings(LPSTR,LPSTR);

- DLLEXPORT int    __cdecl gpg_close_keyrings(void);

- DLLEXPORT void   __cdecl gpg_set_log(LPCSTR);

- DLLEXPORT void   __cdecl gpg_set_tmp(LPCSTR);

- DLLEXPORT LPSTR  __cdecl gpg_get_error(void);

- DLLEXPORT int    __cdecl gpg_set_key(HANDLE,LPCSTR);

- DLLEXPORT int    __cdecl gpg_set_keyid(HANDLE,LPCSTR);

- DLLEXPORT int    __cdecl gpg_size_keyid(void);

- DLLEXPORT int    __cdecl gpg_select_keyid(HWND,LPSTR);

- DLLEXPORT LPSTR  __cdecl gpg_encode(HANDLE,LPCSTR);

- DLLEXPORT LPSTR  __cdecl gpg_decode(HANDLE,LPCSTR);

- DLLEXPORT LPSTR  __cdecl gpg_get_passphrases();

- DLLEXPORT void   __cdecl gpg_set_passphrases(LPCSTR);

-

- DLLEXPORT int    __cdecl rsa_init(pRSA_EXPORT*,pRSA_IMPORT);

- DLLEXPORT int    __cdecl rsa_done(void);

+extern "C" 

+{

+	DLLEXPORT HANDLE __cdecl cpp_create_context(int); // create crypt-context

+	DLLEXPORT void   __cdecl cpp_delete_context(HANDLE); // delete crypt-context

+	DLLEXPORT void   __cdecl cpp_reset_context(HANDLE);  // reset crypt-context (free all data)

+	DLLEXPORT LPSTR  __cdecl cpp_init_keya(HANDLE, int);    // make KeyA

+	DLLEXPORT int    __cdecl cpp_init_keyb(HANDLE, LPCSTR); // load KeyB

+	DLLEXPORT int    __cdecl cpp_calc_keyx(HANDLE);        // calculate KeyX

+	DLLEXPORT int    __cdecl cpp_init_keyp(HANDLE, LPCSTR); // make KeyP from password

+	DLLEXPORT LPSTR  __cdecl cpp_encodeA(HANDLE, LPCSTR); // encode ANSIz string

+	DLLEXPORT LPSTR  __cdecl cpp_encodeW(HANDLE, LPWSTR); // encode USC2z string

+	DLLEXPORT LPSTR  __cdecl cpp_encodeU(HANDLE, LPCSTR); // encode UTF8z string

+	DLLEXPORT LPSTR  __cdecl cpp_decode(HANDLE, LPCSTR);  // decode as ANSIzUCS2z

+	DLLEXPORT LPSTR  __cdecl cpp_decodeU(HANDLE, LPCSTR); // decode as UTF8z

+	DLLEXPORT int    __cdecl cpp_encrypt_file(HANDLE, LPCSTR, LPCSTR); // encrypt file

+	DLLEXPORT int    __cdecl cpp_decrypt_file(HANDLE, LPCSTR, LPCSTR); // decrypt file

+	DLLEXPORT int    __cdecl cpp_get_features(HANDLE); // get features field from client

+	DLLEXPORT int    __cdecl cpp_get_error(HANDLE);    // get last error code

+	DLLEXPORT int    __cdecl cpp_get_version(void); // get dll version

+	DLLEXPORT int    __cdecl cpp_size_keyx(void);

+	DLLEXPORT void   __cdecl cpp_get_keyx(HANDLE, byte*); // get crypto key

+	DLLEXPORT void   __cdecl cpp_set_keyx(HANDLE, byte*); // set crypto key

+	DLLEXPORT int    __cdecl cpp_size_keyp(void);

+	DLLEXPORT void   __cdecl cpp_get_keyp(HANDLE, byte*); // get pre-shared key

+	DLLEXPORT void   __cdecl cpp_set_keyp(HANDLE, byte*); // set pre-shared key

+	DLLEXPORT int    __cdecl cpp_keya(HANDLE); // KeyA exist ?

+	DLLEXPORT int    __cdecl cpp_keyb(HANDLE); // KeyB exist ?

+	DLLEXPORT int    __cdecl cpp_keyx(HANDLE); // KeyX exist ?

+	DLLEXPORT int    __cdecl cpp_keyp(HANDLE); // KeyP exist ?

+

+	DLLEXPORT int    __cdecl pgp_init(void);

+	DLLEXPORT int    __cdecl pgp_done(void);

+	DLLEXPORT int    __cdecl pgp_open_keyrings(LPSTR, LPSTR);

+	DLLEXPORT int    __cdecl pgp_close_keyrings(void);

+	DLLEXPORT int    __cdecl pgp_get_version(void);

+	DLLEXPORT LPSTR  __cdecl pgp_get_error(void);

+	DLLEXPORT int    __cdecl pgp_set_priv_key(LPCSTR);

+	DLLEXPORT int    __cdecl pgp_set_key(HANDLE, LPCSTR);

+	DLLEXPORT int    __cdecl pgp_set_keyid(HANDLE, PVOID);

+	DLLEXPORT int    __cdecl pgp_size_keyid(void);

+	DLLEXPORT PVOID  __cdecl pgp_select_keyid(HWND, LPSTR);

+	DLLEXPORT LPSTR  __cdecl pgp_encode(HANDLE, LPCSTR);

+	DLLEXPORT LPSTR  __cdecl pgp_decode(HANDLE, LPCSTR);

+

+	DLLEXPORT int    __cdecl gpg_init(void);

+	DLLEXPORT int    __cdecl gpg_done(void);

+	DLLEXPORT int    __cdecl gpg_open_keyrings(LPSTR, LPSTR);

+	DLLEXPORT int    __cdecl gpg_close_keyrings(void);

+	DLLEXPORT void   __cdecl gpg_set_log(LPCSTR);

+	DLLEXPORT void   __cdecl gpg_set_tmp(LPCSTR);

+	DLLEXPORT LPSTR  __cdecl gpg_get_error(void);

+	DLLEXPORT int    __cdecl gpg_set_key(HANDLE, LPCSTR);

+	DLLEXPORT int    __cdecl gpg_set_keyid(HANDLE, LPCSTR);

+	DLLEXPORT int    __cdecl gpg_size_keyid(void);

+	DLLEXPORT int    __cdecl gpg_select_keyid(HWND, LPSTR);

+	DLLEXPORT LPSTR  __cdecl gpg_encode(HANDLE, LPCSTR);

+	DLLEXPORT LPSTR  __cdecl gpg_decode(HANDLE, LPCSTR);

+	DLLEXPORT LPSTR  __cdecl gpg_get_passphrases();

+	DLLEXPORT void   __cdecl gpg_set_passphrases(LPCSTR);

+

+	DLLEXPORT int    __cdecl rsa_init(pRSA_EXPORT*, pRSA_IMPORT);

+	DLLEXPORT int    __cdecl rsa_done(void);

 }

-

-// EOF