summaryrefslogtreecommitdiffstats
path: root/rfb
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2012-04-15 16:50:40 +0200
committerChristian Beier <dontmind@freeshell.org>2012-04-15 16:50:40 +0200
commit77286f0831bbff0a3828f1987aa279ae9178619c (patch)
treee518ca8c4fccdf29eea33829700a3df58bcd3d48 /rfb
parent7bf369a04ba0c5c47097bd62cbcb183fa2c0282e (diff)
downloadlibvncserver-77286f0831bbff0a3828f1987aa279ae9178619c.zip
libvncserver-77286f0831bbff0a3828f1987aa279ae9178619c.tar.gz
LibVNCClient: Remove all those WITH_CLIENT_TLS #ifdefs and move GnuTLS specific functionality into tls_gnutls.c.
Diffstat (limited to 'rfb')
-rw-r--r--rfb/rfbclient.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h
index 36c109e..0ecc5e4 100644
--- a/rfb/rfbclient.h
+++ b/rfb/rfbclient.h
@@ -38,9 +38,6 @@
#include <unistd.h>
#include <rfb/rfbproto.h>
#include <rfb/keysym.h>
-#ifdef LIBVNCSERVER_WITH_CLIENT_TLS
-#include <gnutls/gnutls.h>
-#endif
#define rfbClientSwap16IfLE(s) \
(*(char *)&client->endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
@@ -314,10 +311,8 @@ typedef struct _rfbClient {
/** The selected security types */
uint32_t authScheme, subAuthScheme;
-#ifdef LIBVNCSERVER_WITH_CLIENT_TLS
/** The TLS session for Anonymous TLS and VeNCrypt */
- gnutls_session_t tlsSession;
-#endif
+ void* tlsSession;
/** To support security types that requires user input (except VNC password
* authentication), for example VeNCrypt and MSLogon, this callback function
OpenPOWER on IntegriCloud