summaryrefslogtreecommitdiffstats
path: root/rfb
diff options
context:
space:
mode:
authorGernot Tenchio <gernot.tenchio@securepoint.de>2011-08-16 14:02:35 +0200
committerJohannes Schindelin <johannes.schindelin@gmx.de>2011-08-17 12:41:24 +0200
commit4aa35863676335917d2a25a7952031f0fba66dfb (patch)
treed9ad5879b6b12942e22c1249377a2538038a02e2 /rfb
parent7a77cc32b25477026886b6c3ddccacc1b4293e54 (diff)
downloadlibtdevnc-4aa35863676335917d2a25a7952031f0fba66dfb.tar.gz
libtdevnc-4aa35863676335917d2a25a7952031f0fba66dfb.zip
websockets: Add encryption support
[jes: moved out GnuTLS and OpenSSL support, added a dummy support, to separate changes better, and to keep things compiling] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Diffstat (limited to 'rfb')
-rw-r--r--rfb/rfb.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/rfb/rfb.h b/rfb/rfb.h
index 1a46e9a..b6fb7c0 100644
--- a/rfb/rfb.h
+++ b/rfb/rfb.h
@@ -368,6 +368,10 @@ typedef struct _rfbScreenInfo
rfbDisplayFinishedHookPtr displayFinishedHook;
/** xvpHook is called to handle an xvp client message */
rfbXvpHookPtr xvpHook;
+#ifdef LIBVNCSERVER_WITH_WEBSOCKETS
+ char *sslkeyfile;
+ char *sslcertfile;
+#endif
} rfbScreenInfo, *rfbScreenInfoPtr;
@@ -414,6 +418,8 @@ typedef struct _rfbStatList {
struct _rfbStatList *Next;
} rfbStatList;
+typedef struct _rfbSslCtx rfbSslCtx;
+
typedef struct _rfbClientRec {
/** back pointer to the screen */
@@ -637,8 +643,9 @@ typedef struct _rfbClientRec {
rfbBool webSocketsSSL;
rfbBool webSocketsBase64;
- char encodeBuf[UPDATE_BUF_SIZE*2 + 2]; /* UTF-8 could double it + framing */
+ rfbSslCtx *sslctx;
+ char encodeBuf[UPDATE_BUF_SIZE*2 + 2]; /* UTF-8 could double it + framing */
char decodeBuf[8192]; /* TODO: what makes sense? */
int dblen;
char carryBuf[3]; /* For base64 carry-over */