projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make quassel compile with qca enabled on qt5
[quassel.git]
/
src
/
core
/
cipher.cpp
diff --git
a/src/core/cipher.cpp
b/src/core/cipher.cpp
index
15a986b
..
3f299f4
100644
(file)
--- a/
src/core/cipher.cpp
+++ b/
src/core/cipher.cpp
@@
-170,6
+170,13
@@
QByteArray Cipher::initKeyExchange()
QByteArray Cipher::parseInitKeyX(QByteArray key)
{
QCA::Initializer init;
QByteArray Cipher::parseInitKeyX(QByteArray key)
{
QCA::Initializer init;
+ bool isCBC = false;
+
+ if (key.endsWith(" CBC"))
+ {
+ isCBC = true;
+ key.chop(4);
+ }
if (key.length() != 181)
return QByteArray();
if (key.length() != 181)
return QByteArray();
@@
-198,6
+205,9
@@
QByteArray Cipher::parseInitKeyX(QByteArray key)
//remove trailing = because mircryption and fish think it's a swell idea.
while (sharedKey.endsWith('=')) sharedKey.chop(1);
//remove trailing = because mircryption and fish think it's a swell idea.
while (sharedKey.endsWith('=')) sharedKey.chop(1);
+ if (isCBC)
+ sharedKey.prepend("cbc:");
+
bool success = setKey(sharedKey);
if (!success)
bool success = setKey(sharedKey);
if (!success)
@@
-410,13
+420,13
@@
QByteArray Cipher::byteToB64(QByteArray text)
right += v;
for (int i = 0; i < 6; i++) {
right += v;
for (int i = 0; i < 6; i++) {
- encoded.append(base64.at(right & 0x3F).to
Ascii
());
+ encoded.append(base64.at(right & 0x3F).to
Latin1
());
right = right >> 6;
}
right = right >> 6;
}
- //TODO make sure the .to
ascii
doesn't break anything
+ //TODO make sure the .to
Latin1
doesn't break anything
for (int i = 0; i < 6; i++) {
for (int i = 0; i < 6; i++) {
- encoded.append(base64.at(left & 0x3F).to
Ascii
());
+ encoded.append(base64.at(left & 0x3F).to
Latin1
());
left = left >> 6;
}
}
left = left >> 6;
}
}
@@
-473,6
+483,5
@@
bool Cipher::neededFeaturesAvailable()
if (QCA::isSupported("blowfish-ecb") && QCA::isSupported("blowfish-cbc") && QCA::isSupported("dh"))
return true;
if (QCA::isSupported("blowfish-ecb") && QCA::isSupported("blowfish-cbc") && QCA::isSupported("dh"))
return true;
- qWarning() << "QCA provider plugin not found. It is usually provided by the qca-ossl plugin.";
return false;
}
return false;
}