summaryrefslogtreecommitdiffstats
path: root/libvncclient/rfbproto.c
diff options
context:
space:
mode:
Diffstat (limited to 'libvncclient/rfbproto.c')
-rw-r--r--libvncclient/rfbproto.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
index a7faab1..3dfd0c5 100644
--- a/libvncclient/rfbproto.c
+++ b/libvncclient/rfbproto.c
@@ -1040,9 +1040,7 @@ InitialiseRFBConnection(rfbClient* client)
rfbProtocolVersionMsg pv;
int major,minor;
uint32_t authScheme;
-#ifdef LIBVNCSERVER_WITH_CLIENT_TLS
uint32_t subAuthScheme;
-#endif
rfbClientInitMsg ci;
/* if the connection is immediately closed, don't report anything, so
@@ -1146,10 +1144,6 @@ InitialiseRFBConnection(rfbClient* client)
break;
case rfbTLS:
-#ifndef LIBVNCSERVER_WITH_CLIENT_TLS
- rfbClientLog("TLS support was not compiled in\n");
- return FALSE;
-#else
if (!HandleAnonTLSAuth(client)) return FALSE;
/* After the TLS session is established, sub auth types are expected.
* Note that all following reading/writing are through the TLS session from here.
@@ -1179,15 +1173,10 @@ InitialiseRFBConnection(rfbClient* client)
(int)subAuthScheme);
return FALSE;
}
-#endif
break;
case rfbVeNCrypt:
-#ifndef LIBVNCSERVER_WITH_CLIENT_TLS
- rfbClientLog("TLS support was not compiled in\n");
- return FALSE;
-#else
if (!HandleVeNCryptAuth(client)) return FALSE;
switch (client->subAuthScheme) {
@@ -1213,7 +1202,7 @@ InitialiseRFBConnection(rfbClient* client)
client->subAuthScheme);
return FALSE;
}
-#endif
+
break;
default: