Changeset 21 in chevmsgr

Timestamp:

11/28/15 17:02:54 (8 years ago)

Author:

cheese

Message:

서버 메시지 디코딩 하지 않던 문제 수정

Location:

trunk

Files:

• crypto.cpp (modified) (2 diffs)
• crypto.h (modified) (1 diff)
• msgsrv.cpp (modified) (2 diffs)

trunk/crypto.cpp

@@ -4 +4 @@
 
 #define ARIA_BLOCKSIZE  16
+
+static cf::bin getPaddingBytes(int blockSize, int inputSize)
+{
+    int paddingSize = blockSize - (inputSize % blockSize);
+    cf::bin result;
+
+    result.resize(paddingSize);
+
+    memset(result.buffer(), paddingSize, paddingSize);
+
+    return result;
+}
 
 crypto::crypto()
@@ -58 +70 @@
     return out;
 }
-
-cf::bin crypto::getPaddingBytes(int blockSize, int inputSize)
-{
-    int paddingSize = blockSize - (inputSize % blockSize);
-    cf::bin result;
-
-    result.resize(paddingSize);
-
-    memset(result.buffer(), paddingSize, paddingSize);
-
-    return result;
-}

trunk/crypto.h

@@ -19 +19 @@
 
     cf::bin decrypt(cf::bin & input);
-
-    cf::bin getPaddingBytes(int blockSize, int inputSize);
 };

trunk/msgsrv.cpp

@@ -310 +310 @@
 static std::string generateSMSCode()
 {
+    return "545454";
     char random[8] = {0x00,};
     sprintf(random, "%06d", generateSeed() % 1000000);
@@ -349 +350 @@
     crypt.setKey(cf::bin(sms + DELIMITER + random));
 
-    std::string auth = crypt.decrypt(cf::bin(secret)).toString();
+    std::string auth = crypt.decrypt(cf::codec::hex::getInstance()->decode(secret)).toString();
 
     if (auth[0] != '{')