From 42c10a61f63e96ab5944e8a88e630ecf966a0a00 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Feb 03 2011 17:30:20 +0000
Subject: Bug 151705 - Need to update Console Cipher Preferences with new ciphers


https://bugzilla.redhat.com/show_bug.cgi?id=151705

Description: replaced CipherPreferenceDialog with one which generates
TLS cipher list that does not include SSL3.0-only ciphers to avoid
listing duplicated ciphers on SSL 3.0 pane and TLS pane.

---

diff --git a/src/com/netscape/management/admserv/panel/TurnOnSSL.java b/src/com/netscape/management/admserv/panel/TurnOnSSL.java
index 531119f..45f358c 100644
--- a/src/com/netscape/management/admserv/panel/TurnOnSSL.java
+++ b/src/com/netscape/management/admserv/panel/TurnOnSSL.java
@@ -137,7 +137,7 @@ public class TurnOnSSL implements IPluginConfigPanel, EncryptionOptions, IClient
 	    if (cipherFamily.toLowerCase().equals("fortezza")) {
 		cipherPref = new CipherPreferenceDialog(null,
 							"",
-						        (String)(securitySettings.get("ssl3")),
+							(String)(securitySettings.get("ssl3")),
 							"") {
 		    public void cipherStateChanged(String SSLVersion, String cipher, boolean enabled) {
 			setDirty(true);
@@ -175,7 +175,7 @@ public class TurnOnSSL implements IPluginConfigPanel, EncryptionOptions, IClient
 	    Object tlsSetting  = securitySettings.get("tls");
 
 	    //construct a default cipher preference dialog, and get the default settings
-	    CipherPreferenceDialog cipherPref = new CipherPreferenceDialog(null, true, true, true, domestic, false);
+	    CipherPreferenceDialog cipherPref = new CipherPreferenceDialog(null, true, true, true, domestic, false, true);
 
 	    if ((ssl2Setting == null) || 
 		(ssl2Setting.toString().length() == 0) ||