From 23e627a46f740cb3f4e5ccb2384cde0876c6799f Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 2 Nov 2017 13:46:24 -0700
Subject: [PATCH] Send empty decrypted text if impossible to decrypt

---
 interface/src/commerce/Wallet.cpp | 92 ++++++++++++++++---------------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index c6d77982b8..85632ff8f1 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -718,6 +718,8 @@ bool Wallet::changePassphrase(const QString& newPassphrase) {
 }
 
 void Wallet::handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> packet, SharedNodePointer sendingNode) {
+    auto nodeList = DependencyManager::get<NodeList>();
+
     bool challengeOriginatedFromClient = packet->getType() == PacketType::ChallengeOwnershipRequest;
     unsigned char decryptedText[64];
     int certIDByteArraySize;
@@ -738,62 +740,64 @@ void Wallet::handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> pack
     }
 
     RSA* rsa = readKeys(keyFilePath().toStdString().c_str());
+    int decryptionStatus = -1;
 
     if (rsa) {
-        auto nodeList = DependencyManager::get<NodeList>();
-
         ERR_clear_error();
-        const int decryptionStatus = RSA_private_decrypt(encryptedTextByteArraySize,
+        decryptionStatus = RSA_private_decrypt(encryptedTextByteArraySize,
             reinterpret_cast<const unsigned char*>(encryptedText.constData()),
             decryptedText,
             rsa,
             RSA_PKCS1_OAEP_PADDING);
 
         RSA_free(rsa);
-
-        QByteArray decryptedTextByteArray = QByteArray(reinterpret_cast<const char*>(decryptedText), decryptionStatus);
-        int decryptedTextByteArraySize = decryptedTextByteArray.size();
-        int certIDSize = certID.size();
-        // setup the packet
-        if (challengeOriginatedFromClient) {
-            auto decryptedTextPacket = NLPacket::create(PacketType::ChallengeOwnershipReply,
-                certIDSize + decryptedTextByteArraySize + challengingNodeUUIDByteArraySize + 3 * sizeof(int),
-                true);
-
-            decryptedTextPacket->writePrimitive(certIDSize);
-            decryptedTextPacket->writePrimitive(decryptedTextByteArraySize);
-            decryptedTextPacket->writePrimitive(challengingNodeUUIDByteArraySize);
-            decryptedTextPacket->write(certID);
-            decryptedTextPacket->write(decryptedTextByteArray);
-            decryptedTextPacket->write(challengingNodeUUID);
-
-            qCDebug(commerce) << "Sending ChallengeOwnershipReply Packet containing decrypted text" << decryptedTextByteArray << "for CertID" << certID;
-
-            nodeList->sendPacket(std::move(decryptedTextPacket), *sendingNode);
-        } else {
-            auto decryptedTextPacket = NLPacket::create(PacketType::ChallengeOwnership, certIDSize + decryptedTextByteArraySize + 2 * sizeof(int), true);
-
-            decryptedTextPacket->writePrimitive(certIDSize);
-            decryptedTextPacket->writePrimitive(decryptedTextByteArraySize);
-            decryptedTextPacket->write(certID);
-            decryptedTextPacket->write(decryptedTextByteArray);
-
-            qCDebug(commerce) << "Sending ChallengeOwnership Packet containing decrypted text" << decryptedTextByteArray << "for CertID" << certID;
-
-            nodeList->sendPacket(std::move(decryptedTextPacket), *sendingNode);
-        }
-
-        if (decryptionStatus == -1) {
-            qCDebug(commerce) << "During entity ownership challenge, decrypting the encrypted text failed.";
-            long error = ERR_get_error();
-            if (error != 0) {
-                const char* error_str = ERR_error_string(error, NULL);
-                qCWarning(entities) << "RSA error:" << error_str;
-            }
-        }
     } else {
         qCDebug(commerce) << "During entity ownership challenge, creating the RSA object failed.";
     }
+
+    QByteArray decryptedTextByteArray;
+    if (decryptionStatus > -1) {
+        decryptedTextByteArray = QByteArray(reinterpret_cast<const char*>(decryptedText), decryptionStatus);
+    }
+    int decryptedTextByteArraySize = decryptedTextByteArray.size();
+    int certIDSize = certID.size();
+    // setup the packet
+    if (challengeOriginatedFromClient) {
+        auto decryptedTextPacket = NLPacket::create(PacketType::ChallengeOwnershipReply,
+            certIDSize + decryptedTextByteArraySize + challengingNodeUUIDByteArraySize + 3 * sizeof(int),
+            true);
+
+        decryptedTextPacket->writePrimitive(certIDSize);
+        decryptedTextPacket->writePrimitive(decryptedTextByteArraySize);
+        decryptedTextPacket->writePrimitive(challengingNodeUUIDByteArraySize);
+        decryptedTextPacket->write(certID);
+        decryptedTextPacket->write(decryptedTextByteArray);
+        decryptedTextPacket->write(challengingNodeUUID);
+
+        qCDebug(commerce) << "Sending ChallengeOwnershipReply Packet containing decrypted text" << decryptedTextByteArray << "for CertID" << certID;
+
+        nodeList->sendPacket(std::move(decryptedTextPacket), *sendingNode);
+    } else {
+        auto decryptedTextPacket = NLPacket::create(PacketType::ChallengeOwnership, certIDSize + decryptedTextByteArraySize + 2 * sizeof(int), true);
+
+        decryptedTextPacket->writePrimitive(certIDSize);
+        decryptedTextPacket->writePrimitive(decryptedTextByteArraySize);
+        decryptedTextPacket->write(certID);
+        decryptedTextPacket->write(decryptedTextByteArray);
+
+        qCDebug(commerce) << "Sending ChallengeOwnership Packet containing decrypted text" << decryptedTextByteArray << "for CertID" << certID;
+
+        nodeList->sendPacket(std::move(decryptedTextPacket), *sendingNode);
+    }
+
+    if (decryptionStatus == -1) {
+        qCDebug(commerce) << "During entity ownership challenge, decrypting the encrypted text failed.";
+        long error = ERR_get_error();
+        if (error != 0) {
+            const char* error_str = ERR_error_string(error, NULL);
+            qCWarning(entities) << "RSA error:" << error_str;
+        }
+    }
 }
 
 void Wallet::account() {