From 22af9ba811d7169e29bb65aa599d8b3e80e80dd7 Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Wed, 15 Jun 2022 00:01:28 +0200
Subject: [PATCH] Ignore deprecated OpenSSL functions

---
 domain-server/src/DomainGatekeeper.cpp     | 5 +++++
 domain-server/src/DomainServerNodeData.cpp | 4 ++++
 ice-server/src/IceServer.cpp               | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index 0664986e23..aae7b8df4e 100644
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@@ -25,6 +25,7 @@
 
 #include "DomainServer.h"
 #include "DomainServerNodeData.h"
+#include "WarningsSuppression.h"
 
 using SharedAssignmentPointer = QSharedPointer<Assignment>;
 
@@ -705,6 +706,8 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username,
 
         const unsigned char* publicKeyData = reinterpret_cast<const unsigned char*>(publicKeyArray.constData());
 
+        OVERTE_IGNORE_DEPRECATED_BEGIN
+
         // first load up the public key into an RSA struct
         RSA* rsaPublicKey = d2i_RSA_PUBKEY(NULL, &publicKeyData, publicKeyArray.size());
 
@@ -746,6 +749,8 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username,
                 RSA_free(rsaPublicKey);
             }
 
+            OVERTE_IGNORE_DEPRECATED_END
+
         } else {
 
             // we can't let this user in since we couldn't convert their public key to an RSA key we could use
diff --git a/domain-server/src/DomainServerNodeData.cpp b/domain-server/src/DomainServerNodeData.cpp
index d33b1d587e..d068e69985 100644
--- a/domain-server/src/DomainServerNodeData.cpp
+++ b/domain-server/src/DomainServerNodeData.cpp
@@ -18,6 +18,8 @@
 #include <QtCore/QVariant>
 
 #include <udt/PacketHeaders.h>
+#include "WarningsSuppression.h"
+
 
 DomainServerNodeData::StringPairHash DomainServerNodeData::_overrideHash;
 
@@ -26,9 +28,11 @@ DomainServerNodeData::DomainServerNodeData() {
 }
 
 void DomainServerNodeData::updateJSONStats(QByteArray statsByteArray) {
+    OVERTE_IGNORE_DEPRECATED_BEGIN
     auto document = QJsonDocument::fromBinaryData(statsByteArray);
     Q_ASSERT(document.isObject());
     _statsJSONObject = overrideValuesIfNeeded(document.object());
+    OVERTE_IGNORE_DEPRECATED_END
 }
 
 QJsonObject DomainServerNodeData::overrideValuesIfNeeded(const QJsonObject& newStats) {
diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index dd2a96d6a9..4a864b8398 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -28,6 +28,7 @@
 #include <MetaverseAPI.h>
 #include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
+#include "WarningsSuppression.h"
 
 const int CLEAR_INACTIVE_PEERS_INTERVAL_MSECS = 1 * 1000;
 const int PEER_SILENCE_THRESHOLD_MSECS = 5 * 1000;
@@ -179,6 +180,8 @@ bool IceServer::isVerifiedHeartbeat(const QUuid& domainID, const QByteArray& pla
             const auto rsaPublicKey = it->second.get();
 
             if (rsaPublicKey) {
+                OVERTE_IGNORE_DEPRECATED_BEGIN
+
                 auto hashedPlaintext = QCryptographicHash::hash(plaintext, QCryptographicHash::Sha256);
                 int verificationResult = RSA_verify(NID_sha256,
                                                     reinterpret_cast<const unsigned char*>(hashedPlaintext.constData()),
@@ -187,6 +190,7 @@ bool IceServer::isVerifiedHeartbeat(const QUuid& domainID, const QByteArray& pla
                                                     signature.size(),
                                                     rsaPublicKey);
 
+                OVERTE_IGNORE_DEPRECATED_END
                 if (verificationResult == 1) {
                     // this is the only success case - we return true here to indicate that the heartbeat is verified
                     return true;
@@ -262,6 +266,7 @@ void IceServer::publicKeyReplyFinished(QNetworkReply* reply) {
                 // convert the downloaded public key to an RSA struct, if possible
                 const unsigned char* publicKeyData = reinterpret_cast<const unsigned char*>(apiPublicKey.constData());
 
+                OVERTE_IGNORE_DEPRECATED_BEGIN
                 RSA* rsaPublicKey = d2i_RSA_PUBKEY(NULL, &publicKeyData, apiPublicKey.size());
 
                 if (rsaPublicKey) {
@@ -270,6 +275,7 @@ void IceServer::publicKeyReplyFinished(QNetworkReply* reply) {
                     qWarning() << "Could not convert in-memory public key for" << domainID << "to usable RSA public key.";
                     qWarning() << "Public key will be re-requested on next heartbeat.";
                 }
+                OVERTE_IGNORE_DEPRECATED_END
 
             } else {
                 qWarning() << "There was no public key present in response for domain with ID" << domainID;