From d8b84e687533150f6d1f6e5af93e57ebbfca725c Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 11 Oct 2017 13:26:32 -0700 Subject: [PATCH] Minor cleanup --- assignment-client/src/entities/EntityServer.cpp | 4 +--- libraries/entities/src/EntityTree.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp index 4a4315dd34..1dc1eef593 100644 --- a/assignment-client/src/entities/EntityServer.cpp +++ b/assignment-client/src/entities/EntityServer.cpp @@ -483,9 +483,7 @@ void EntityServer::startDynamicDomainVerification() { QJsonDocument doc(jsonObject); qCDebug(entities) << "ZRF FIXME" << doc.toJson(QJsonDocument::Compact); - // ZRF FIXME!!! - //if (networkReply->error() == QNetworkReply::NoError) { - if (true) { + if (networkReply->error() == QNetworkReply::NoError) { // ZRF FIXME!!! //if (jsonObject["location"].toString() != thisDomainID) { if (false) { diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 2a8e3e575a..b4eef7ebcc 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -1249,7 +1249,7 @@ void EntityTree::validatePop(const QString& certID, const EntityItemID& entityIt } else { // Second, challenge ownership of the PoP cert // 1. Encrypt a nonce with the owner's public key - QString ownerKey(jsonObject["owner_public_key"].toString()); + QString ownerKey(jsonObject["transfer_recipient_key"].toString()); QString encryptedText = computeEncryptedNonce(certID, ownerKey); if (encryptedText == "") {