Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 20:47:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor cleanup

Browse source
This commit is contained in:
Zach Fox 2017-10-12 11:40:47 -07:00
parent 0e96fc5cab
commit abe1cd1b51
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
assignment-client/src/entities/EntityServer.cpp
View file

@ -442,8 +442,7 @@ void EntityServer::domainSettingsRequestFailed() {
void EntityServer::startDynamicDomainVerification() { void EntityServer::startDynamicDomainVerification() {
qCDebug(entities) << "Starting Dynamic Domain Verification..."; qCDebug(entities) << "Starting Dynamic Domain Verification...";
auto nodeList = DependencyManager::get<NodeList>(); QString thisPlaceName = DependencyManager::get<AddressManager>()->currentAddress().authority();
QString thisDomainID = nodeList->getDomainHandler().getUUID().toString();
EntityTreePointer tree = std::static_pointer_cast<EntityTree>(_tree); EntityTreePointer tree = std::static_pointer_cast<EntityTree>(_tree);
QHash<QString, EntityItemID> localMap(tree->getEntityCertificateIDMap()); QHash<QString, EntityItemID> localMap(tree->getEntityCertificateIDMap());
@ -485,9 +484,9 @@ void EntityServer::startDynamicDomainVerification() {
if (networkReply->error() == QNetworkReply::NoError) { if (networkReply->error() == QNetworkReply::NoError) {
// ZRF FIXME!!! // ZRF FIXME!!!
//if (jsonObject["location"].toString() != thisDomainID) { //if (jsonObject["place_name"].toString() != thisPlaceName) {
if (false) { if (false) {
qCDebug(entities) << "invalid_reason not empty, deleting entity" << i.value(); qCDebug(entities) << "Entity's cert's place name isn't the current place name; deleting entity" << i.value();
tree->deleteEntity(i.value(), true); tree->deleteEntity(i.value(), true);
} }
} else { } else {

4
interface/src/commerce/Wallet.cpp
View file

@ -734,10 +734,6 @@ void Wallet::handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> pack
rsa, rsa,
RSA_PKCS1_OAEP_PADDING); RSA_PKCS1_OAEP_PADDING);
long error = ERR_get_error();
const char* error_str = ERR_error_string(error, NULL);
qDebug() << "ZRF HERE\n\nEncrypted Text:" << encryptedText << "\nEncrypted Text ByteArray Size:" << encryptedTextByteArraySize << "\nEncrypted Text Length:" << encryptedText.length() << "\nDecrypted Text:" << decryptedText << "\nError:" << error_str;
RSA_free(rsa); RSA_free(rsa);
if (decryptionStatus != -1) { if (decryptionStatus != -1) {

4
libraries/entities/src/EntityTree.cpp
View file

@ -1182,8 +1182,6 @@ QByteArray EntityTree::computeEncryptedNonce(const QString& certID, const QStrin
QWriteLocker locker(&_certNonceMapLock); QWriteLocker locker(&_certNonceMapLock);
_certNonceMap.insert(certID, nonce); _certNonceMap.insert(certID, nonce);
qDebug() << "ZRF HERE\n\nEncrypted Text:" << encryptedText << "\nEncrypted Text Length:" << encryptedText.length();
return encryptedText; return encryptedText;
} else { } else {
return ""; return "";
@ -1301,8 +1299,6 @@ void EntityTree::processChallengeOwnershipPacket(ReceivedMessage& message, const
QString certID(message.read(certIDByteArraySize)); QString certID(message.read(certIDByteArraySize));
QString decryptedText(message.read(decryptedTextByteArraySize)); QString decryptedText(message.read(decryptedTextByteArraySize));
qCDebug(entities) << "ZRF FIXME FJAOPISEJFPAOISEJFOA" << decryptedText << certID;
emit killChallengeOwnershipTimeoutTimer(certID); emit killChallengeOwnershipTimeoutTimer(certID);
if (!verifyDecryptedNonce(certID, decryptedText)) { if (!verifyDecryptedNonce(certID, decryptedText)) {