Skip to content

L
libvncserver
Commit d8812f8c authored by runge's avatar runge
Browse files
Options

Add check for "https" to viewers. update jars.

parent 8641c8e7
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 8 deletions
classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
View file @ d8812f8c
......@@ -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) {
......
classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
View file @ d8812f8c
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment