From 824f0f6c3f21fe85c92c5cd5cb9db98860e012fc Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Wed, 13 Jan 2010 15:41:48 +0000
Subject: [PATCH] Fix security/client_auth and security/account_activation testsuites
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml | 6 +++++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
index bd64906..118d43c 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -290,7 +290,7 @@
<script>
expirationTime = returnString.split(':')[1].strip()
- if len(expirationTime) == 9 and expirationTime.startswith('85'):
+ if len(expirationTime) == 9 and expirationTime.startswith('84'):
myRC = 0
else:
myRC = 1
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
index fcb9858..167fef4 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
@@ -113,12 +113,16 @@
string_len=len(certificateResult)
index_MD5=certificateResult.find("MD5:")
index_SHA1=certificateResult.find("SHA1:")
+ index_SHA256=certificateResult.find("SHA256:")
index_Signature=certificateResult.find("Signature algorithm name:")
MD5_fingerprint_cert1=certificateResult[index_MD5+5:index_SHA1].strip()
if index_Signature == -1:
SHA1_fingerprint_cert1=certificateResult[index_SHA1+5:string_len].strip()
else:
- SHA1_fingerprint_cert1=certificateResult[index_SHA1+5:index_Signature].strip()
+ if index_SHA256 == -1:
+ SHA1_fingerprint_cert1=certificateResult[index_SHA1+5:index_Signature].strip()
+ else:
+ SHA1_fingerprint_cert1=certificateResult[index_SHA1+5:index_SHA256].strip()
</script>
<message>'MD5 fingerprint for %s is : %s ' % (USER_1_CERT,MD5_fingerprint_cert1)</message>
--
Gitblit v1.10.0