From 7bdcb41c0f62967ec42d552f6002577dfb7019ca Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 02 Nov 2010 15:45:49 +0000
Subject: [PATCH] Sync from OpenDS (matthew_swift) Remove Platform class as it is no longer needed. Remove all getter methods which return passwords as Strings. Replace all setter methods which accept passwords as Strings with methods which accept passwords as char arrays, as per Java API security recommendations.
---
sdk/src/com/sun/opends/sdk/tools/ApplicationKeyManager.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/sdk/src/com/sun/opends/sdk/tools/ApplicationKeyManager.java b/sdk/src/com/sun/opends/sdk/tools/ApplicationKeyManager.java
index ca919e9..b58578e 100755
--- a/sdk/src/com/sun/opends/sdk/tools/ApplicationKeyManager.java
+++ b/sdk/src/com/sun/opends/sdk/tools/ApplicationKeyManager.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2009 Parametric Technology Corporation (PTC)
*/
@@ -41,8 +41,6 @@
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509KeyManager;
-import com.sun.opends.sdk.util.Platform;
-
/**
@@ -88,13 +86,17 @@
// Handle IBM specific cases if the user did not specify a algorithm
// and/or provider.
- if (userSpecifiedAlgo == null && Platform.isVendor("IBM"))
+ final String vendor = System.getProperty("java.vendor");
+ if (vendor.startsWith("IBM"))
{
- userSpecifiedAlgo = "IbmX509";
- }
- if (userSpecifiedProvider == null && Platform.isVendor("IBM"))
- {
- userSpecifiedProvider = "IBMJSSE2";
+ if (userSpecifiedAlgo == null)
+ {
+ userSpecifiedAlgo = "IbmX509";
+ }
+ if (userSpecifiedProvider == null)
+ {
+ userSpecifiedProvider = "IBMJSSE2";
+ }
}
// Have some fallbacks to choose the provider and algorith of the
--
Gitblit v1.10.0