Fixed pointer arithmentics in crypto.lib.

[stg.git] / stglibs / srvconf.lib / netunit.cpp

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index ec796f7f1506a40885b041d74d5e86146675c268..596f766f1494a84ed6372d32f55505615c6a9ff7 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -25,14 +25,15 @@
  */
 
 //---------------------------------------------------------------------------
  */
 
 //---------------------------------------------------------------------------

-#include <stdio.h>
-#include <string.h>

 #include <netdb.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 

-#include "netunit.h"
-#include "common.h"
+#include <cstdio>
+#include <cstring>
+
+#include "stg/netunit.h"
+#include "stg/common.h"

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -56,15 +57,11 @@ NETTRANSACT::NETTRANSACT()
       RxCallBack(NULL),
       dataRxCallBack(NULL)
 {
       RxCallBack(NULL),
       dataRxCallBack(NULL)
 {

-    memset(server, 0, SERVER_NAME_LEN);
-    memset(login, 0, ADM_LOGIN_LEN);
-    memset(password, 0, ADM_PASSWD_LEN);
-    memset(errorMsg, 0, MAX_ERR_STR_LEN);

 }
 //-----------------------------------------------------------------------------
 void NETTRANSACT::EnDecryptInit(const char * passwd, int, BLOWFISH_CTX *ctx)
 {
 }
 //-----------------------------------------------------------------------------
 void NETTRANSACT::EnDecryptInit(const char * passwd, int, BLOWFISH_CTX *ctx)
 {

-unsigned char * keyL = NULL; // ��� ������
+unsigned char * keyL = NULL;

 
 keyL = new unsigned char[PASSWD_LEN];
 
 
 keyL = new unsigned char[PASSWD_LEN];
 


@@ -94,7 +91,7 @@ int ret;
 outerSocket = socket(PF_INET, SOCK_STREAM, 0);
 if (outerSocket < 0)
     {
 outerSocket = socket(PF_INET, SOCK_STREAM, 0);
 if (outerSocket < 0)
     {

-    strcpy(errorMsg, CREATE_SOCKET_ERROR);
+    errorMsg = CREATE_SOCKET_ERROR;

     return st_conn_fail;
     }
 
     return st_conn_fail;
     }
 


@@ -105,14 +102,14 @@ struct hostent he;
 struct hostent * phe;
 
 unsigned long ip;
 struct hostent * phe;
 
 unsigned long ip;

-ip = inet_addr(server);
+ip = inet_addr(server.c_str());

 
 if (ip == INADDR_NONE)
     {
 
 if (ip == INADDR_NONE)
     {

-    phe = gethostbyname(server);
+    phe = gethostbyname(server.c_str());

     if (phe == NULL)
         {
     if (phe == NULL)
         {

-        sprintf(errorMsg, "DNS error.\nCan not reslove %s", server);
+        errorMsg = "DNS error.\nCan not reslove " + server;

         return st_dns_err;
         }
 
         return st_dns_err;
         }
 


@@ -127,7 +124,7 @@ ret = connect(outerSocket, (struct sockaddr*)&outerAddr, sizeof(outerAddr));
 
 if (ret < 0)
     {
 
 if (ret < 0)
     {

-    strcpy(errorMsg, CONNECT_FAILED);
+    errorMsg = CONNECT_FAILED;

     close(outerSocket);
     return st_conn_fail;
     }
     close(outerSocket);
     return st_conn_fail;
     }


@@ -200,7 +197,7 @@ int ret;
 ret = send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0);
 if (ret <= 0)
     {
 ret = send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0);
 if (ret <= 0)
     {

-    strcpy(errorMsg, SEND_HEADER_ERROR);
+    errorMsg = SEND_HEADER_ERROR;

     return st_send_fail;
     }
 
     return st_send_fail;
     }
 


@@ -215,7 +212,7 @@ int ret;
 ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0);
 if (ret <= 0)
     {
 ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0);
 if (ret <= 0)
     {

-    strcpy(errorMsg, RECV_HEADER_ANSWER_ERROR);
+    errorMsg = RECV_HEADER_ANSWER_ERROR;

     return st_recv_fail;
     }
 
     return st_recv_fail;
     }
 


@@ -227,12 +224,12 @@ else
     {
     if (strncmp(ERR_HEADER, buffer, strlen(ERR_HEADER)) == 0)
         {
     {
     if (strncmp(ERR_HEADER, buffer, strlen(ERR_HEADER)) == 0)
         {

-        strcpy(errorMsg, INCORRECT_HEADER);
+        errorMsg = INCORRECT_HEADER;

         return st_header_err;
         }
     else
         {
         return st_header_err;
         }
     else
         {

-        strcpy(errorMsg, UNKNOWN_ERROR);
+        errorMsg = UNKNOWN_ERROR;

         return st_unknown_err;
         }
     }
         return st_unknown_err;
         }
     }


@@ -244,12 +241,12 @@ char loginZ[ADM_LOGIN_LEN];
 int ret;
 
 memset(loginZ, 0, ADM_LOGIN_LEN);
 int ret;
 
 memset(loginZ, 0, ADM_LOGIN_LEN);

-strncpy(loginZ, login, ADM_LOGIN_LEN);
+strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);

 ret = send(outerSocket, loginZ, ADM_LOGIN_LEN, 0);
 
 if (ret <= 0)
     {
 ret = send(outerSocket, loginZ, ADM_LOGIN_LEN, 0);
 
 if (ret <= 0)
     {

-    strcpy(errorMsg, SEND_LOGIN_ERROR);
+    errorMsg = SEND_LOGIN_ERROR;

     return st_send_fail;
     }
 
     return st_send_fail;
     }
 


@@ -259,12 +256,12 @@ return st_ok;
 int NETTRANSACT::RxLoginAnswer()
 {
 char buffer[sizeof(OK_LOGIN)+1];
 int NETTRANSACT::RxLoginAnswer()
 {
 char buffer[sizeof(OK_LOGIN)+1];

-int ret;//, we;
+int ret;

 
 ret = recv(outerSocket, buffer, strlen(OK_LOGIN), 0);
 if (ret <= 0)
     {
 
 ret = recv(outerSocket, buffer, strlen(OK_LOGIN), 0);
 if (ret <= 0)
     {

-    strcpy(errorMsg, RECV_LOGIN_ANSWER_ERROR);
+    errorMsg = RECV_LOGIN_ANSWER_ERROR;

     return st_recv_fail;
     }
 
     return st_recv_fail;
     }
 


@@ -276,12 +273,12 @@ else
     {
     if (strncmp(ERR_LOGIN, buffer, strlen(ERR_LOGIN)) == 0)
         {
     {
     if (strncmp(ERR_LOGIN, buffer, strlen(ERR_LOGIN)) == 0)
         {

-        strcpy(errorMsg, INCORRECT_LOGIN);
+        errorMsg = INCORRECT_LOGIN;

         return st_login_err;
         }
     else
         {
         return st_login_err;
         }
     else
         {

-        strcpy(errorMsg, UNKNOWN_ERROR);
+        errorMsg = UNKNOWN_ERROR;

         return st_unknown_err;
         }
     }
         return st_unknown_err;
         }
     }


@@ -294,22 +291,14 @@ char ct[ENC_MSG_LEN];
 int ret;
 
 memset(loginZ, 0, ADM_LOGIN_LEN);
 int ret;
 
 memset(loginZ, 0, ADM_LOGIN_LEN);

-strncpy(loginZ, login, ADM_LOGIN_LEN);
-

 BLOWFISH_CTX ctx;
 BLOWFISH_CTX ctx;

-EnDecryptInit(password, PASSWD_LEN, &ctx);
-
-for (int j = 0; j < ADM_LOGIN_LEN / ENC_MSG_LEN; j++)
+InitContext(password.c_str(), PASSWD_LEN, &ctx);
+EncryptString(loginZ, login.c_str(), std::min(login.length() + 1, ADM_LOGIN_LEN), &ctx);
+if (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 0)

     {
     {

-    Encrypt(ct, loginZ + j*ENC_MSG_LEN, &ctx);
-    ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
-    if (ret <= 0)
-        {
-        strcpy(errorMsg, SEND_LOGIN_ERROR);
-        return st_send_fail;
-        }
+    errorMsg = SEND_LOGIN_ERROR;
+    return st_send_fail;

     }
     }

-

 return st_ok;
 }
 //---------------------------------------------------------------------------
 return st_ok;
 }
 //---------------------------------------------------------------------------


@@ -321,7 +310,7 @@ int ret;
 ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0);
 if (ret <= 0)
     {
 ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0);
 if (ret <= 0)
     {

-    strcpy(errorMsg, RECV_LOGIN_ANSWER_ERROR);
+    errorMsg = RECV_LOGIN_ANSWER_ERROR;

     return st_recv_fail;
     }
 
     return st_recv_fail;
     }
 


@@ -333,12 +322,12 @@ else
     {
     if (strncmp(ERR_LOGINS, buffer, strlen(ERR_LOGINS)) == 0)
         {
     {
     if (strncmp(ERR_LOGINS, buffer, strlen(ERR_LOGINS)) == 0)
         {

-        strcpy(errorMsg, INCORRECT_LOGIN);
+        errorMsg = INCORRECT_LOGIN;

         return st_logins_err;
         }
     else
         {
         return st_logins_err;
         }
     else
         {

-        strcpy(errorMsg, UNKNOWN_ERROR);
+        errorMsg = UNKNOWN_ERROR;

         return st_unknown_err;
         }
     }
         return st_unknown_err;
         }
     }


@@ -355,34 +344,14 @@ int n = strlen(text) / ENC_MSG_LEN;
 int r = strlen(text) % ENC_MSG_LEN;
 
 BLOWFISH_CTX ctx;
 int r = strlen(text) % ENC_MSG_LEN;
 
 BLOWFISH_CTX ctx;

-EnDecryptInit(password, PASSWD_LEN, &ctx);
-
-for (j = 0; j < n; j++)
+InitContext(password.c_str(), PASSWD_LEN, &ctx);
+char buffer[text.length() + 9];
+EncryptString(buffer, text.c_str(), text.length() + 1, &ctx);
+if (send(outerSocket, buffer, sizeof(buffer), 0) <= 0)

     {
     {

-    strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
-    Encrypt(ct, textZ, &ctx);
-    ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
-    if (ret <= 0)
-        {
-        strcpy(errorMsg, SEND_DATA_ERROR);
-        return st_send_fail;
-        }
-    }
-
-memset(textZ, 0, ENC_MSG_LEN);
-if (r)
-    strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
-
-EnDecryptInit(password, PASSWD_LEN, &ctx);
-
-Encrypt(ct, textZ, &ctx);
-ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
-if (ret <= 0)
-    {
-    strcpy(errorMsg, SEND_DATA_ERROR);
+    errorMsg = SEND_DATA_ERROR;

     return st_send_fail;
     }
     return st_send_fail;
     }

-

 return st_ok;
 }
 //---------------------------------------------------------------------------
 return st_ok;
 }
 //---------------------------------------------------------------------------


@@ -393,7 +362,7 @@ char buffS[ENC_MSG_LEN];
 char passwd[ADM_PASSWD_LEN];
 
 memset(passwd, 0, ADM_PASSWD_LEN);
 char passwd[ADM_PASSWD_LEN];
 
 memset(passwd, 0, ADM_PASSWD_LEN);

-strncpy(passwd, password, ADM_PASSWD_LEN);
+strncpy(passwd, password.c_str(), ADM_PASSWD_LEN);

 memset(buff, 0, ENC_MSG_LEN);
 
 int l = strlen(data)/ENC_MSG_LEN;
 memset(buff, 0, ENC_MSG_LEN);
 
 int l = strlen(data)/ENC_MSG_LEN;


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

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

 
 for (int j = 0; j < l; j++)
     {
 
 for (int j = 0; j < l; j++)
     {


@@ -421,7 +390,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, PASSWD_LEN, &ctx);
+EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx);

 
 while (1)
     {
 
 while (1)
     {


@@ -429,13 +398,12 @@ while (1)
     if (ret <= 0)
         {
         close(outerSocket);
     if (ret <= 0)
         {
         close(outerSocket);

-        strcpy(errorMsg, RECV_DATA_ANSWER_ERROR);
+        errorMsg = RECV_DATA_ANSWER_ERROR;

         return st_recv_fail;
         }
 
     if (n == ENC_MSG_LEN)
         {
         return st_recv_fail;
         }
 
     if (n == ENC_MSG_LEN)
         {

-

         n = 0;
         Decrypt(buffer, bufferS, &ctx);
         buffer[ENC_MSG_LEN] = 0;
         n = 0;
         Decrypt(buffer, bufferS, &ctx);
         buffer[ENC_MSG_LEN] = 0;


@@ -460,17 +428,17 @@ while (1)
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetLogin(const char * l)
 {
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetLogin(const char * l)
 {

-strncpy(login, l, ADM_LOGIN_LEN);
+login = l;

 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetPassword(const char * p)
 {
 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetPassword(const char * p)
 {

-strncpy(password, p, ADM_PASSWD_LEN);
+password = p;

 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetServer(const char * serverName)
 {
 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetServer(const char * serverName)
 {

-strncpy(server, serverName, SERVER_NAME_LEN);
+server = serverName;

 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetServerPort(short unsigned p)
 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetServerPort(short unsigned p)


@@ -484,7 +452,7 @@ RxCallBack = cb;
 dataRxCallBack = data;
 }
 //---------------------------------------------------------------------------
 dataRxCallBack = data;
 }
 //---------------------------------------------------------------------------

-char * NETTRANSACT::GetError()
+const std::string & NETTRANSACT::GetError() const

 {
 return errorMsg;
 }
 {
 return errorMsg;
 }