maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUAC-780: Ensure libgcrypt is initialized for pthreads if used by libssh2. OpenSSL should be OK.

Browse Source
This commit is contained in:
Michael Jumper 2014-07-21 10:27:39 -07:00
parent fd800e6dd7
commit 98c6e6496d
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.ac
View File

@ -612,6 +612,27 @@ AM_CONDITIONAL([ENABLE_SSH], [test "x${have_libssh2}" = "xyes" \
AC_SUBST(SSH_LIBS) AC_SUBST(SSH_LIBS)
#
# Underlying crypto library usage of libssh2
#
if test "x${have_libssh2}" = "xyes"
then
# Whether libssh2 was built against libgcrypt
AC_CHECK_LIB([ssh2], [gcry_control],
[AC_CHECK_HEADER(gcrypt.h,
[AC_DEFINE([LIBSSH2_USES_GCRYPT],,
[Whether libssh2 was built against libgcrypt])],
[AC_MSG_WARN([
--------------------------------------------
libssh2 appears to be built against libgcrypt, but the libgcrypt headers
could not be found. SSH will be disabled.
--------------------------------------------])
have_libssh2=no])])
fi
# #
# Agent forwarding support within libssh2 # Agent forwarding support within libssh2
# #

16
src/protocols/ssh/ssh_client.c
View File

@ -38,6 +38,10 @@
#include <guacamole/socket.h> #include <guacamole/socket.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#ifdef LIBSSH2_USES_GCRYPT
#include <gcrypt.h>
#endif
#include <errno.h> #include <errno.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -260,6 +264,10 @@ static LIBSSH2_SESSION* __guac_ssh_create_session(guac_client* client,
} }
#ifdef LIBSSH2_USES_GCRYPT
GCRY_THREAD_OPTION_PTHREAD_IMPL;
#endif
void* ssh_client_thread(void* data) { void* ssh_client_thread(void* data) {
guac_client* client = (guac_client*) data; guac_client* client = (guac_client*) data;
@ -275,6 +283,14 @@ void* ssh_client_thread(void* data) {
pthread_t input_thread; pthread_t input_thread;
#ifdef LIBSSH2_USES_GCRYPT
gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
if (!gcry_check_version(GCRYPT_VERSION)) {
guac_client_log_error(client, "libgcrypt version mismatch.");
return NULL;
}
#endif
SSL_library_init(); SSL_library_init();
libssh2_init(0); libssh2_init(0);