X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreircuser.cpp;fp=src%2Fcore%2Fcoreircuser.cpp;h=4dd946ead319d6d4ed5bdf9d5f79fea6495515ed;hp=c89e9326b22c29a58406b1c3efe9c8f1bc1af3b6;hb=c382e0c11f80fb37307ecc42c487aa433c97ad8c;hpb=899709300734acc2bac01b1d57a1fd8fe2a6d923

diff --git a/src/core/coreircuser.cpp b/src/core/coreircuser.cpp
index c89e9326..4dd946ea 100644
--- a/src/core/coreircuser.cpp
+++ b/src/core/coreircuser.cpp
@@ -19,11 +19,24 @@
  ***************************************************************************/
 
 #include "coreircuser.h"
+#include "corenetwork.h"
 
 CoreIrcUser::CoreIrcUser(const QString &hostmask, Network *network) : IrcUser(hostmask, network)
 {
 #ifdef HAVE_QCA2
     _cipher = 0;
+
+    // Get the cipher key from CoreNetwork if present
+    CoreNetwork *coreNetwork = qobject_cast<CoreNetwork *>(network);
+    if (coreNetwork) {
+        QByteArray key = coreNetwork->readChannelCipherKey(nick().toLower());
+        if (!key.isEmpty()) {
+            if (!_cipher) {
+                _cipher = new Cipher();
+            }
+            setEncrypted(_cipher->setKey(key));
+        }
+    }
 #endif
 }
 
@@ -31,6 +44,15 @@ CoreIrcUser::CoreIrcUser(const QString &hostmask, Network *network) : IrcUser(ho
 CoreIrcUser::~CoreIrcUser()
 {
 #ifdef HAVE_QCA2
+    // Store the cipher key in CoreNetwork, including empty keys if a cipher
+    // exists. There is no need to store the empty key if no cipher exists; no
+    // key was present when instantiating and no key was set during the
+    // channel's lifetime.
+    CoreNetwork *coreNetwork = qobject_cast<CoreNetwork *>(network());
+    if (coreNetwork && _cipher) {
+        coreNetwork->storeChannelCipherKey(nick().toLower(), _cipher->key());
+    }
+
     delete _cipher;
 #endif
 }