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/org/opends/sdk/TrustManagers.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/sdk/src/org/opends/sdk/TrustManagers.java b/sdk/src/org/opends/sdk/TrustManagers.java
index 1453851..963737b 100644
--- a/sdk/src/org/opends/sdk/TrustManagers.java
+++ b/sdk/src/org/opends/sdk/TrustManagers.java
@@ -442,14 +442,12 @@
* If {@code file} was {@code null}.
*/
public static X509TrustManager checkUsingTrustStore(final String file,
- final String password, final String format)
+ final char[] password, final String format)
throws GeneralSecurityException, IOException, NullPointerException
{
Validator.ensureNotNull(file);
final File trustStoreFile = new File(file);
- final char[] trustStorePassword = password != null ? password.toCharArray()
- : null;
final String trustStoreFormat = format != null ? format : KeyStore
.getDefaultType();
@@ -459,7 +457,7 @@
try
{
fos = new FileInputStream(trustStoreFile);
- keyStore.load(fos, trustStorePassword);
+ keyStore.load(fos, password);
}
finally
{
--
Gitblit v1.10.0