Allow to add intermediate certificates to /etc/pve/local/pve-ssl.pem

diff --git a/Makefile b/Makefile
index 0aefbdd95746cd70ab136b2e7f3db202940d7f52..419ee662bd979f1ca87870a882a4222437814eb8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ RELEASE=3.0
 PACKAGE=vncterm
 # Note: also change version in debian/control and debian/changelog
 VERSION=1.1
 PACKAGE=vncterm
 # Note: also change version in debian/control and debian/changelog
 VERSION=1.1

-PACKAGERELEASE=3
+PACKAGERELEASE=4

 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
 

diff --git a/VncViewer.jar b/VncViewer.jar
index 2c750c51eecdb10fc478e5dcdbeef28eac3a3e7d..854ffd6240c07340a8cc705feae9e932e043d794 100644 (file)
Binary files a/VncViewer.jar and b/VncViewer.jar differ

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index 4c598d8de7df6f0ca2eaf06a5ff25a1db5d1b188..72a238a0b85a5bf2b28bd54e96f43a978778c760 100644 (file)
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -1,3 +1,10 @@
+vncterm (1.1-4) unstable; urgency=low
+
+  * Allow to add intermediate certificates to /etc/pve/local/pve-ssl.pem 
+  (users previously used apache option SSLCertificateChainFile for that).
+  
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 03 Jun 2013 08:26:59 +0200
+

 vncterm (1.1-3) unstable; urgency=low
 
   *  re-enable javascript-events.patch (used for migrate/reload)
 vncterm (1.1-3) unstable; urgency=low
 
   *  re-enable javascript-events.patch (used for migrate/reload)

diff --git a/debian/control b/debian/control
index f45682d31433e60bae027f80fdc119a815b7b6f1..f3a325f7a7100fcbaa87868f4a8cbba3ec083685 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: vncterm
 Package: vncterm

-Version: 1.1-3
+Version: 1.1-4

 Section: x11
 Priority: optional
 Depends: libc6 (>= 2.7-18), libjpeg62, zlib1g (>= 1:1.2.1), libvncserver0
 Section: x11
 Priority: optional
 Depends: libc6 (>= 2.7-18), libjpeg62, zlib1g (>= 1:1.2.1), libvncserver0

diff --git a/tigerpatches/trust-manager.patch b/tigerpatches/trust-manager.patch
index 5bbd9c6e5d31f1332188aff847f1e20a6ebb0d35..e8158d56a418edbe77eaaf7bb567083ff23ea91c 100644 (file)
--- a/tigerpatches/trust-manager.patch
+++ b/tigerpatches/trust-manager.patch
@@ -7,10 +7,10 @@
  certificate (or CA who signed the server certificate) as applet 
  parameter "PVECert" (newline encoded as '|').
 
  certificate (or CA who signed the server certificate) as applet 
  parameter "PVECert" (newline encoded as '|').
 

-Index: new/java/src/com/tigervnc/vncviewer/X509Tunnel.java
+Index: tigervnc/java/src/com/tigervnc/vncviewer/X509Tunnel.java

 ===================================================================
 ===================================================================

---- new.orig/java/src/com/tigervnc/vncviewer/X509Tunnel.java   2013-04-20 15:24:59.000000000 +0200
-+++ new/java/src/com/tigervnc/vncviewer/X509Tunnel.java        2013-04-20 15:28:55.000000000 +0200
+--- tigervnc.orig/java/src/com/tigervnc/vncviewer/X509Tunnel.java      2013-06-03 08:17:17.000000000 +0200
++++ tigervnc/java/src/com/tigervnc/vncviewer/X509Tunnel.java   2013-06-03 08:22:52.000000000 +0200

 @@ -26,13 +26,23 @@
  import javax.net.ssl.*;
  import java.security.*;
 @@ -26,13 +26,23 @@
  import javax.net.ssl.*;
  import java.security.*;


@@ -36,7 +36,7 @@ Index: new/java/src/com/tigervnc/vncviewer/X509Tunnel.java
    }
  
    protected void setParam (SSLSocket sock)
    }
  
    protected void setParam (SSLSocket sock)

-@@ -52,9 +62,51 @@
+@@ -52,9 +62,48 @@

    protected void initContext (SSLContext sc) throws java.security.
      GeneralSecurityException
    {
    protected void initContext (SSLContext sc) throws java.security.
      GeneralSecurityException
    {


@@ -64,9 +64,6 @@ Index: new/java/src/com/tigervnc/vncviewer/X509Tunnel.java
 +          if (certs == null || certs.length < 1) {
 +            throw new CertificateException("no certs");
 +          }
 +          if (certs == null || certs.length < 1) {
 +            throw new CertificateException("no certs");
 +          }

-+          if (certs == null || certs.length > 1) {
-+            throw new CertificateException("cert path too long");
-+          }

 +          PublicKey cakey = pvecert.getPublicKey();
 +
 +          boolean ca_match;
 +          PublicKey cakey = pvecert.getPublicKey();
 +
 +          boolean ca_match;


@@ -91,16 +88,16 @@ Index: new/java/src/com/tigervnc/vncviewer/X509Tunnel.java
      sc.init (null, myTM, null);
    }
  
      sc.init (null, myTM, null);
    }
  

-@@ -100,4 +152,5 @@
+@@ -100,4 +149,5 @@

        return tm.getAcceptedIssuers ();
      }
    }
 +
  }
        return tm.getAcceptedIssuers ();
      }
    }
 +
  }

-Index: new/java/src/com/tigervnc/vncviewer/RfbProto.java
+Index: tigervnc/java/src/com/tigervnc/vncviewer/RfbProto.java

 ===================================================================
 ===================================================================

---- new.orig/java/src/com/tigervnc/vncviewer/RfbProto.java     2013-04-20 15:24:59.000000000 +0200
-+++ new/java/src/com/tigervnc/vncviewer/RfbProto.java  2013-04-20 15:28:55.000000000 +0200
+--- tigervnc.orig/java/src/com/tigervnc/vncviewer/RfbProto.java        2013-06-03 08:17:17.000000000 +0200
++++ tigervnc/java/src/com/tigervnc/vncviewer/RfbProto.java     2013-06-03 08:19:05.000000000 +0200

 @@ -411,7 +411,8 @@
      }
  
 @@ -411,7 +411,8 @@
      }
  


@@ -111,10 +108,10 @@ Index: new/java/src/com/tigervnc/vncviewer/RfbProto.java
        tunnel.setup (this);
      }
  
        tunnel.setup (this);
      }
  

-Index: new/java/src/com/tigervnc/vncviewer/VncViewer.java
+Index: tigervnc/java/src/com/tigervnc/vncviewer/VncViewer.java

 ===================================================================
 ===================================================================

---- new.orig/java/src/com/tigervnc/vncviewer/VncViewer.java    2013-04-20 15:28:42.000000000 +0200
-+++ new/java/src/com/tigervnc/vncviewer/VncViewer.java 2013-04-20 15:29:55.000000000 +0200
+--- tigervnc.orig/java/src/com/tigervnc/vncviewer/VncViewer.java       2013-06-03 08:19:03.000000000 +0200
++++ tigervnc/java/src/com/tigervnc/vncviewer/VncViewer.java    2013-06-03 08:19:05.000000000 +0200

 @@ -91,6 +91,8 @@
    int debugStatsExcludeUpdates;
    int debugStatsMeasureUpdates;
 @@ -91,6 +91,8 @@
    int debugStatsExcludeUpdates;
    int debugStatsMeasureUpdates;