From: Maxim Mamontov Date: Sun, 18 Jan 2015 17:40:38 +0000 (+0200) Subject: Removed some unused stuff from netunit.cpp. X-Git-Tag: 2.409~217 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/45043ba8ae9d21f69209fcb74f1715d97e4fc409?hp=90f4f13ef5d9a90a06e1ba9243f18c3b98977655 Removed some unused stuff from netunit.cpp. --- diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp index 596f766f..936ebc60 100644 --- a/stglibs/srvconf.lib/netunit.cpp +++ b/stglibs/srvconf.lib/netunit.cpp @@ -58,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() { @@ -370,12 +345,12 @@ if (strlen(data)%ENC_MSG_LEN) 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); - Encrypt(buffS, buff, &ctx); + EncryptBlock(buffS, buff, &ctx); 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; -EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx); +InitContext(password.c_str(), PASSWD_LEN, &ctx); while (1) { @@ -405,7 +380,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);