From 9e1ac7af03d6655724654082188ccb7c3f0cf48d Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 01 Sep 2014 09:13:35 +0000
Subject: [PATCH] Port to the DJ3 dev branch the fix for OPENDJ-1510 - New Password Storage Scheme for PKCS5S2.

---
 opendj3-server-dev/src/server/org/opends/server/extensions/ExtensionsConstants.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ExtensionsConstants.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ExtensionsConstants.java
index 78994e6..1aa7b0e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ExtensionsConstants.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ExtensionsConstants.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions copyright 2013 ForgeRock AS.
+ *      Portions copyright 2013-2014 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -81,10 +81,15 @@
    * The authentication password scheme name for use with passwords encoded in a
    * PBKDF2 representation.
    */
-  public static final String AUTH_PASSWORD_SCHEME_NAME_PBKDF2 =
-       "PBKDF2";
+  public static final String AUTH_PASSWORD_SCHEME_NAME_PBKDF2 = "PBKDF2";
 
 
+  /**
+   * The authentication password scheme name for use with passwords encoded in a
+   * PKCS5S2 representation.
+   */
+  public static final String AUTH_PASSWORD_SCHEME_NAME_PKCS5S2 = "PKCS5S2";
+
 
   /**
    * The name of the message digest algorithm that should be used to generate
@@ -325,6 +330,13 @@
   public static final String STORAGE_SCHEME_NAME_PBKDF2 = "PBKDF2";
 
 
+  /**
+   * The password storage scheme name that will be used for passwords stored in
+   * a PKCS5S2 representation.
+   */
+  public static final String STORAGE_SCHEME_NAME_PKCS5S2 = "PKCS5S2";
+
+
 
   /**
    * The password storage scheme name that will be used for passwords stored in

--
Gitblit v1.10.0