Viewer: Advertise Tight w/o Zlib pseudo-encoding

TurboVNC · Sep 25, 2024 · ce62c62 · ce62c62
1 parent 4f19cdb
commit ce62c62
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -60,6 +60,13 @@ CVE-2022-4283, CVE-2022-46340, CVE-2022-46341, CVE-2022-46342, CVE-2022-46343,
 CVE-2022-46344, CVE-2023-0494, and CVE-2023-1393) from the xorg-server 1.20.x
 and 21.1.x code bases.
 
+13. The "Tight Encoding Without Zlib" RFB extension, which was used
+unofficially by the Lossless Tight encoding method since TurboVNC v0.5, has
+been officially registered with IANA as an RFB pseudo-encoding.  The TurboVNC
+Viewer now advertises support for the pseudo-encoding.  (The next major release
+of the TurboVNC Server will forego using the extension unless the VNC viewer
+advertises support for it.)
+
 
 2.2.9 ESR
 =========

diff --git a/java/com/turbovnc/rfb/CMsgWriter.java b/java/com/turbovnc/rfb/CMsgWriter.java
@@ -1,8 +1,8 @@
 /* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
  * Copyright 2009-2011 Pierre Ossman for Cendio AB
  * Copyright (C) 2011, 2015 Brian P. Hinz
- * Copyright (C) 2012, 2015, 2017-2018, 2020 D. R. Commander.
- *                                           All Rights Reserved.
+ * Copyright (C) 2012, 2015, 2017-2018, 2020, 2024 D. R. Commander.
+ *                                                 All Rights Reserved.
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -78,6 +78,7 @@ public synchronized void writeSetEncodings(int preferredEncoding,
     }
     if (VncViewer.getBooleanProperty("turbovnc.gii", true))
       encodings[nEncodings++] = RFB.ENCODING_GII;
+    encodings[nEncodings++] = RFB.ENCODING_TIGHT_WITHOUT_ZLIB;
 
     if (Decoder.supported(preferredEncoding)) {
       encodings[nEncodings++] = preferredEncoding;

diff --git a/java/com/turbovnc/rfb/RFB.java b/java/com/turbovnc/rfb/RFB.java
@@ -1,7 +1,8 @@
 /* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
  * Copyright 2009, 2011 Pierre Ossman for Cendio AB
  * Copyright (C) 2011-2012 Brian P. Hinz
- * Copyright (C) 2011-2012, 2015-2018 D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2011-2012, 2015-2018, 2024 D. R. Commander.
+ *                                          All Rights Reserved.
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -268,6 +269,8 @@ public static String encodingName(int num) {
   public static final int ENCODING_SUBSAMP_8X             = -764;
   public static final int ENCODING_SUBSAMP_16X            = -763;
 
+  public static final int ENCODING_TIGHT_WITHOUT_ZLIB     = -317;
+
   //***************************************************************************
   // Hextile subencoding types
   //***************************************************************************