From 6ea9a5bfc9ab04aa074676a3e6aa3b2ff35f63b6 Mon Sep 17 00:00:00 2001
From: arnaud_lacour <arnaud_lacour@localhost>
Date: Thu, 06 Sep 2007 19:13:46 +0000
Subject: [PATCH] Updated password storage scheme functional tests to account for code changes from revision 2974.
---
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml | 8 +-
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml | 8 +-
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml | 8 +-
opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml | 107 +++++++++++++++++---------
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml | 8 +-
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml | 8 +-
opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml | 24 +++---
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml | 6
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml | 8 +-
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml | 8 +-
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml | 8 +-
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml | 8 +-
12 files changed, 121 insertions(+), 88 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
index 40437e5..b8232ec 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
@@ -70,8 +70,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'MD5' ,
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=MD5,cn=Password Storage Schemes,cn=config' ,
'modifyType' : 'add' }
</call>
@@ -81,8 +81,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'BASE64' ,
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Base64,cn=Password Storage Schemes,cn=config' ,
'modifyType' : 'add' }
</call>
@@ -92,8 +92,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA256' ,
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-256,cn=Password Storage Schemes,cn=config' ,
'modifyType' : 'add' }
</call>
@@ -168,8 +168,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'deprecated-password-storage-scheme' ,
- 'attributeValue' : 'MD5' }
+ 'attributeName' : 'deprecated-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=MD5,cn=Password Storage Schemes,cn=config' }
</call>
<message>
@@ -182,8 +182,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'DNToModify' : 'cn=Default Password Policy,cn=Password Policies,cn=config' ,
- 'attributeName' : 'ds-cfg-default-password-storage-scheme' ,
- 'newAttributeValue' : 'MD5' ,
+ 'attributeName' : 'ds-cfg-default-password-storage-scheme-dn' ,
+ 'newAttributeValue' : 'cn=MD5,cn=Password Storage Schemes,cn=config' ,
'changetype' : 'delete' }
</call>
@@ -388,8 +388,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
index da13023..bb40582 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
@@ -49,10 +49,11 @@
#@TestIssue 322
#@TestPurpose Add BASE64 password scheme
#@TestPreamble none
+ #@TestStep Admin deletes Salted SHA-1.
+ #@TestStep Admin creates new Salted SHA-1.
+ #@TestStep Admin adds new Salted SHA-1 to default storage scheme of the Default Password Policy.
+ #@TestStep Admin add palin SHA-1.
#@TestStep Admin add BASE64.
- #@TestStep Admin deletes SHA-1.
- #@TestStep Admin creates new SHA-1.
- #@TestStep Admin adds new SHA-1 to default storage scheme of the Default Password Policy.
#@TestPostamble none
#@TestResult Success if OpenDS returns 0
for all operations.
@@ -61,22 +62,7 @@
<sequence>
<call function="'testCase_Preamble'"/>
<message>
- 'Security: Multiple Pwd Schemes: Preamble - Admin adding BASE64 storage scheme'
- </message>
-
- <call function="'modifyPwdPolicy'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'BASE64' ,
- 'modifyType' : 'add' }
- </call>
-
- <message>
- 'Security: Multiple Pwd Schemes: Preamble - Admin deleting SHA-1 storage scheme'
+ 'Security: Multiple Pwd Schemes: Preamble - Admin deleting Salted SHA-1 storage scheme'
</message>
<call function="'dsconfig'">
@@ -86,7 +72,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'delete-password-storage-scheme' ,
'objectType' : 'scheme-name' ,
- 'objectName' : 'SHA-1',
+ 'objectName' : 'Salted SHA-1',
'expectedRC' : 0 }
</call>
@@ -101,8 +87,8 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'create-password-storage-scheme' ,
'objectType' : 'scheme-name' ,
- 'objectName' : 'SHA-1',
- 'optionsString' : '--type sha1 --set enabled:true ',
+ 'objectName' : 'Custom Salted SHA-1',
+ 'optionsString' : '--type salted-sha1 --set enabled:true ',
'expectedRC' : 0 }
</call>
@@ -116,8 +102,37 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SHA' ,
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Custom Salted SHA-1,cn=Password Storage Schemes,cn=config' }
+ </call>
+
+ <message>
+ 'Security: Multiple Pwd Schemes: Preamble - Admin adding SHA-1 storage scheme'
+ </message>
+
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=SHA-1,cn=Password Storage Schemes,cn=config' ,
+ 'modifyType' : 'add' }
+ </call>
+
+ <message>
+ 'Security: Multiple Pwd Schemes: Preamble - Admin adding BASE64 storage scheme'
+ </message>
+
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Base64,cn=Password Storage Schemes,cn=config' ,
'modifyType' : 'add' }
</call>
@@ -136,16 +151,16 @@
#@TestPurpose Test for the default SSHA scheme in the password policy
#@TestPreamble none
#@TestStep Admin retrieve the value for
- ds-cfg-default-password-storage-scheme.
+ ds-cfg-default-password-storage-scheme-dn.
#@TestPostamble none
#@TestResult Success if the string, "SSHA",
is part of the return string.
-->
- <testcase name="getTestCaseName('Multiple Schemes - Check Pwd Schemes - SSHA')">
+ <testcase name="getTestCaseName('Multiple Schemes - Check Pwd Schemes - Custom SSHA')">
<sequence>
<call function="'testCase_Preamble'"/>
<message>
- 'Security: Multiple Pwd Schemes: Checking for Password Schemes - SSHA'
+ 'Security: Multiple Pwd Schemes: Checking for Password Schemes - Custom SSHA'
</message>
<call function="'SearchObject'">
@@ -155,7 +170,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'cn=Default Password Policy,cn=Password Policies,cn=config' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'ds-cfg-default-password-storage-scheme' }
+ 'attributes' : 'ds-cfg-default-password-storage-scheme-dn' }
</call>
<script>
@@ -164,7 +179,7 @@
<call function="'checktestString'">
{ 'returnString' : returnString ,
- 'expectedString' : 'SSHA' }
+ 'expectedString' : 'cn=Custom Salted SHA-1' }
</call>
<call function="'testCase_Postamble'"/>
@@ -182,7 +197,7 @@
#@TestPurpose Test for the BASE64 scheme in the password policy
#@TestPreamble none
#@TestStep Admin retrieve the value for
- ds-cfg-default-password-storage-scheme.
+ ds-cfg-default-password-storage-scheme-dn.
#@TestPostamble none
#@TestResult Success if the string, "BASE64",
is part of the return string.
@@ -201,7 +216,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'cn=Default Password Policy,cn=Password Policies,cn=config' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'ds-cfg-default-password-storage-scheme' }
+ 'attributes' : 'ds-cfg-default-password-storage-scheme-dn' }
</call>
<script>
@@ -210,7 +225,7 @@
<call function="'checktestString'">
{ 'returnString' : returnString ,
- 'expectedString' : 'BASE64' }
+ 'expectedString' : 'cn=Base64' }
</call>
<call function="'testCase_Postamble'"/>
@@ -228,7 +243,7 @@
#@TestPurpose Test for the SHA-1 scheme in the password policy
#@TestPreamble none
#@TestStep Admin retrieve the value for
- ds-cfg-default-password-storage-scheme.
+ ds-cfg-default-password-storage-scheme-dn.
#@TestPostamble none
#@TestResult Success if the string, "SHA-1",
is part of the return string.
@@ -247,7 +262,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'cn=Default Password Policy,cn=Password Policies,cn=config' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'ds-cfg-default-password-storage-scheme' }
+ 'attributes' : 'ds-cfg-default-password-storage-scheme-dn' }
</call>
<script>
@@ -256,7 +271,7 @@
<call function="'checktestString'">
{ 'returnString' : returnString ,
- 'expectedString' : ': SHA' }
+ 'expectedString' : 'cn=SHA-1' }
</call>
<call function="'testCase_Postamble'"/>
@@ -480,7 +495,9 @@
#@TestIssue 322
#@TestPurpose Reset back to SSHA storage scheme alone
#@TestPreamble none
+ #@TestStep Admin create new SSHA password scheme.
#@TestStep Admin reset the password policy to SSHA password scheme.
+ #@TestStep User binds.
#@TestPostamble none
#@TestResult Success if OpenDS returns 0
-->
@@ -488,6 +505,22 @@
<sequence>
<call function="'testCase_Preamble'"/>
<message>
+ 'Security: Multiple Pwd Schemes: Postamble - Admin creating new SSHA storage scheme'
+ </message>
+
+ <call function="'dsconfig'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'create-password-storage-scheme' ,
+ 'objectType' : 'scheme-name' ,
+ 'objectName' : 'Salted SHA-1',
+ 'optionsString' : '--type salted-sha1 --set enabled:true ',
+ 'expectedRC' : 0 }
+ </call>
+
+ <message>
'Security: Mult Pwd Schemes: Postamble - Admin Resetting to SSHA Storage Scheme'
</message>
@@ -497,8 +530,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
index 590d2ad..3b98a5f 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
@@ -66,8 +66,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'BASE64' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Base64,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
@@ -180,8 +180,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
index 5a7f120..25e3d66 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
@@ -66,8 +66,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'CLEAR' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Clear,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
@@ -221,8 +221,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
index 990880c..98097ed 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
@@ -66,8 +66,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'CRYPT' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=CRYPT,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
@@ -180,8 +180,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
index eeb1493..e795fed 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
@@ -66,8 +66,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'MD5' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=MD5,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
@@ -180,8 +180,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
index 5f29140..b3ddafb 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
@@ -66,8 +66,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
@@ -180,8 +180,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
index 94519de..3b4d97c 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
@@ -66,8 +66,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SMD5' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted MD5,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
@@ -180,8 +180,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
index cdb0738..6f481b1 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
@@ -66,7 +66,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'ds-cfg-default-password-storage-scheme:SSHA',
+ 'attrToBeCompared' : 'ds-cfg-default-password-storage-scheme-dn:cn=Salted SHA-1,cn=Password Storage Schemes,cn=config',
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
@@ -223,8 +223,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'BAD' ,
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=BAD,cn=Password Storage Schemes,cn=config' ,
'expectedRC' : 1 }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
index 8a03cea..9edaf3c 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
@@ -66,8 +66,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA256' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-256,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
@@ -179,8 +179,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
index a97eb16..7fefa39 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
@@ -66,8 +66,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA384' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-384,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
@@ -179,8 +179,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
index e869b0a..0e11bc4 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
@@ -66,8 +66,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA512' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-512,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
@@ -180,8 +180,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'propertyName' : 'Default Password Policy' ,
- 'attributeName' : 'default-password-storage-scheme' ,
- 'attributeValue' : 'SSHA' }
+ 'attributeName' : 'default-password-storage-scheme-dn' ,
+ 'attributeValue' : 'cn=Salted SHA-1,cn=Password Storage Schemes,cn=config' }
</call>
<call function="'testCase_Postamble'"/>
--
Gitblit v1.10.0