X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcipher.cpp;h=88a4c506229bf76adff6ef7c968ba20b76bd3d2f;hb=cdc6091a2e02b84a48937cda287a0769ceb8726a;hp=9bfc787fd66cce542b25a2b24b61d2803a92aa50;hpb=37110ceaa070167b4f40ed449ac9ea130503a792;p=quassel.git

diff --git a/src/core/cipher.cpp b/src/core/cipher.cpp
index 9bfc787f..88a4c506 100644
--- a/src/core/cipher.cpp
+++ b/src/core/cipher.cpp
@@ -56,7 +56,8 @@ bool Cipher::setKey(QByteArray key)
 //    if(Preferences::self()->encryptionType())
 //      m_cbc = true;
 //    else
-        m_cbc = false;
+//    default to CBC
+        m_cbc = true;
         m_key = key;
     }
     return true;
@@ -117,7 +118,6 @@ QByteArray Cipher::decrypt(QByteArray cipherText)
     // (if cbc and no error we parse cbc) || (if ecb and error we parse cbc)
     if ((m_cbc && !error) || (!m_cbc && error))
     {
-        cipherText = cipherText;
         temp = blowfishCBC(cipherText, false);
 
         if (temp == cipherText)