http://projects.vdr-developer.org/issues/1267:

- some fixes on client side certificate validation
- added SSL server side support to the plugin

2 files changed, 9 insertions, 1 deletions

diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/CertificateProblemDialog.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/CertificateProblemDialog.java
index bf7034f..b0c58df 100644
--- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/CertificateProblemDialog.java
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/CertificateProblemDialog.java
@@ -32,7 +32,14 @@ public class CertificateProblemDialog implements CertificateProblemListener {
     final Semaphore semaphore = new Semaphore(0, true);
 
     // certificate properties
-    final String host = chain[0].getSubjectDN().getName().split(",")[0].replace("CN=", "").trim();
+    final String[] values = chain[0].getSubjectDN().getName().split(",");
+    String host = "???";
+    for(String value : values) {
+      if (value.contains("CN=")) {
+        host = value.replace("CN=", "").trim();
+        break;
+      }
+    }
     final String creationDate = chain[0].getNotBefore().toLocaleString();
     final String validUntil = chain[0].getNotAfter().toLocaleString();
 
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java b/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java
index daf2bea..9171bcb 100644
--- a/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java
@@ -301,6 +301,7 @@ public abstract class SvdrpClient<Result> {
 	protected void disconnect() throws IOException {
 		informListener(SvdrpEvent.DISCONNECTING);
 		if (socket != null && socket.isConnected()) {
+            writeLine("quit");
 			socket.close();
 			socket = null;
 		}