From a7d1c68c787fcccf888632b9787c4cc9b30393f7 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Mon, 24 May 2010 15:31:10 -0700
Subject: [PATCH] Fixup some certificate related unit tests
---
indra/newview/llsechandler_basic.cpp | 2 +-
indra/newview/tests/llsechandler_basic_test.cpp | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp
index 84ab9b9175..a81cde3126 100644
--- a/indra/newview/llsechandler_basic.cpp
+++ b/indra/newview/llsechandler_basic.cpp
@@ -1153,7 +1153,7 @@ void LLBasicCertificateStore::validate(int validation_policy,
previous_cert = (*current_cert);
current_cert++;
depth++;
- if(current_cert != current_cert != cert_chain->end())
+ if(current_cert != cert_chain->end())
{
(*current_cert)->getLLSD(current_cert_info);
}
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp
index d1330e2270..dfbd596d39 100644
--- a/indra/newview/tests/llsechandler_basic_test.cpp
+++ b/indra/newview/tests/llsechandler_basic_test.cpp
@@ -328,7 +328,8 @@ namespace tut
ensure_equals("Der Format is correct", memcmp(buffer, mDerFormat.c_str(), mDerFormat.length()), 0);
- LLSD llsd_cert = test_cert->getLLSD();
+ LLSD llsd_cert;
+ test_cert->getLLSD(llsd_cert);
std::ostringstream llsd_value;
llsd_value << LLSDOStreamer<LLSDNotationFormatter>(llsd_cert) << std::endl;
std::string llsd_cert_str = llsd_value.str();
@@ -988,10 +989,11 @@ namespace tut
test_chain,
validation_params);
// validate without the trust flag
- test_chain->validate(0, test_store, validation_params);
+ test_store->validate(0, test_chain, validation_params);
// Test time validity
- LLSD child_info = (*test_chain)[0]->getLLSD();
+ LLSD child_info;
+ ((*test_chain)[0])->getLLSD(child_info);
validation_params = LLSD::emptyMap();
validation_params[CERT_VALIDATION_DATE] = LLDate(child_info[CERT_VALID_FROM].asDate().secondsSinceEpoch() + 1.0);
test_store->validate(VALIDATION_POLICY_TIME, test_chain, validation_params);
--
GitLab