diff --git a/src/server/AuthorizationManager.cpp b/src/server/AuthorizationManager.cpp index fe86d76..d22df3f 100644 --- a/src/server/AuthorizationManager.cpp +++ b/src/server/AuthorizationManager.cpp @@ -339,11 +339,11 @@ QString AuthorizationManager::LoginUC(QHostAddress host, QString encstring){ } QString AuthorizationManager::encryptString(QString str, QByteArray key){ - return str; //TEMPORARY BYPASS bool pub=true; if(key.contains("--BEGIN PUBLIC KEY--")){ pub=true; } else if(key.contains(" PRIVATE KEY--")){ pub=false; } else{ return str; } //unknown encryption - just return as-is + return str.toLocal8Bit().toBase64(); //TEMPORARY BYPASS qDebug() << "Encrypt String:" << str << pub;//<< key; //Reset/Load some SSL stuff //OpenSSL_add_all_algorithms(); @@ -391,7 +391,10 @@ QString AuthorizationManager::encryptString(QString str, QByteArray key){ } QString AuthorizationManager::decryptString(QString str, QByteArray key){ - return str; //TEMPORARY BYPASS + QByteArray bytes; bytes.append(str); + bytes = QByteArray::fromBase64(bytes); + qDebug() << "Decode String:" << bytes; + return QString(bytes); //TEMPORARY BYPASS bool pub=true; if(key.contains("--BEGIN PUBLIC KEY--")){ pub=true; } else if(key.contains(" PRIVATE KEY--")){ pub=false; } diff --git a/src/server/WebSocket.cpp b/src/server/WebSocket.cpp index 74ba4f1..285e79e 100644 --- a/src/server/WebSocket.cpp +++ b/src/server/WebSocket.cpp @@ -145,7 +145,7 @@ bool WebSocket::isActive(){ // PRIVATE //======================= void WebSocket::sendReply(QString msg){ - //qDebug() << "Sending Socket Reply:" << msg; + qDebug() << "Sending Socket Reply:" << msg; if(SOCKET!=0 && SOCKET->isValid()){ SOCKET->sendTextMessage(msg); } //Websocket connection else if(TSOCKET!=0 && TSOCKET->isValid()){ //TCP Socket connection