From c13505f219abbe88401879e57ac01de387c3eae2 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Sat, 31 May 2008 11:03:39 +0000
Subject: [PATCH] Fix the security/client_auth testsuite
---
opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
index 62dc7c8..dfcbb89 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
@@ -114,8 +114,12 @@
string_len=len(certificateResult)
index_MD5=certificateResult.find("MD5:")
index_SHA1=certificateResult.find("SHA1:")
+ index_Signature=certificateResult.find("Signature algorithm name:")
MD5_fingerprint_cert1=certificateResult[index_MD5+5:index_SHA1].strip()
- SHA1_fingerprint_cert1=certificateResult[index_SHA1+5:string_len].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()
</script>
<message>'MD5 fingerprint for %s is : %s ' % (USER_1_CERT,MD5_fingerprint_cert1)</message>
@@ -137,8 +141,12 @@
string_len=len(certificateResult)
index_MD5=certificateResult.find("MD5:")
index_SHA1=certificateResult.find("SHA1:")
+ index_Signature=certificateResult.find("Signature algorithm name:")
MD5_fingerprint_cert2=certificateResult[index_MD5+5:index_SHA1].strip()
- SHA1_fingerprint_cert2=certificateResult[index_SHA1+5:string_len].strip()
+ if index_Signature == -1:
+ SHA1_fingerprint_cert2=certificateResult[index_SHA1+5:string_len].strip()
+ else:
+ SHA1_fingerprint_cert2=certificateResult[index_SHA1+5:index_Signature].strip()
</script>
<message>'MD5 fingerprint for %s is : %s ' % (USER_2_CERT,MD5_fingerprint_cert2)</message>
@@ -487,8 +495,12 @@
string_len=len(certificateResult)
index_MD5=certificateResult.find("MD5:")
index_SHA1=certificateResult.find("SHA1:")
+ index_Signature=certificateResult.find("Signature algorithm name:")
MD5_fingerprint_cert1=certificateResult[index_MD5+5:index_SHA1].strip()
- SHA1_fingerprint_cert1=certificateResult[index_SHA1+5:string_len].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()
</script>
@@ -512,8 +524,12 @@
string_len=len(certificateResult)
index_MD5=certificateResult.find("MD5:")
index_SHA1=certificateResult.find("SHA1:")
+ index_Signature=certificateResult.find("Signature algorithm name:")
MD5_fingerprint_cert2=certificateResult[index_MD5+5:index_SHA1].strip()
- SHA1_fingerprint_cert2=certificateResult[index_SHA1+5:string_len].strip()
+ if index_Signature == -1:
+ SHA1_fingerprint_cert2=certificateResult[index_SHA1+5:string_len].strip()
+ else:
+ SHA1_fingerprint_cert2=certificateResult[index_SHA1+5:index_Signature].strip()
</script>
--
Gitblit v1.10.0