From 162c2f031bd16d5e1a5c33b2397405d6c36463ae Mon Sep 17 00:00:00 2001
From: Leonardo Murillo <leo@highfidelity.io>
Date: Thu, 22 Jan 2015 15:33:37 -0600
Subject: [PATCH] Remove https unneeded crust

---
 ice-server/CMakeLists.txt    | 14 --------------
 ice-server/src/IceServer.cpp |  7 +------
 ice-server/src/IceServer.h   |  4 +---
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/ice-server/CMakeLists.txt b/ice-server/CMakeLists.txt
index a7b2a206e4..6a8ca5bd9f 100644
--- a/ice-server/CMakeLists.txt
+++ b/ice-server/CMakeLists.txt
@@ -6,18 +6,4 @@ setup_hifi_project(Network)
 # link the shared hifi libraries
 link_hifi_libraries(embedded-webserver networking shared)
 
-# find OpenSSL
-find_package(OpenSSL REQUIRED)
-
-if (APPLE AND ${OPENSSL_INCLUDE_DIR} STREQUAL "/usr/include")
-# this is a user on OS X using system OpenSSL, which is going to throw warnings since they're deprecating for their common crypto
-message(WARNING "The found version of OpenSSL is the OS X system version. This will produce deprecation warnings."
-"\nWe recommend you install a newer version (at least 1.0.1h) in a different directory and set OPENSSL_ROOT_DIR in your env so Cmake can find it.")
-endif ()
-
-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
-
-# append OpenSSL to our list of libraries to link
-target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})
-
 include_dependency_includes()
\ No newline at end of file
diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index 531dd4ea22..4648656e87 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -27,8 +27,7 @@ IceServer::IceServer(int argc, char* argv[]) :
     _id(QUuid::createUuid()),
     _serverSocket(),
     _activePeers(),
-    _httpManager(ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this),
-    _httpsManager(NULL)
+    _httpManager(ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this)
 {
     // start the ice-server socket
     qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT;
@@ -195,7 +194,3 @@ bool IceServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, b
     }
     return true;
 }
-
-bool IceServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl& url, bool skipSubHandler) {
-    return true;
-}
diff --git a/ice-server/src/IceServer.h b/ice-server/src/IceServer.h
index effc8b8154..5367786d01 100644
--- a/ice-server/src/IceServer.h
+++ b/ice-server/src/IceServer.h
@@ -21,12 +21,11 @@
 
 typedef QHash<QUuid, SharedNetworkPeer> NetworkPeerHash;
 
-class IceServer : public QCoreApplication, public HTTPSRequestHandler {
+class IceServer : public QCoreApplication, public HTTPRequestHandler {
     Q_OBJECT
 public:
     IceServer(int argc, char* argv[]);
     bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler = false);
-    bool handleHTTPSRequest(HTTPSConnection* connection, const QUrl& url, bool skipSubHandler = false);
 private slots:
     void processDatagrams();
     void clearInactivePeers();
@@ -39,7 +38,6 @@ private:
     NetworkPeerHash _activePeers;
     QHash<QUuid, QSet<QUuid> > _currentConnections;
     HTTPManager _httpManager;
-    HTTPSManager* _httpsManager;
 };
 
 #endif // hifi_IceServer_h
\ No newline at end of file