summaryrefslogtreecommitdiffstats
path: root/classes/ssl
diff options
context:
space:
mode:
authorrunge <runge@karlrunge.com>2009-06-19 11:08:40 -0400
committerrunge <runge@karlrunge.com>2009-06-19 11:08:40 -0400
commitb6ee5f96190a234def49c39b86598b557475c960 (patch)
tree4952a80cf2e7c7d171f5afc1d921898b876b113d /classes/ssl
parentac33a29f07ecd99d9e9b73f7341ae7651994ecb2 (diff)
downloadlibtdevnc-b6ee5f96190a234def49c39b86598b557475c960.tar.gz
libtdevnc-b6ee5f96190a234def49c39b86598b557475c960.zip
Add proxyHost and proxyPort java applet params.
Diffstat (limited to 'classes/ssl')
-rw-r--r--classes/ssl/README17
-rw-r--r--classes/ssl/SignedUltraViewerSSL.jarbin107370 -> 107702 bytes
-rw-r--r--classes/ssl/SignedVncViewer.jarbin83396 -> 83705 bytes
-rw-r--r--classes/ssl/UltraViewerSSL.jarbin104365 -> 104692 bytes
-rw-r--r--classes/ssl/VncViewer.jarbin80481 -> 80797 bytes
-rw-r--r--classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch57
-rw-r--r--classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch73
7 files changed, 120 insertions, 27 deletions
diff --git a/classes/ssl/README b/classes/ssl/README
index 39ab71b..a9dcc7a 100644
--- a/classes/ssl/README
+++ b/classes/ssl/README
@@ -184,9 +184,24 @@ Both TightVNC and UltraVNC Java viewers:
safely put oneTimeKey=... on the URL. The Vncviewer
authenticates the VNC server with this key.
+ proxyHost
+ string, default: none
+ Do not try to guess the proxy's hostname, use the value in
+ proxyHost. Does not imply forceProxy (below.)
+
+ proxyPort
+ string, default: none
+ Do not try to guess the proxy's port number, use the value in
+ proxyPort. Does not imply forceProxy (below.)
+
forceProxy
yes/no, default: no
- Assume there is a proxy.
+ Assume there is a proxy and force its use.
+
+ If a string other than "yes" or "no" is given, it implies "yes"
+ and uses the string for proxyHost and proxyPort (see above).
+ In this case the string must be of the form "hostname+port".
+ Note that it is "+" and not ":" before the port number.
ignoreProxy
yes/no, default: no
diff --git a/classes/ssl/SignedUltraViewerSSL.jar b/classes/ssl/SignedUltraViewerSSL.jar
index 2ca5b78..1053cf2 100644
--- a/classes/ssl/SignedUltraViewerSSL.jar
+++ b/classes/ssl/SignedUltraViewerSSL.jar
Binary files differ
diff --git a/classes/ssl/SignedVncViewer.jar b/classes/ssl/SignedVncViewer.jar
index 1498b4b..017c017 100644
--- a/classes/ssl/SignedVncViewer.jar
+++ b/classes/ssl/SignedVncViewer.jar
Binary files differ
diff --git a/classes/ssl/UltraViewerSSL.jar b/classes/ssl/UltraViewerSSL.jar
index b012433..92799ad 100644
--- a/classes/ssl/UltraViewerSSL.jar
+++ b/classes/ssl/UltraViewerSSL.jar
Binary files differ
diff --git a/classes/ssl/VncViewer.jar b/classes/ssl/VncViewer.jar
index b647da6..5e71750 100644
--- a/classes/ssl/VncViewer.jar
+++ b/classes/ssl/VncViewer.jar
Binary files differ
diff --git a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch b/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
index 1844eec..22eeede 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 2009-06-18 09:47:22.000000000 -0400
-@@ -0,0 +1,1717 @@
++++ vnc_javasrc/SSLSocketToMe.java 2009-06-19 10:23:50.000000000 -0400
+@@ -0,0 +1,1726 @@
+/*
+ * SSLSocketToMe.java: add SSL encryption to Java VNC Viewer.
+ *
@@ -924,7 +924,16 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/SSLSocketToMe.java vnc_javasrc/SSL
+ } catch (Exception e) {
+ dbg("props failed: " + e.getMessage());
+ }
-+ if (props != null) {
++ if (viewer.proxyHost != null) {
++ dbg("Using supplied proxy " + viewer.proxyHost + " " + viewer.proxyPort + " applet parameters.");
++ proxyHost = viewer.proxyHost;
++ if (viewer.proxyPort != null) {
++ proxyPort = gint(viewer.proxyPort);
++ } else {
++ proxyPort = 8080;
++ }
++
++ } else if (props != null) {
+ dbg("\n---------------\nAll props:");
+ props.list(System.out);
+ dbg("\n---------------\n\n");
@@ -1794,7 +1803,7 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/SSLSocketToMe.java vnc_javasrc/SSL
+}
diff -x VncCanvas.java -Naur vnc_javasrc.orig/VncViewer.java vnc_javasrc/VncViewer.java
--- vnc_javasrc.orig/VncViewer.java 2004-03-04 08:34:25.000000000 -0500
-+++ vnc_javasrc/VncViewer.java 2007-09-03 23:22:13.000000000 -0400
++++ vnc_javasrc/VncViewer.java 2009-06-19 10:32:03.000000000 -0400
@@ -80,7 +80,7 @@
// Variables read from parameter values.
String socketFactory;
@@ -1804,7 +1813,7 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/VncViewer.java vnc_javasrc/VncView
boolean showControls;
boolean offerRelogin;
boolean showOfflineDesktop;
-@@ -88,6 +88,17 @@
+@@ -88,6 +88,19 @@
int deferCursorUpdates;
int deferUpdateRequests;
@@ -1814,6 +1823,8 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/VncViewer.java vnc_javasrc/VncView
+ String urlPrefix;
+ String httpsPort;
+ String oneTimeKey;
++ String proxyHost;
++ String proxyPort;
+ boolean forceProxy;
+ boolean ignoreProxy;
+ boolean trustAllVncCerts;
@@ -1822,7 +1833,7 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/VncViewer.java vnc_javasrc/VncView
// Reference to this applet for inter-applet communication.
public static java.applet.Applet refApplet;
-@@ -591,8 +602,25 @@
+@@ -591,8 +604,25 @@
}
}
@@ -1850,7 +1861,7 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/VncViewer.java vnc_javasrc/VncView
if (inAnApplet) {
str = readParameter("Open New Window", false);
-@@ -626,6 +654,68 @@
+@@ -626,6 +656,96 @@
// SocketFactory.
socketFactory = readParameter("SocketFactory", false);
@@ -1897,15 +1908,43 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/VncViewer.java vnc_javasrc/VncView
+ }
+
+ forceProxy = false;
++ proxyHost = null;
++ proxyPort = null;
+ str = readParameter("forceProxy", false);
-+ if (str != null && str.equalsIgnoreCase("Yes")) {
-+ forceProxy = true;
++ if (str != null) {
++ if (str.equalsIgnoreCase("Yes")) {
++ forceProxy = true;
++ } else if (str.equalsIgnoreCase("No")) {
++ forceProxy = false;
++ } else {
++ forceProxy = true;
++ String[] pieces = str.split(" ");
++ proxyHost = new String(pieces[0]);
++ if (pieces.length >= 2) {
++ proxyPort = new String(pieces[1]);
++ } else {
++ proxyPort = new String("8080");
++ }
++ }
+ }
++ str = readParameter("proxyHost", false);
++ if (str != null) {
++ proxyHost = new String(str);
++ }
++ str = readParameter("proxyPort", false);
++ if (str != null) {
++ proxyPort = new String(str);
++ }
++ if (proxyHost != null && proxyPort == null) {
++ proxyPort = new String("8080");
++ }
++
+ ignoreProxy = false;
+ str = readParameter("ignoreProxy", false);
+ if (str != null && str.equalsIgnoreCase("Yes")) {
+ ignoreProxy = true;
+ }
++
+ trustAllVncCerts = false;
+ str = readParameter("trustAllVncCerts", false);
+ if (str != null && str.equalsIgnoreCase("Yes")) {
diff --git a/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch b/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
index 4db84d3..0104708 100644
--- a/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
+++ b/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
@@ -2644,8 +2644,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 2009-06-18 09:47:22.000000000 -0400
-@@ -0,0 +1,1717 @@
++++ JavaViewer/SSLSocketToMe.java 2009-06-19 10:23:50.000000000 -0400
+@@ -0,0 +1,1726 @@
+/*
+ * SSLSocketToMe.java: add SSL encryption to Java VNC Viewer.
+ *
@@ -3495,7 +3495,16 @@ diff -Naur JavaViewer.orig/SSLSocketToMe.java JavaViewer/SSLSocketToMe.java
+ } catch (Exception e) {
+ dbg("props failed: " + e.getMessage());
+ }
-+ if (props != null) {
++ if (viewer.proxyHost != null) {
++ dbg("Using supplied proxy " + viewer.proxyHost + " " + viewer.proxyPort + " applet parameters.");
++ proxyHost = viewer.proxyHost;
++ if (viewer.proxyPort != null) {
++ proxyPort = gint(viewer.proxyPort);
++ } else {
++ proxyPort = 8080;
++ }
++
++ } else if (props != null) {
+ dbg("\n---------------\nAll props:");
+ props.list(System.out);
+ dbg("\n---------------\n\n");
@@ -4488,7 +4497,7 @@ diff -Naur JavaViewer.orig/VncCanvas.java JavaViewer/VncCanvas.java
result = 0; // Transparent pixel
diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
--- JavaViewer.orig/VncViewer.java 2006-05-24 15:14:40.000000000 -0400
-+++ JavaViewer/VncViewer.java 2009-01-11 12:28:55.000000000 -0500
++++ JavaViewer/VncViewer.java 2009-06-19 10:31:23.000000000 -0400
@@ -80,11 +80,11 @@
GridBagLayout gridbag;
ButtonPanel buttonPanel;
@@ -4512,7 +4521,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
String passwordParam;
String encPasswordParam;
boolean showControls;
-@@ -115,28 +115,68 @@
+@@ -115,28 +115,70 @@
int i;
// mslogon support 2 end
@@ -4524,6 +4533,8 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
+String httpsPort;
+String oneTimeKey;
+String ftpDropDown;
++String proxyHost;
++String proxyPort;
+boolean forceProxy;
+boolean ignoreProxy;
+boolean trustAllVncCerts;
@@ -4587,7 +4598,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
// authenticator = new AuthPanel(false); // mslogon support : go to connectAndAuthenticate()
if (RecordingFrame.checkSecurity())
rec = new RecordingFrame(this);
-@@ -147,10 +187,11 @@
+@@ -147,10 +189,11 @@
cursorUpdatesDef = null;
eightBitColorsDef = null;
@@ -4601,7 +4612,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
rfbThread = new Thread(this);
rfbThread.start();
}
-@@ -186,6 +227,30 @@
+@@ -186,6 +229,30 @@
gbc.weightx = 1.0;
gbc.weighty = 1.0;
@@ -4632,7 +4643,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
// Add ScrollPanel to applet mode
// Create a panel which itself is resizeable and can hold
-@@ -286,6 +351,24 @@
+@@ -286,6 +353,24 @@
void connectAndAuthenticate() throws Exception {
@@ -4657,7 +4668,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
// If "ENCPASSWORD" parameter is set, decrypt the password into
// the passwordParam string.
-@@ -336,7 +419,22 @@
+@@ -336,7 +421,22 @@
//
@@ -4681,7 +4692,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
authenticator = new AuthPanel(mslogon);
-@@ -390,6 +488,10 @@
+@@ -390,6 +490,10 @@
break;
//mslogon support end
@@ -4692,7 +4703,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
// Retry on authentication failure.
authenticator.retry();
}
-@@ -405,9 +507,11 @@
+@@ -405,9 +509,11 @@
void prologueDetectAuthProtocol() throws Exception {
@@ -4706,7 +4717,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
System.out.println("RFB server supports protocol version " +
rfb.serverMajor + "." + rfb.serverMinor);
-@@ -431,16 +535,36 @@
+@@ -431,16 +537,36 @@
boolean tryAuthenticate(String us, String pw) throws Exception {
@@ -4749,7 +4760,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
switch (authScheme) {
-@@ -629,6 +753,10 @@
+@@ -629,6 +755,10 @@
void doProtocolInitialisation() throws IOException {
@@ -4760,7 +4771,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
rfb.writeClientInit();
rfb.readServerInit();
-@@ -775,8 +903,25 @@
+@@ -775,8 +905,25 @@
}
}
@@ -4788,7 +4799,7 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
if (inAnApplet) {
str = readParameter("Open New Window", false);
-@@ -804,6 +949,105 @@
+@@ -804,6 +951,133 @@
deferScreenUpdates = readIntParameter("Defer screen updates", 20);
deferCursorUpdates = readIntParameter("Defer cursor updates", 10);
deferUpdateRequests = readIntParameter("Defer update requests", 50);
@@ -4846,15 +4857,43 @@ diff -Naur JavaViewer.orig/VncViewer.java JavaViewer/VncViewer.java
+ }
+
+ forceProxy = false;
++ proxyHost = null;
++ proxyPort = null;
+ str = readParameter("forceProxy", false);
-+ if (str != null && str.equalsIgnoreCase("Yes")) {
-+ forceProxy = true;
++ if (str != null) {
++ if (str.equalsIgnoreCase("Yes")) {
++ forceProxy = true;
++ } else if (str.equalsIgnoreCase("No")) {
++ forceProxy = false;
++ } else {
++ forceProxy = true;
++ String[] pieces = str.split(" ");
++ proxyHost = new String(pieces[0]);
++ if (pieces.length >= 2) {
++ proxyPort = new String(pieces[1]);
++ } else {
++ proxyPort = new String("8080");
++ }
++ }
+ }
++ str = readParameter("proxyHost", false);
++ if (str != null) {
++ proxyHost = new String(str);
++ }
++ str = readParameter("proxyPort", false);
++ if (str != null) {
++ proxyPort = new String(str);
++ }
++ if (proxyHost != null && proxyPort == null) {
++ proxyPort = new String("8080");
++ }
++
+ ignoreProxy = false;
+ str = readParameter("ignoreProxy", false);
+ if (str != null && str.equalsIgnoreCase("Yes")) {
+ ignoreProxy = true;
+ }
++
+ trustAllVncCerts = false;
+ str = readParameter("trustAllVncCerts", false);
+ if (str != null && str.equalsIgnoreCase("Yes")) {