X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/198f8204d13f3f0661233d910f474775a68a7337..e3703f791ff52f6d7a9d6f9e8dca37a506967c2b:/stglibs/srvconf.lib/netunit.cpp?ds=inline diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp index eab32e6a..61dc5c69 100644 --- a/stglibs/srvconf.lib/netunit.cpp +++ b/stglibs/srvconf.lib/netunit.cpp @@ -25,17 +25,15 @@ */ //--------------------------------------------------------------------------- - -#include "stg/netunit.h" -#include "stg/common.h" +#include +#include +#include #include -#include #include -#include -#include -#include +#include "stg/netunit.h" +#include "stg/common.h" //--------------------------------------------------------------------------- @@ -60,31 +58,6 @@ NETTRANSACT::NETTRANSACT() 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() { @@ -214,7 +187,6 @@ int ret; ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0); if (ret <= 0) { - printf("Receive header answer error: '%s'\n", strerror(errno)); errorMsg = RECV_HEADER_ANSWER_ERROR; return st_recv_fail; } @@ -264,7 +236,6 @@ int ret; ret = recv(outerSocket, buffer, strlen(OK_LOGIN), 0); if (ret <= 0) { - printf("Receive login answer error: '%s'\n", strerror(errno)); errorMsg = RECV_LOGIN_ANSWER_ERROR; return st_recv_fail; } @@ -291,26 +262,16 @@ else int NETTRANSACT::TxLoginS() { char loginZ[ADM_LOGIN_LEN]; -char ct[ENC_MSG_LEN]; -int ret; memset(loginZ, 0, ADM_LOGIN_LEN); -strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN); - BLOWFISH_CTX ctx; -EnDecryptInit(password.c_str(), 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) - { - errorMsg = SEND_LOGIN_ERROR; - return st_send_fail; - } + errorMsg = SEND_LOGIN_ERROR; + return st_send_fail; } - return st_ok; } //--------------------------------------------------------------------------- @@ -322,7 +283,6 @@ int ret; ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0); if (ret <= 0) { - printf("Receive secret login answer error: '%s'\n", strerror(errno)); errorMsg = RECV_LOGIN_ANSWER_ERROR; return st_recv_fail; } @@ -348,73 +308,20 @@ else //--------------------------------------------------------------------------- int NETTRANSACT::TxData(const char * text) { -char textZ[ENC_MSG_LEN]; -char ct[ENC_MSG_LEN]; -int ret; -int j; - -int n = strlen(text) / ENC_MSG_LEN; -int r = strlen(text) % ENC_MSG_LEN; - BLOWFISH_CTX ctx; -EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx); - -for (j = 0; j < n; j++) - { - 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) - { - 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.c_str(), PASSWD_LEN, &ctx); - -Encrypt(ct, textZ, &ctx); -ret = send(outerSocket, ct, ENC_MSG_LEN, 0); -if (ret <= 0) +InitContext(password.c_str(), PASSWD_LEN, &ctx); +size_t length = strlen(text); +char buffer[length + 9]; +memset(buffer, 0, sizeof(buffer)); +EncryptString(buffer, text, length + 1, &ctx); +if (send(outerSocket, buffer, sizeof(buffer), 0) <= 0) { errorMsg = SEND_DATA_ERROR; return st_send_fail; } - return st_ok; } //--------------------------------------------------------------------------- -int NETTRANSACT::TxData(char * data) -{ -char buff[ENC_MSG_LEN]; -char buffS[ENC_MSG_LEN]; -char passwd[ADM_PASSWD_LEN]; - -memset(passwd, 0, ADM_PASSWD_LEN); -strncpy(passwd, password.c_str(), ADM_PASSWD_LEN); -memset(buff, 0, ENC_MSG_LEN); - -int l = strlen(data)/ENC_MSG_LEN; -if (strlen(data)%ENC_MSG_LEN) - l++; - -BLOWFISH_CTX ctx; -EnDecryptInit(passwd, PASSWD_LEN, &ctx); - -for (int j = 0; j < l; j++) - { - strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN); - Encrypt(buffS, buff, &ctx); - send(outerSocket, buffS, ENC_MSG_LEN, 0); - } - -return 0; -} -//--------------------------------------------------------------------------- int NETTRANSACT::RxDataAnswer() { int n = 0; @@ -423,14 +330,13 @@ char bufferS[ENC_MSG_LEN]; 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) { ret = recv(outerSocket, &bufferS[n++], 1, 0); if (ret <= 0) { - printf("Receive data error: '%s'\n", strerror(errno)); close(outerSocket); errorMsg = RECV_DATA_ANSWER_ERROR; return st_recv_fail; @@ -439,7 +345,7 @@ while (1) if (n == ENC_MSG_LEN) { n = 0; - Decrypt(buffer, bufferS, &ctx); + DecryptBlock(buffer, bufferS, &ctx); buffer[ENC_MSG_LEN] = 0; answerList.push_back(buffer); @@ -450,7 +356,9 @@ while (1) { if (RxCallBack) if (st_ok != RxCallBack(dataRxCallBack, &answerList)) + { return st_xml_parse_error; + } return st_ok; } }