/*
- * Copyright 2001-2005 Internet2
+ * Copyright 2001-2007 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
// Append a Signature.
Signature* sig=SignatureBuilder::buildSignature();
assertion->setSignature(sig);
- Locker locker(m_resolver);
- sig->setSigningKey(m_resolver->getKey());
-
- // Build KeyInfo.
- KeyInfo* keyInfo=KeyInfoBuilder::buildKeyInfo();
- X509Data* x509Data=X509DataBuilder::buildX509Data();
- keyInfo->getX509Datas().push_back(x509Data);
- for_each(m_resolver->getCertificates().begin(),m_resolver->getCertificates().end(),bind1st(_addcert(),x509Data));
- sig->setKeyInfo(keyInfo);
// Sign while marshalling.
vector<Signature*> sigs(1,sig);
+ CredentialCriteria cc;
+ cc.setUsage(Credential::SIGNING_CREDENTIAL);
+ Locker locker(m_resolver);
+ const Credential* cred = m_resolver->resolve(&cc);
+ TSM_ASSERT("Retrieved credential was null", cred!=NULL);
+
DOMElement* rootElement = NULL;
try {
- rootElement=assertion->marshall((DOMDocument*)NULL,&sigs);
+ rootElement=assertion->marshall((DOMDocument*)NULL,&sigs,cred);
}
catch (XMLToolingException& e) {
TS_TRACE(e.what());
assertEquals("Unmarshalled assertion does not match", expectedChildElementsDOM, assertion2.get(), false);
try {
- SignatureProfileValidator spv;
- SignatureValidator sv(new KeyResolver(m_resolver->getKey()));
+ opensaml::SignatureProfileValidator spv;
+ SignatureValidator sv(cred);
spv.validate(dynamic_cast<Assertion*>(assertion2.get())->getSignature());
sv.validate(dynamic_cast<Assertion*>(assertion2.get())->getSignature());
}