Encryption debug

[user/henk/code/inspircd.git] / src / modules / m_spanningtree.cpp

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 55313eb053934eba03f7b31af9ab0f502ac785e0..49493b423970d4f75f7e50130d1229ca2816d7d1 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -539,6 +539,7 @@ class TreeSocket : public InspSocket
        bool LastPingWasGood;
        bool bursting;
        AES* ctx;
+       unsigned int keylength;
        
  public:
 
@@ -554,23 +555,21 @@ class TreeSocket : public InspSocket
                this->LinkState = LISTENER;
        }
 
-       TreeSocket(std::string host, int port, bool listening, unsigned long maxtime, std::string ServerName, std::string encryptionkey)
+       TreeSocket(std::string host, int port, bool listening, unsigned long maxtime, std::string ServerName)
                : InspSocket(host, port, listening, maxtime)
        {
                myhost = ServerName;
                this->LinkState = CONNECTING;
-               InitAES(encryptionkey);
        }
 
        /* When a listening socket gives us a new file descriptor,
         * we must associate it with a socket without creating a new
         * connection. This constructor is used for this purpose.
         */
-       TreeSocket(int newfd, char* ip, std::string encryptionkey)
+       TreeSocket(int newfd, char* ip)
                : InspSocket(newfd, ip)
        {
                this->LinkState = WAIT_AUTH_1;
-               InitAES(encryptionkey);
        }
 
        void InitAES(std::string key)
@@ -579,14 +578,16 @@ class TreeSocket : public InspSocket
                        return;
 
                ctx = new AES();
+               log(DEBUG,"Initialized AES key %s",key.c_str());
                // key must be 16, 24, 32 etc bytes (multiple of 8)
-               unsigned int keylength = key.length();
+               keylength = key.length();
                if (!(keylength == 16 || keylength == 24 || keylength == 32))
                {
+                       log(DEBUG,"Key length not 16, 24 or 32 characters!");
                }
                else
                {
-                       ctx->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0
+                       ctx->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
                                \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength);
                }
        }
@@ -1164,9 +1165,10 @@ class TreeSocket : public InspSocket
                                {
                                        char out[1024];
                                        char result[1024];
+                                       log(DEBUG,"Original string '%s'",ret.c_str());
                                        int nbytes = from64tobits(out, ret.c_str(), 1024);
                                        log(DEBUG,"m_spanningtree: decrypt %d bytes",nbytes);
-                                       ctx->Decrypt(out, result, nbytes, AES::ECB);
+                                       ctx->Decrypt(out, result, nbytes, 0);
                                        ret = result;
                                }
                                if (!this->ProcessLine(ret))
@@ -1181,17 +1183,23 @@ class TreeSocket : public InspSocket
        int WriteLine(std::string line)
        {
                log(DEBUG,"OUT: %s",line.c_str());
-               if (ctx)
+               if (this->ctx)
                {
-                       char* result[1024];
-                       char* result64[1024];
-                       while (line.length() % this->keylength != 0)
+                       log(DEBUG,"AES context");
+                       char result[1024];
+                       char result64[1024];
+                       if (this->keylength)
                        {
-                               // pad it to be a multiple of the key length
-                               line = line + "\0";
+                               while (line.length() % this->keylength != 0)
+                               {
+                                       // pad it to be a multiple of the key length
+                                       line = line + "\0";
+                               }
                        }
-                       ctx->Encrypt(line.c_str(), result, line.length(), AES::ECB);
-                       to64frombits(result64, result, line.length());
+                       ctx->Encrypt(line.c_str(), result, line.length(),0);
+                       to64frombits((unsigned char*)result64,
+                                       (unsigned char*)result,
+                                       line.length());
                        line = result64;
                        log(DEBUG,"Encrypted: %s",line.c_str());
                        //int from64tobits(char *out, const char *in, int maxlen);
@@ -1894,6 +1902,16 @@ class TreeSocket : public InspSocket
                                else if (command == "ENDBURST")
                                {
                                        this->bursting = false;
+                                       std::string sserv = this->myhost;
+                                       if (this->InboundServerName != "")
+                                               sserv = this->InboundServerName;
+                                       for (std::vector<Link>::iterator x = LinkBlocks.begin(); x < LinkBlocks.end(); x++)
+                                       {
+                                               if ((x->EncryptionKey != "") && (x->Name == sserv))
+                                               {
+                                                       this->InitAES(x->EncryptionKey);
+                                               }
+                                       }
                                        return true;
                                }
                                else