github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 02:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Oops. Forgot to commit a change to the server Auth manager when working on the SSL crash issue on the client.

Browse Source
This commit is contained in:
Ken Moore
2016-06-22 20:12:16 -04:00
parent bcaf188dc1
commit 4da94971cc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/AuthorizationManager.cpp
View File

@@ -418,12 +418,12 @@ QString AuthorizationManager::decryptString(QString str, QByteArray key){
}
//Convert the input string into block elements as needed (and decode base64);
QList<QByteArray> blocks;
QJsonDocument doc = QJsonDocument::fromJson(str.toLocal8Bit());
if(doc.isNull()){
//QJsonDocument doc = QJsonDocument::fromJson(str.toLocal8Bit());
//if(doc.isNull()){
//No individual blocks - just one string
QByteArray bytes; bytes.append(str);
blocks << QByteArray::fromBase64(bytes);
}else if(doc.isArray()){
/*}else if(doc.isArray()){
for(int i=0; i<doc.array().count(); i++){
QByteArray bytes; bytes.append(doc.array()[i].toString());
blocks << QByteArray::fromBase64(bytes);
@@ -431,7 +431,7 @@ QString AuthorizationManager::decryptString(QString str, QByteArray key){
}else{
//Already valid JSON - return it
return str;
}
}*/
//qDebug() << "Decoded String:" << bytes;
return QString(blocks.join()); //TEMPORARY BYPASS