From d8812f8c85fcd83412c6ad275d10ce1c43f22240 Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Thu, 8 May 2008 00:56:59 +0000
Subject: Add check for "https" to viewers.  update jars.

---
 classes/ssl/SignedUltraViewerSSL.jar                | Bin 97676 -> 97711 bytes
 classes/ssl/SignedVncViewer.jar                     | Bin 79585 -> 79620 bytes
 classes/ssl/UltraViewerSSL.jar                      | Bin 94946 -> 94981 bytes
 classes/ssl/VncViewer.jar                           | Bin 76795 -> 76830 bytes
 .../tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch    |  11 +++++++----
 classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch   |  11 +++++++----
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/classes/ssl/SignedUltraViewerSSL.jar b/classes/ssl/SignedUltraViewerSSL.jar
index 00128ce..52f6c64 100644
Binary files a/classes/ssl/SignedUltraViewerSSL.jar and b/classes/ssl/SignedUltraViewerSSL.jar differ
diff --git a/classes/ssl/SignedVncViewer.jar b/classes/ssl/SignedVncViewer.jar
index 36ed2e4..42cf7e5 100644
Binary files a/classes/ssl/SignedVncViewer.jar and b/classes/ssl/SignedVncViewer.jar differ
diff --git a/classes/ssl/UltraViewerSSL.jar b/classes/ssl/UltraViewerSSL.jar
index 20b247f..e8090a3 100644
Binary files a/classes/ssl/UltraViewerSSL.jar and b/classes/ssl/UltraViewerSSL.jar differ
diff --git a/classes/ssl/VncViewer.jar b/classes/ssl/VncViewer.jar
index 4c47272..07ec994 100644
Binary files a/classes/ssl/VncViewer.jar and b/classes/ssl/VncViewer.jar differ
diff --git a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch b/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
index cb0b82e..88185b7 100644
--- a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
+++ b/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
@@ -73,8 +73,8 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/RfbProto.java vnc_javasrc/RfbProto
      serverMajor = (b[4] - '0') * 100 + (b[5] - '0') * 10 + (b[6] - '0');
 diff -x VncCanvas.java -Naur vnc_javasrc.orig/SSLSocketToMe.java vnc_javasrc/SSLSocketToMe.java
 --- vnc_javasrc.orig/SSLSocketToMe.java	1969-12-31 19:00:00.000000000 -0500
-+++ vnc_javasrc/SSLSocketToMe.java	2007-09-05 00:13:45.000000000 -0400
-@@ -0,0 +1,1453 @@
++++ vnc_javasrc/SSLSocketToMe.java	2008-04-15 12:54:51.000000000 -0400
+@@ -0,0 +1,1456 @@
 +/*
 + * SSLSocketToMe.java: add SSL encryption to Java VNC Viewer.
 + *
@@ -834,7 +834,7 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/SSLSocketToMe.java vnc_javasrc/SSL
 +				if (s2.indexOf("proxy") < 0 && v2.indexOf("proxy") < 0) {
 +					continue;
 +				}
-+				if (v2.indexOf("https") < 0) {
++				if (v2.indexOf("http") < 0) {
 +					continue;
 +				}
 +
@@ -860,7 +860,10 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/SSLSocketToMe.java vnc_javasrc/SSL
 +					String p = pieces[i];
 +					int j = p.indexOf("https");
 +					if (j < 0) {
-+						continue;
++						j = p.indexOf("http");
++						if (j < 0) {
++							continue;
++						}
 +					}
 +					j = p.indexOf("=", j);
 +					if (j < 0) {
diff --git a/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch b/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
index b06036f..06d1eb4 100644
--- a/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
+++ b/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
@@ -1815,8 +1815,8 @@ diff -Naur JavaViewer.orig/RfbProto.java JavaViewer/RfbProto.java
  
 diff -Naur JavaViewer.orig/SSLSocketToMe.java JavaViewer/SSLSocketToMe.java
 --- JavaViewer.orig/SSLSocketToMe.java	1969-12-31 19:00:00.000000000 -0500
-+++ JavaViewer/SSLSocketToMe.java	2007-09-05 00:13:45.000000000 -0400
-@@ -0,0 +1,1453 @@
++++ JavaViewer/SSLSocketToMe.java	2008-04-15 12:54:51.000000000 -0400
+@@ -0,0 +1,1456 @@
 +/*
 + * SSLSocketToMe.java: add SSL encryption to Java VNC Viewer.
 + *
@@ -2576,7 +2576,7 @@ diff -Naur JavaViewer.orig/SSLSocketToMe.java JavaViewer/SSLSocketToMe.java
 +				if (s2.indexOf("proxy") < 0 && v2.indexOf("proxy") < 0) {
 +					continue;
 +				}
-+				if (v2.indexOf("https") < 0) {
++				if (v2.indexOf("http") < 0) {
 +					continue;
 +				}
 +
@@ -2602,7 +2602,10 @@ diff -Naur JavaViewer.orig/SSLSocketToMe.java JavaViewer/SSLSocketToMe.java
 +					String p = pieces[i];
 +					int j = p.indexOf("https");
 +					if (j < 0) {
-+						continue;
++						j = p.indexOf("http");
++						if (j < 0) {
++							continue;
++						}
 +					}
 +					j = p.indexOf("=", j);
 +					if (j < 0) {
-- 
cgit v1.2.3