commit 6ab82446bbca9fabdd332c0488642dcdf965ccb0
author Virtually Nick <necouchman@users.noreply.github.com> Sat Jul 30 07:36:37 2022 -0400
committer GitHub <noreply@github.com> Sat Jul 30 07:36:37 2022 -0400
tree 024d65b516959472c41a715fd6c7d7f726eaf392
parent eee3ac092c8d1c2b17404c7b52c8a2b794d1ec1a
parent 9c93337d9781d4d85d84d9442297a2013c492837

GUACAMOLE-1652: Merge only call SSL init functions when the library version requires it.

src/common-ssh/ssh.c

diff --git a/src/common-ssh/ssh.c b/src/common-ssh/ssh.c
index a847e7c..ba88c40 100644
--- a/src/common-ssh/ssh.c
+++ b/src/common-ssh/ssh.c
@@ -165,9 +165,11 @@
     CRYPTO_set_locking_callback(guac_common_ssh_openssl_locking_callback);
 #endif
 
-    /* Init OpenSSL */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+    /* Init OpenSSL - only required for OpenSSL Versions < 1.1.0 */
     SSL_library_init();
     ERR_load_crypto_strings();
+#endif
 
     /* Init libssh2 */
     libssh2_init(0);

src/guacd/daemon.c

diff --git a/src/guacd/daemon.c b/src/guacd/daemon.c
index 2861cff..8bf3035 100644
--- a/src/guacd/daemon.c
+++ b/src/guacd/daemon.c
@@ -381,10 +381,15 @@
         CRYPTO_set_locking_callback(guacd_openssl_locking_callback);
 #endif
 
-        /* Init SSL */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+        /* Init OpenSSL for OpenSSL Versions < 1.1.0 */
         SSL_library_init();
         SSL_load_error_strings();
         ssl_context = SSL_CTX_new(SSLv23_server_method());
+#else
+        /* Set up OpenSSL for OpenSSL Versions >= 1.1.0 */
+        ssl_context = SSL_CTX_new(TLS_server_method());
+#endif
 
         /* Load key */
         if (config->key_file != NULL) {