From 75f214c0252c8a8e03ec9b16082aa10299b2d36b Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 3 Jun 2013 08:28:22 +0200 Subject: [PATCH] Allow to add intermediate certificates to /etc/pve/local/pve-ssl.pem --- Makefile | 2 +- VncViewer.jar | Bin 90187 -> 90146 bytes debian/changelog.Debian | 7 +++++++ debian/control | 2 +- tigerpatches/trust-manager.patch | 25 +++++++++++-------------- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 0aefbdd..419ee66 100644 --- 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 -PACKAGERELEASE=3 +PACKAGERELEASE=4 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) CDATE:=$(shell date +%F) diff --git a/VncViewer.jar b/VncViewer.jar index 2c750c51eecdb10fc478e5dcdbeef28eac3a3e7d..854ffd6240c07340a8cc705feae9e932e043d794 100644 GIT binary patch delta 7767 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 delta 7799 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 A8UO$Q diff --git a/debian/changelog.Debian b/debian/changelog.Debian index 4c598d8..72a238a 100644 --- 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 Mon, 03 Jun 2013 08:26:59 +0200 + 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 f45682d..f3a325f 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ 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 diff --git a/tigerpatches/trust-manager.patch b/tigerpatches/trust-manager.patch index 5bbd9c6..e8158d5 100644 --- 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 '|'). -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.*; @@ -36,7 +36,7 @@ Index: new/java/src/com/tigervnc/vncviewer/X509Tunnel.java } protected void setParam (SSLSocket sock) -@@ -52,9 +62,51 @@ +@@ -52,9 +62,48 @@ 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("cert path too long"); -+ } + 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); } -@@ -100,4 +152,5 @@ +@@ -100,4 +149,5 @@ 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 @@ } @@ -111,10 +108,10 @@ Index: new/java/src/com/tigervnc/vncviewer/RfbProto.java 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; -- 2.39.2