commit 9c93337d9781d4d85d84d9442297a2013c492837
author James Muehlner <james.muehlner@guac-dev.org> Sat Jul 30 02:24:31 2022 +0000
committer James Muehlner <james.muehlner@guac-dev.org> Sat Jul 30 02:24:31 2022 +0000
tree 024d65b516959472c41a715fd6c7d7f726eaf392
parent cdee93ae252e8b9b12a892c70c77299b56f54aca

GUACAMOLE-1652: Migrate OpenSSL initialization to modern methods for OpenSSL >= 1.1.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) {