From bb2d31a2bd376fe9ed3f07494e9235d50c384466 Mon Sep 17 00:00:00 2001
From: Aleksandr Borisenko <alexcustos@gmail.com>
Date: Thu, 8 Nov 2018 11:24:39 +0300
Subject: [PATCH] Removed explicit initialization; Fixed RAND_bytes not found

---
 src/gui/main.cpp                     | 8 +-------
 src/libsync/clientsideencryption.cpp | 1 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index a4c6e8bff..9125c19c4 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -21,9 +21,6 @@
 #include <sys/resource.h>
 #endif
 
-#include <openssl/conf.h>
-#include <openssl/err.h>
-
 #include "application.h"
 #include "theme.h"
 #include "common/utility.h"
@@ -51,10 +48,7 @@ int main(int argc, char **argv)
 {
     Q_INIT_RESOURCE(client);
 
-    /* Initialise the library */
-    ERR_load_crypto_strings();
-    OpenSSL_add_all_algorithms();
-    OPENSSL_config(NULL);
+    // OpenSSL 1.1.0: No explicit initialisation or de-initialisation is necessary.
 
 #ifdef Q_OS_WIN
 // If the font size ratio is set on Windows, we need to
diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
index ae58f6253..a2dabea84 100644
--- a/src/libsync/clientsideencryption.cpp
+++ b/src/libsync/clientsideencryption.cpp
@@ -3,6 +3,7 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include <openssl/engine.h>
+#include <openssl/rand.h>
 
 
 #include "clientsideencryption.h"