Removed some unused stuff from netunit.cpp.

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index 596f766f1494a84ed6372d32f55505615c6a9ff7..936ebc6040f595de4cf85230b81f9cc5a220034e 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -58,31 +58,6 @@ NETTRANSACT::NETTRANSACT()
       dataRxCallBack(NULL)
 {
 }
       dataRxCallBack(NULL)
 {
 }

-//-----------------------------------------------------------------------------
-void NETTRANSACT::EnDecryptInit(const char * passwd, int, BLOWFISH_CTX *ctx)
-{
-unsigned char * keyL = NULL;
-
-keyL = new unsigned char[PASSWD_LEN];
-
-memset(keyL, 0, PASSWD_LEN);
-
-strncpy((char *)keyL, passwd, PASSWD_LEN);
-
-Blowfish_Init(ctx, keyL, PASSWD_LEN);
-
-delete[] keyL;
-}
-//-----------------------------------------------------------------------------
-void NETTRANSACT::Encrypt(char * d, const char * s, BLOWFISH_CTX *ctx)
-{
-EncodeString(d, s, ctx);
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::Decrypt(char * d, const char * s, BLOWFISH_CTX *ctx)
-{
-DecodeString(d, s, ctx);
-}

 //---------------------------------------------------------------------------
 int NETTRANSACT::Connect()
 {
 //---------------------------------------------------------------------------
 int NETTRANSACT::Connect()
 {


@@ -370,12 +345,12 @@ if (strlen(data)%ENC_MSG_LEN)
     l++;
 
 BLOWFISH_CTX ctx;
     l++;
 
 BLOWFISH_CTX ctx;

-InitContext(password.c_str(), PASSWD_LEN, &ctx);
+InitContext(passwd, PASSWD_LEN, &ctx);

 
 for (int j = 0; j < l; j++)
     {
     strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN);
 
 for (int j = 0; j < l; j++)
     {
     strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN);

-    Encrypt(buffS, buff, &ctx);
+    EncryptBlock(buffS, buff, &ctx);

     send(outerSocket, buffS, ENC_MSG_LEN, 0);
     }
 
     send(outerSocket, buffS, ENC_MSG_LEN, 0);
     }
 


@@ -390,7 +365,7 @@ char bufferS[ENC_MSG_LEN];
 char buffer[ENC_MSG_LEN + 1];
 
 BLOWFISH_CTX ctx;
 char buffer[ENC_MSG_LEN + 1];
 
 BLOWFISH_CTX ctx;

-EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx);
+InitContext(password.c_str(), PASSWD_LEN, &ctx);

 
 while (1)
     {
 
 while (1)
     {


@@ -405,7 +380,7 @@ while (1)
     if (n == ENC_MSG_LEN)
         {
         n = 0;
     if (n == ENC_MSG_LEN)
         {
         n = 0;

-        Decrypt(buffer, bufferS, &ctx);
+        DecryptBlock(buffer, bufferS, &ctx);

         buffer[ENC_MSG_LEN] = 0;
 
         answerList.push_back(buffer);
         buffer[ENC_MSG_LEN] = 0;
 
         answerList.push_back(buffer);