From cdee93ae252e8b9b12a892c70c77299b56f54aca Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Sat, 30 Jul 2022 00:06:48 +0000 Subject: [PATCH] GUACAMOLE-1652: Only call SSL init functions when the library version requires it. --- src/common-ssh/ssh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common-ssh/ssh.c b/src/common-ssh/ssh.c index a847e7c3..ba88c40b 100644 --- a/src/common-ssh/ssh.c +++ b/src/common-ssh/ssh.c @@ -165,9 +165,11 @@ int guac_common_ssh_init(guac_client* client) { 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);