projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Limit "User is away" to 1hr or when changed
[quassel.git]
/
src
/
core
/
cipher.cpp
diff --git
a/src/core/cipher.cpp
b/src/core/cipher.cpp
index
7d1fe46
..
fb6a697
100644
(file)
--- a/
src/core/cipher.cpp
+++ b/
src/core/cipher.cpp
@@
-13,7
+13,7
@@
*/
#include "cipher.h"
*/
#include "cipher.h"
-#include "log
ger
.h"
+#include "log
message
.h"
Cipher::Cipher()
{
Cipher::Cipher()
{
@@
-117,7
+117,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))
{
// (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)
temp = blowfishCBC(cipherText, false);
if (temp == cipherText)
@@
-429,13
+428,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;
}
}