summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2011-04-27 11:04:01 +0000
committerAdam Tkac <atkac@redhat.com>2011-04-27 11:04:01 +0000
commit445d4ed0cc02266024bb6b7e450c97773069da38 (patch)
tree61c07ac892272f10104161312a921c90f946f1a2
parent03327ae1451e34c5edd58d956ed64e83cacd1d4f (diff)
downloadtigervnc-445d4ed0cc02266024bb6b7e450c97773069da38.tar.gz
tigervnc-445d4ed0cc02266024bb6b7e450c97773069da38.zip
Merged r4340 from 1_1 branch (dcommander):
Clarify that VeNCrypt is part of TigerVNC, regardless of whether TLS support is enabled git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4381 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--BUILDING.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/BUILDING.txt b/BUILDING.txt
index ef0c7ba0..634ed55c 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -117,7 +117,8 @@ build configuration or module dependencies.
Building VeNCrypt support
=========================
-Building VeNCrypt (the TigerVNC security and authentication extensions)
+VeNCrypt (the TigerVNC security and authentication extensions) can be built
+with TLS support, which provides built-in encryption for VNC sessions. This
requires GnuTLS, which is not pre-installed on all platforms. In general, if
you are building on a Unix-ish platform that has the GnuTLS libraries and
include files installed in the standard system locations, then the TigerVNC
@@ -350,7 +351,8 @@ to the cmake command line.
Building VeNCrypt support
=========================
-Building VeNCrypt (the TigerVNC security and authentication extensions)
+VeNCrypt (the TigerVNC security and authentication extensions) can be built
+with TLS support, which provides built-in encryption for VNC sessions. This
requires GnuTLS, which is not Microsoft-friendly. There is generally no
sane way to build GnuTLS and its dependencies using Visual C++. Those with
a lot of time on their hands can build the GnuTLS DLLs using MinGW (or download