From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/api/PasswordStorageScheme.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/opends/src/server/org/opends/server/api/PasswordStorageScheme.java b/opends/src/server/org/opends/server/api/PasswordStorageScheme.java
index 5bbc774..4cb3b63 100644
--- a/opends/src/server/org/opends/server/api/PasswordStorageScheme.java
+++ b/opends/src/server/org/opends/server/api/PasswordStorageScheme.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.api;
import org.opends.messages.Message;
@@ -33,10 +33,7 @@
import org.opends.server.admin.std.server.PasswordStorageSchemeCfg;
import org.opends.server.config.ConfigException;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.InitializationException;
-
+import org.opends.server.types.*;
/**
@@ -151,7 +148,7 @@
* @throws DirectoryException If a problem occurs while
* processing.
*/
- public abstract ByteString encodePassword(ByteString plaintext)
+ public abstract ByteString encodePassword(ByteSequence plaintext)
throws DirectoryException;
@@ -170,7 +167,7 @@
* processing.
*/
public abstract ByteString encodePasswordWithScheme(
- ByteString plaintext)
+ ByteSequence plaintext)
throws DirectoryException;
@@ -190,8 +187,8 @@
* the provided stored password, or {@code false} if not.
*/
public abstract boolean passwordMatches(
- ByteString plaintextPassword,
- ByteString storedPassword);
+ ByteSequence plaintextPassword,
+ ByteSequence storedPassword);
@@ -242,8 +239,8 @@
* support the authentication password
* syntax.
*/
- public abstract ByteString encodeAuthPassword(ByteString plaintext)
- throws DirectoryException;
+ public abstract ByteString encodeAuthPassword(
+ ByteSequence plaintext) throws DirectoryException;
@@ -268,7 +265,7 @@
* password syntax.
*/
public abstract boolean authPasswordMatches(
- ByteString plaintextPassword,
+ ByteSequence plaintextPassword,
String authInfo, String authValue);
@@ -301,7 +298,7 @@
* stored password.
*/
public abstract ByteString getPlaintextValue(
- ByteString storedPassword)
+ ByteSequence storedPassword)
throws DirectoryException;
--
Gitblit v1.10.0