From: Brian P. Hinz <bphinz@users.sf.net>
Date: Sun, 17 Jan 2016 15:57:51 +0000 (-0500)
Subject: Add workaround for Vino's VeNCrypt implementation to Java viewer
X-Git-Tag: v1.6.90~57^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=43147c38f9a08e687b9a0d7c9ede44eb058907f9;p=tigervnc.git

Add workaround for Vino's VeNCrypt implementation to Java viewer

Implemented Pierre's workaround (1f8aba3) to java viewer.
---

diff --git a/java/com/tigervnc/rfb/Security.java b/java/com/tigervnc/rfb/Security.java
index d841c632..a68ae3e9 100644
--- a/java/com/tigervnc/rfb/Security.java
+++ b/java/com/tigervnc/rfb/Security.java
@@ -1,6 +1,6 @@
 /* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
  * Copyright (C) 2010 TigerVNC Team
- * Copyright (C) 2011 Brian P. Hinz
+ * Copyright (C) 2011-2015 Brian P. Hinz
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,7 +76,19 @@ public class Security {
   {
     List<Integer> result = new ArrayList<Integer>();
 
-    result.add(secTypeVeNCrypt);
+   /* Partial workaround for Vino's stupid behaviour. It doesn't allow
+    * the basic authentication types as part of the VeNCrypt handshake,
+    * making it impossible for a client to do opportunistic encryption.
+    * At least make it possible to connect when encryption is explicitly
+    * disabled. */
+    for (Iterator<Integer> i = enabledSecTypes.iterator(); i.hasNext(); ) {
+      int refType = (Integer)i.next();
+      if (refType >= 0x100) {
+        result.add(secTypeVeNCrypt);
+        break;
+      }
+    }
+
     for (Iterator<Integer> i = enabledSecTypes.iterator(); i.hasNext(); ) {
       int refType = (Integer)i.next();
       if (refType < 0x100)