Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / stglibs / crypto.lib / include / stg / blowfish.h

diff --git a/stglibs/crypto.lib/include/stg/blowfish.h b/stglibs/crypto.lib/include/stg/blowfish.h
index c99833403e23d893ed32c8920ec4d226f6775afb..783a9c309a60340a475842ef2e38ea1af99bb556 100644 (file)
--- a/stglibs/crypto.lib/include/stg/blowfish.h
+++ b/stglibs/crypto.lib/include/stg/blowfish.h
@@ -13,10 +13,7 @@
 #define MAXKEYBYTES 56          /* 448 bits */
 
 #ifdef __cplusplus
-#include <cstddef> // size_t
 extern "C" {
-#else
-#include <stddef.h> // size_t
 #endif
 
 typedef struct {
@@ -24,13 +21,16 @@ typedef struct {
   uint32_t S[4][256];
 } BLOWFISH_CTX;
 
-void Blowfish_Init(BLOWFISH_CTX *ctx, unsigned char *key, int keyLen);
-void Blowfish_Encrypt(BLOWFISH_CTX *ctx, uint32_t *xl, uint32_t *xr);
-void Blowfish_Decrypt(BLOWFISH_CTX *ctx, uint32_t *xl, uint32_t *xr);
+void Blowfish_Init(BLOWFISH_CTX * ctx, unsigned char * key, int keyLen);
+void Blowfish_Encrypt(const BLOWFISH_CTX * ctx, uint32_t * xl, uint32_t * xr);
+void Blowfish_Decrypt(const BLOWFISH_CTX * ctx, uint32_t * xl, uint32_t * xr);
 
-void EnDecodeInit(const char * key, size_t length, BLOWFISH_CTX *ctx);
-void DecodeString(char * d, const char * s, BLOWFISH_CTX *ctx);
-void EncodeString(char * d, const char * s, BLOWFISH_CTX *ctx);
+void InitContext(const char * key, size_t length, BLOWFISH_CTX * ctx);
+void DecryptBlock(void * d, const void * s, const BLOWFISH_CTX * ctx);
+void EncryptBlock(void * d, const void * s, const BLOWFISH_CTX * ctx);
+
+void DecryptString(void * d, const void * s, size_t length, const BLOWFISH_CTX * ctx);
+void EncryptString(void * d, const void * s, size_t length, const BLOWFISH_CTX * ctx);
 
 #ifdef __cplusplus
 }