Change license header, remove stale pkg files.

[shibboleth/cpp-opensaml.git] / samltest / signature / SAML1RequestTest.h

diff --git a/samltest/signature/SAML1RequestTest.h b/samltest/signature/SAML1RequestTest.h
index e6f5416..279bf6f 100644 (file)
--- a/samltest/signature/SAML1RequestTest.h
+++ b/samltest/signature/SAML1RequestTest.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2005 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 #include "signature/SAMLSignatureTestBase.h"
@@ -58,21 +62,18 @@ public:
         // Append a Signature.
         Signature* sig=SignatureBuilder::buildSignature();
         request->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);
-        DOMElement* rootElement = NULL;
+        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!=nullptr);
+
+        DOMElement* rootElement = nullptr;
         try {
-            rootElement=request->marshall((DOMDocument*)NULL,&sigs);
+            rootElement=request->marshall((DOMDocument*)nullptr,&sigs,cred);
         }
         catch (XMLToolingException& e) {
             TS_TRACE(e.what());
@@ -89,8 +90,8 @@ public:
         assertEquals("Unmarshalled request does not match", expectedChildElementsDOM, request2.get(), false);
         
         try {
-            SignatureProfileValidator spv;
-            SignatureValidator sv(new KeyResolver(m_resolver->getKey()));
+            opensaml::SignatureProfileValidator spv;
+            SignatureValidator sv(cred);
             spv.validate(dynamic_cast<Request*>(request2.get())->getSignature());
             sv.validate(dynamic_cast<Request*>(request2.get())->getSignature());
         }