diff options
Diffstat (limited to 'libvncserver')
| -rw-r--r-- | libvncserver/Makefile.am | 3 | ||||
| -rw-r--r-- | libvncserver/rfbcrypto_included.c | 2 | ||||
| -rw-r--r-- | libvncserver/rfbserver.c | 4 | ||||
| -rw-r--r-- | libvncserver/rfbssl_gnutls.c | 2 | ||||
| -rw-r--r-- | libvncserver/tight.c | 6 |
5 files changed, 13 insertions, 4 deletions
diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am index cb38c64..de87ef3 100644 --- a/libvncserver/Makefile.am +++ b/libvncserver/Makefile.am @@ -37,7 +37,7 @@ include_HEADERS=../rfb/rfb.h ../rfb/rfbconfig.h ../rfb/rfbint.h \ noinst_HEADERS=../common/d3des.h ../rfb/default8x16.h zrleoutstream.h \ zrlepalettehelper.h zrletypes.h private.h scale.h rfbssl.h rfbcrypto.h \ - ../common/minilzo.h ../common/lzoconf.h ../common/lzodefs.h ../common/md5.h ../common/sha1.h \ + ../common/minilzo.h ../common/lzoconf.h ../common/lzodefs.h ../common/md5.h ../common/sha.h ../common/sha-private.h \ $(TIGHTVNCFILETRANSFERHDRS) EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \ @@ -61,6 +61,7 @@ libvncserver_la_SOURCES=$(LIB_SRCS) libvncserver_la_LIBADD=$(WEBSOCKETSSSLLIBS) lib_LTLIBRARIES=libvncserver.la +libvncserver_la_LDFLAGS = -version-info 1:0:0 if HAVE_RPM $(PACKAGE)-$(VERSION).tar.gz: dist diff --git a/libvncserver/rfbcrypto_included.c b/libvncserver/rfbcrypto_included.c index 58c2e93..7feff61 100644 --- a/libvncserver/rfbcrypto_included.c +++ b/libvncserver/rfbcrypto_included.c @@ -23,7 +23,7 @@ #include <string.h> #include "md5.h" -#include "sha1.h" +#include "sha.h" #include "rfbcrypto.h" void digestmd5(const struct iovec *iov, int iovcnt, void *dest) diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c index b2532e3..34e1c06 100644 --- a/libvncserver/rfbserver.c +++ b/libvncserver/rfbserver.c @@ -98,13 +98,15 @@ #endif #ifdef WIN32 +#include <direct.h> #ifdef __MINGW32__ #define mkdir(path, perms) mkdir(path) /* Omit the perms argument to match POSIX signature */ #else /* MSVC and other windows compilers */ #define mkdir(path, perms) _mkdir(path) /* Omit the perms argument to match POSIX signature */ #endif /* __MINGW32__ else... */ +#ifndef S_ISDIR #define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR) -#include <direct.h> +#endif #endif #ifdef LIBVNCSERVER_HAVE_LIBJPEG diff --git a/libvncserver/rfbssl_gnutls.c b/libvncserver/rfbssl_gnutls.c index cf60cdc..e58cdad 100644 --- a/libvncserver/rfbssl_gnutls.c +++ b/libvncserver/rfbssl_gnutls.c @@ -109,6 +109,8 @@ struct rfbssl_ctx *rfbssl_init_global(char *key, char *cert) gnutls_global_set_log_function(rfbssl_log_func); gnutls_global_set_log_level(1); gnutls_certificate_set_dh_params(ctx->x509_cred, ctx->dh_params); + /* newly allocated memory should be initialized, at least where it is important */ + ctx->peekstart = ctx->peeklen = 0; return ctx; } diff --git a/libvncserver/tight.c b/libvncserver/tight.c index 276a2e3..89a7f25 100644 --- a/libvncserver/tight.c +++ b/libvncserver/tight.c @@ -163,7 +163,11 @@ void rfbTightCleanup (rfbScreenInfoPtr screen) tightAfterBufSize = 0; tightAfterBuf = NULL; } - if (j) tjDestroy(j); + if (j) { + tjDestroy(j); + /* Set freed resource handle to 0! */ + j = 0; + } } |