X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcipher.cpp;h=88a4c506229bf76adff6ef7c968ba20b76bd3d2f;hb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;hp=a8232a3c1fc29b338fb214d22aa823398e2c9f0f;hpb=90803b4288736e6c53d50eeb4fbbe2525be968c3;p=quassel.git

diff --git a/src/core/cipher.cpp b/src/core/cipher.cpp
index a8232a3c..88a4c506 100644
--- a/src/core/cipher.cpp
+++ b/src/core/cipher.cpp
@@ -13,7 +13,7 @@
 */
 
 #include "cipher.h"
-#include "logger.h"
+#include "logmessage.h"
 
 Cipher::Cipher()
 {
@@ -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)